update to uv

Author: sgmdlt

.github/workflows/pyci.yml

@@ -45,19 +45,21 @@ jobs:
     if: ${{ github.event_name == 'push' }}
 
     steps:
-      - uses: actions/checkout@v2
-
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
 
-      - uses: docker/login-action@v1
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: docker/build-push-action@v2
+      - name: Build and push
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          cache-from: hexletcomponents/python-django-blog:latest
+          cache-from: ghcr.io/${{ github.repository }}:latest
           cache-to: type=inline
-          tags: hexletcomponents/python-django-blog:latest
+          tags: ghcr.io/${{ github.repository }}:latest

Dockerfile

@@ -1,17 +1,14 @@
-FROM python:3.8.10-slim
+FROM python:3.13.2-slim
 
 RUN apt-get update && apt-get install -yq make gettext
 
-RUN pip3 install -U poetry
-RUN poetry config virtualenvs.in-project true
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
 WORKDIR /app
 
 COPY pyproject.toml .
-COPY poetry.lock .
+COPY uv.lock .
 
-RUN poetry install
+RUN uv sync
 
-COPY . .
-
-CMD ["bash", "-c", "make migrate && poetry run gunicorn python_django_blog.wsgi --log-file -"]
+CMD ["bash", "-c", "make migrate && uv run gunicorn python_django_blog.wsgi --log-file -"]

Makefile

@@ -1,50 +1,46 @@
 compose-setup: compose-build compose-install
 
 compose-build:
-	docker-compose build
+	docker compose build
 
 compose-install:
-	docker-compose run app make install
+	docker compose run app make install
 
 compose-bash:
-	docker-compose run app bash
+	docker compose run app bash
 
 compose:
-	docker-compose up
+	docker compose up
 
 compose-lint:
-	docker-compose run app make lint
+	docker compose run app make lint
 
 compose-test:
-	docker-compose run app make test
+	docker compose run app make test
 
 install:
-	poetry install
+	uv sync
 
 migrate:
-	poetry run python manage.py migrate
+	uv run manage.py migrate
 
 setup:
 	cp -n .env.example .env || true
 	make install
 	make migrate
 
 start:
-	poetry run python manage.py runserver 0.0.0.0:8000
-
-check:
-	poetry check
+	uv run manage.py runserver 0.0.0.0:8000
 
 lint:
-	poetry run flake8 .
+	uv run ruff check .
 
 test:
-	poetry run python manage.py test
+	uv run manage.py test
 
-test-coverage:
-	poetry run coverage run manage.py test python_django_blog
-	poetry run coverage html
-	poetry run coverage report
+check: test lint
 
-deploy:
-	git push heroku main
+test-coverage:
+	uv run coverage run manage.py test python_django_blog
+	uv run coverage html
+	uv run coverage report

Procfile

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   app:
     build: .