chore: upgrade project boilerplate (#80)

I'm not expecting the full project to work. Just focusing on the Python boilerplate

Author: crccheck

.github/dependabot.yml

@@ -0,0 +1,19 @@
+version: 2
+updates:
+  - package-ecosystem: "uv"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -10,17 +10,17 @@ jobs:
   lint-py:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: "3.10"
-      - run: pip install black
-      - run: black --check .
+      - uses: actions/checkout@v6
+      # https://github.com/astral-sh/setup-uv/releases
+      - uses: astral-sh/setup-uv@v7
+      - run: uv sync --all-extras
+      - run: uv run ruff check .
+      - run: uv run ruff format --check .
   lint-js:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
           node-version: "16.x"
       - run: npm install eslint
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       db:
-        image: postgis/postgis:12-3.0-alpine
+        image: postgis/postgis:16-3.5-alpine
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -38,16 +38,11 @@ jobs:
           - 5432:5432
         options: --mount type=tmpfs,destination=/var/lib/postgresql/data --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: "3.10"
+      - uses: actions/checkout@v6
+      # https://github.com/astral-sh/setup-uv/releases
+      - uses: astral-sh/setup-uv@v7
       - run: sudo apt-get install -y libpq-dev libgeos-dev gdal-bin
-      - run: |
-          pip install poetry
-          poetry install -v
-        env:
-          POETRY_VIRTUALENVS_IN_PROJECT: true
+      - run: uv sync --all-extras
       - run: make test
         env:
           DATABASE_URL: postgis://postgres:[email protected]/github_actions

Makefile

@@ -1,10 +1,10 @@
-MANAGE=poetry run python manage.py
+MANAGE=uv run python manage.py
 
 help: ## Shows this help
 	@echo "$$(grep -h '#\{2\}' $(MAKEFILE_LIST) | sed 's/: #\{2\} /	/' | column -t -s '	')"
 
 install: ## Install requirements
-	poetry install
+	uv sync --upgrade --all-extras
 	npm install
 
 clean: ## Remove temporary files
@@ -23,12 +23,13 @@ tdd: ## Run tests with a watcher
 	nodemon --ext py -x sh -c "$(MANAGE) test --failfast --keepdb || true"
 
 lint: ## Run lint check
-	black --check .
+	uv run ruff check .
+	uv run ruff format --check .
 
 resetmigrations:
 	find . -name "0001_initial.py" -delete
 	$(MANAGE) makemigrations receipts lazy_geo
-	black .
+	uv run ruff format .
 
 resetdb: ## Delete and recreate the database
 	-phd dropdb

docker-compose.yml

@@ -0,0 +1,16 @@
+version: '3.8'
+
+services:
+  db:
+    image: postgis/postgis:16-3.4
+    environment:
+      POSTGRES_DB: mixed_beverages
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+
+volumes:
+  postgres_data:

mixed_beverages/apps/lazy_geo/models.py

@@ -1,9 +1,4 @@
-from django.conf import settings
 from django.contrib.gis.db import models
-from django.contrib.gis.geos import Point
-from django.core.exceptions import SuspiciousOperation
-from django.urls import reverse
-from django.utils import timezone
 
 
 class BaseTAMULocation(models.Model):
@@ -61,7 +56,9 @@ class BaseGeocodioLocation(models.Model):
         decimal_places=2,
         null=True,
         blank=True,
-        help_text="1 is most accuracy, 0.8 is pretty close, anything less than 0.6 is bad",
+        help_text=(
+            "1 is most accuracy, 0.8 is pretty close, anything less than 0.6 is bad"
+        ),
     )
 
     class Meta:

mixed_beverages/apps/lazy_geo/views.py

@@ -1,18 +1,10 @@
-import json
-
-from django.contrib.admin.views.decorators import staff_member_required
-from django.urls import reverse
 from django.db.models import Q
 from django.http import (
-    HttpResponseBadRequest,
     JsonResponse,
-    HttpResponseRedirect,
-    HttpResponseForbidden,
 )
 from django.shortcuts import get_object_or_404
-from django.utils.decorators import method_decorator
-from django.views.generic import DetailView
 from djgeojson.views import GeoJSONLayerView
+
 from mixed_beverages.apps.receipts import models
 
 

mixed_beverages/apps/receipts/admin.py

@@ -1,5 +1,4 @@
 from django.contrib import admin
-from django.contrib.gis.admin import GeoModelAdmin
 from django.urls import reverse
 from django.utils.safestring import mark_safe
 
@@ -29,7 +28,7 @@ class BusinessAdmin(admin.ModelAdmin):
 
 
 @admin.register(models.Location)
-class LocationAdmin(GeoModelAdmin):
+class LocationAdmin(admin.ModelAdmin):
     list_display = ("name", "street_address", "city", "state", "zip")
     list_filter = ("coordinate_quality",)
     search_fields = ("name",)
@@ -90,10 +89,9 @@ class ReceiptAdmin(admin.ModelAdmin):
         "location_link",
     )
 
+    @admin.display(description="location")
     def location_link(self, obj):
         url = reverse("admin:receipts_location_change", args=(obj.location.pk,))
         return mark_safe(
             f'<a href="{url}">{obj.location}<br>{obj.location.address}</a>'
         )
-
-    location_link.short_description = "location"  # type: ignore

mixed_beverages/apps/receipts/factories.py

@@ -1,5 +1,5 @@
-from datetime import date
 import string
+from datetime import date
 
 import factory
 from factory.fuzzy import FuzzyDate, FuzzyDecimal, FuzzyText

mixed_beverages/apps/receipts/management/commands/geo_export.py

@@ -1,6 +1,7 @@
-from django.core.management.base import BaseCommand
 from csv import DictWriter
 
+from django.core.management.base import BaseCommand
+
 from mixed_beverages.apps.receipts.models import Location
 
 

mixed_beverages/apps/receipts/management/commands/geo_import.py

@@ -1,9 +1,8 @@
 import os.path
-
 from csv import DictReader
+
 from django.contrib.gis.geos import Point
 from django.core.management.base import BaseCommand
-from obj_update import obj_update_or_create
 from tqdm import tqdm
 
 from mixed_beverages.apps.receipts.models import Location
@@ -23,7 +22,7 @@ def add_arguments(self, parser):
     def handle(self, csv: str, ignore_pk: bool, *args, **options):
         assert os.path.isfile(csv)
 
-        with open(csv, "r") as fh:
+        with open(csv) as fh:
             row_count = sum(1 for row in fh)
             fh.seek(0)
             reader = DictReader(fh)
@@ -38,7 +37,7 @@ def handle(self, csv: str, ignore_pk: bool, *args, **options):
                         )
                     else:
                         location = Location.objects.get(pk=row["pk"])
-                except:
+                except Exception:
                     continue
                 location.coordinate = Point(
                     x=float(row["Longitude"]), y=float(row["Latitude"])