switch to UV, bump the deps, move the book app to the root

astynax · Nov 2, 2024 · 071d8bf · 071d8bf
1 parent 55f112b
commit 071d8bf
Show file tree

Hide file tree

Showing 42 changed files with 161 additions and 962 deletions.
diff --git a/.python-version b/.python-version
@@ -0,0 +1 @@
+3.13
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-MANAGE := poetry run python manage.py
+MANAGE := uv run python manage.py
 
 run:
 	$(MANAGE) runserver

diff --git a/README.md b/README.md
@@ -6,12 +6,12 @@ This project is a software that I'am developing during [this series of YouTube s
 
 ### How to
 
-1. Get [poetry](https://python-poetry.org/).
-1. Clone.
-1. `poetry install`.
-1. `poetry run python manage.py migrate`.
-1. `poetry run python manage.py createsuperuser --username=admin` and set password to `admin` (TODO: make the password optional).
-1. `poetry run python manage.py runserver`.
+1. Get UV
+1. Clone
+1. `uv sync`
+1. `uv run python manage.py migrate`.
+1. `uv run python manage.py createsuperuser --username=admin` and set password to `admin` (TODO: make the password optional).
+1. `uv run python manage.py runserver`.
 
 ### DB Example
 

diff --git a/djaif/book/__init__.py → book/__init__.py b/djaif/book/__init__.py → book/__init__.py
diff --git a/djaif/book/admin.py → book/admin.py b/djaif/book/admin.py → book/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from djaif.book import models
+from . import models
 
 
 class Admin(admin.ModelAdmin):

diff --git a/djaif/book/apps.py → book/apps.py b/djaif/book/apps.py → book/apps.py
@@ -2,4 +2,4 @@
 
 
 class BookConfig(AppConfig):
-    name = 'djaif.book'
+    name = 'book'
diff --git a/djaif/book/book_map.py → book/book_map.py b/djaif/book/book_map.py → book/book_map.py
@@ -1,6 +1,6 @@
 from graphviz import Digraph
 
-from djaif.book import models
+from . import models
 
 
 def book_map(book):

diff --git a/djaif/book/migrations/0001_initial.py → book/migrations/0001_initial.py b/djaif/book/migrations/0001_initial.py → book/migrations/0001_initial.py
diff --git a/djaif/book/migrations/0002_bookpage.py → book/migrations/0002_bookpage.py b/djaif/book/migrations/0002_bookpage.py → book/migrations/0002_bookpage.py
diff --git a/djaif/book/migrations/0003_pagelink.py → book/migrations/0003_pagelink.py b/djaif/book/migrations/0003_pagelink.py → book/migrations/0003_pagelink.py
diff --git a/djaif/book/migrations/0004_pagelink_name.py → book/migrations/0004_pagelink_name.py b/djaif/book/migrations/0004_pagelink_name.py → book/migrations/0004_pagelink_name.py
diff --git a/...f/book/migrations/0005_book_first_page.py → book/migrations/0005_book_first_page.py b/...f/book/migrations/0005_book_first_page.py → book/migrations/0005_book_first_page.py
diff --git a/djaif/book/migrations/0006_book_cover_art.py → book/migrations/0006_book_cover_art.py b/djaif/book/migrations/0006_book_cover_art.py → book/migrations/0006_book_cover_art.py
diff --git a/...ook/migrations/0007_auto_20200430_1629.py → book/migrations/0007_auto_20200430_1629.py b/...ook/migrations/0007_auto_20200430_1629.py → book/migrations/0007_auto_20200430_1629.py
diff --git a/...ook/migrations/0008_auto_20200430_1703.py → book/migrations/0008_auto_20200430_1703.py b/...ook/migrations/0008_auto_20200430_1703.py → book/migrations/0008_auto_20200430_1703.py
diff --git a/djaif/book/migrations/0009_bookpage_items.py → book/migrations/0009_bookpage_items.py b/djaif/book/migrations/0009_bookpage_items.py → book/migrations/0009_bookpage_items.py
diff --git a/djaif/book/migrations/0010_pagelink_items.py → book/migrations/0010_pagelink_items.py b/djaif/book/migrations/0010_pagelink_items.py → book/migrations/0010_pagelink_items.py
diff --git a/...ook/migrations/0011_auto_20200526_1529.py → book/migrations/0011_auto_20200526_1529.py b/...ook/migrations/0011_auto_20200526_1529.py → book/migrations/0011_auto_20200526_1529.py
diff --git a/djaif/book/migrations/0012_progresssave.py → book/migrations/0012_progresssave.py b/djaif/book/migrations/0012_progresssave.py → book/migrations/0012_progresssave.py
diff --git a/...igrations/0013_progresssave_updated_at.py → ...igrations/0013_progresssave_updated_at.py b/...igrations/0013_progresssave_updated_at.py → ...igrations/0013_progresssave_updated_at.py
diff --git a/djaif/book/migrations/0014_droppeditem.py → book/migrations/0014_droppeditem.py b/djaif/book/migrations/0014_droppeditem.py → book/migrations/0014_droppeditem.py
diff --git a/...f/book/migrations/0015_droppeditemsave.py → book/migrations/0015_droppeditemsave.py b/...f/book/migrations/0015_droppeditemsave.py → book/migrations/0015_droppeditemsave.py
diff --git a/djaif/book/migrations/0016_note.py → book/migrations/0016_note.py b/djaif/book/migrations/0016_note.py → book/migrations/0016_note.py
diff --git a/djaif/book/migrations/0017_note_progress.py → book/migrations/0017_note_progress.py b/djaif/book/migrations/0017_note_progress.py → book/migrations/0017_note_progress.py
diff --git a/djaif/book/migrations/0018_note_pinned.py → book/migrations/0018_note_pinned.py b/djaif/book/migrations/0018_note_pinned.py → book/migrations/0018_note_pinned.py
diff --git a/djaif/book/migrations/__init__.py → book/migrations/__init__.py b/djaif/book/migrations/__init__.py → book/migrations/__init__.py
diff --git a/djaif/book/models.py → book/models.py b/djaif/book/models.py → book/models.py
@@ -5,7 +5,7 @@
 class Book(models.Model):
     title = models.CharField(name='title', max_length=100, unique=True)
     first_page = models.ForeignKey(
-        'BookPage', null=True, on_delete=models.SET_NULL,
+        'BookPage', null=True, blank=True, on_delete=models.SET_NULL,
         related_name='first_name',
     )
     cover_art = models.ImageField(null=True, blank=True)

diff --git a/...ook/templates/admin/book_change_form.html → book/templates/admin/book_change_form.html b/...ook/templates/admin/book_change_form.html → book/templates/admin/book_change_form.html
diff --git a/djaif/book/templates/books.html → book/templates/books.html b/djaif/book/templates/books.html → book/templates/books.html
diff --git a/djaif/book/templates/default.html → book/templates/default.html b/djaif/book/templates/default.html → book/templates/default.html
diff --git a/djaif/book/templates/note.html → book/templates/note.html b/djaif/book/templates/note.html → book/templates/note.html
diff --git a/djaif/book/templates/page.html → book/templates/page.html b/djaif/book/templates/page.html → book/templates/page.html
diff --git a/djaif/book/templates/saves.html → book/templates/saves.html b/djaif/book/templates/saves.html → book/templates/saves.html
diff --git a/djaif/book/tests.py → book/tests.py b/djaif/book/tests.py → book/tests.py
diff --git a/djaif/book/urls.py → book/urls.py b/djaif/book/urls.py → book/urls.py
@@ -1,6 +1,7 @@
 from django.urls import path
 
-from djaif.book import views
+from . import views
+
 
 urlpatterns = [
     path('', views.view_books),

diff --git a/djaif/book/views.py → book/views.py b/djaif/book/views.py → book/views.py
@@ -7,7 +7,7 @@
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 
-from djaif.book import book_map, models
+from . import book_map, models
 
 
 def _return_to(book_id):

diff --git a/djaif/settings.py b/djaif/settings.py
@@ -7,18 +7,13 @@
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
-
 DJANGO_SETTINGS_MODULE = 'djaif.settings'
 
 SECRET_KEY = os.getenv('SECRET_KEY')
 DEBUG = bool(os.getenv('DEBUG'))
 SUPERUSER = os.getenv('SUPERUSER', 'admin')
 PASSWORD = os.getenv('PASSWORD', 'admin')
-
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', [])
 
 
 # Application definition
@@ -31,7 +26,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django_extensions',
-    'djaif.book',
+    'book',
 ]
 
 MIDDLEWARE = [

diff --git a/djaif/urls.py b/djaif/urls.py
@@ -4,6 +4,6 @@
 from django.urls import include, path
 
 urlpatterns = [
-    path('', include('djaif.book.urls')),
+    path('', include('book.urls')),
     path('admin/', admin.site.urls),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		class BookConfig(AppConfig):
		name = 'djaif.book'
		name = 'book'