Drop Python 3.9, test on 3.14, uv/packaging updates

dcwatson · dcwatson · commit e2cebe065ffe · 2025-10-13T22:20:10.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,8 +6,8 @@ jobs:
   checks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: chartboost/ruff-action@v1
+      - uses: actions/checkout@v5
+      - uses: astral-sh/ruff-action@v3
 
   test:
     runs-on: ubuntu-latest
@@ -27,18 +27,11 @@ jobs:
       fail-fast: false
       matrix:
         django-version: ["4.2", "5.0", "5.1", "5.2"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-        exclude:
-          - python-version: "3.9"
-            django-version: "5.0"
-          - python-version: "3.9"
-            django-version: "5.1"
-          - python-version: "3.9"
-            django-version: "5.2"
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Requirements
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog for django-pgcrypto
 
+## 3.1.0 (in development)
+
+* Dropped support for Python 3.9, test on Python 3.14
+
+
 ## 3.0.3 (2025-02-04)
 
 * Added `iexact` lookup (https://github.com/dcwatson/django-pgcrypto/pull/39)
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,9 +1,6 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
 [project]
 name = "django-pgcrypto"
+version = "3.1.0"
 authors = [
     {name = "Dan Watson", email = "dcwatson@gmail.com"},
 ]
@@ -20,19 +17,19 @@ classifiers = [
 dependencies = [
     "cryptography",
 ]
-dynamic = ["version"]
 
 [project.urls]
 Repository = "https://github.com/dcwatson/django-pgcrypto"
 
-[tool.hatch.build.targets.wheel]
-packages = ["pgcrypto"]
-
-[tool.hatch.version]
-path = "pgcrypto/base.py"
-
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "django",
     "psycopg[binary]",
 ]
+
+[build-system]
+requires = ["uv_build>=0.9.2,<0.10.0"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-name = "pgcrypto"
diff --git a/src/pgcrypto/__init__.py b/src/pgcrypto/__init__.py
diff --git a/src/pgcrypto/base.py b/src/pgcrypto/base.py
@@ -1,9 +1,12 @@
-__version__ = "3.0.3"
-__version_info__ = (int(v) for v in __version__.split("."))
-
 import base64
+import importlib.metadata
 import struct
 
+__version__ = importlib.metadata.version("django-pgcrypto")
+__version_info__ = tuple(
+    int(num) if num.isdigit() else num for num in __version__.split(".")
+)
+
 CRC24_INIT = 0xB704CE
 CRC24_POLY = 0x1864CFB
 
diff --git a/src/pgcrypto/fields.py b/src/pgcrypto/fields.py
@@ -190,7 +190,12 @@ class EncryptedDateField(BaseEncryptedField):
     field_cast = "::date"
 
     def __init__(
-        self, verbose_name=None, name=None, auto_now=False, auto_now_add=False, **kwargs
+        self,
+        verbose_name=None,
+        name=None,
+        auto_now=False,
+        auto_now_add=False,
+        **kwargs,
     ):
         self.auto_now, self.auto_now_add = auto_now, auto_now_add
         if auto_now or auto_now_add:
diff --git a/src/pgcrypto/functions.py b/src/pgcrypto/functions.py
diff --git a/testapp/fixtures/employees.json b/testapp/fixtures/employees.json
@@ -1,23 +1,23 @@
-[
-{
-    "fields": {
-        "name": "John Smith",
-        "ssn": "999-05-6728",
-        "salary": "52000.00",
-        "date_hired": "1999-01-23"
-    },
-    "model": "testapp.employee",
-    "pk": 1
-},
-{
-    "fields": {
-        "name": "Sally Johnson",
-        "ssn": "666-27-9811",
-        "salary": "75248.77",
-        "date_hired": "1996-02-28",
-        "email": "johnson.sally@example.com"
-    },
-    "model": "testapp.employee",
-    "pk": 2
-}
-]
+[
+    {
+        "fields": {
+            "name": "John Smith",
+            "ssn": "999-05-6728",
+            "salary": "52000.00",
+            "date_hired": "1999-01-23"
+        },
+        "model": "testapp.employee",
+        "pk": 1
+    },
+    {
+        "fields": {
+            "name": "Sally Johnson",
+            "ssn": "666-27-9811",
+            "salary": "75248.77",
+            "date_hired": "1996-02-28",
+            "email": "johnson.sally@example.com"
+        },
+        "model": "testapp.employee",
+        "pk": 2
+    }
+]
diff --git a/testapp/tests.py b/testapp/tests.py
@@ -263,33 +263,33 @@ def test_concat_decrypt(self):
         self.assertEqual(employee.value, "999-05-6728 - 42")
 
     def test_exact(self):
-        employee = Employee.objects.filter(email__exact="johnson.sally@example.com").get()
+        employee = Employee.objects.get(email__exact="johnson.sally@example.com")
         self.assertEqual(employee.email, "johnson.sally@example.com")
 
     def test_iexact(self):
-        employee = Employee.objects.filter(email__iexact="Johnson.saLly@ExamPle.cOm").get()
+        employee = Employee.objects.get(email__iexact="Johnson.saLly@ExamPle.cOm")
         self.assertEqual(employee.email, "johnson.sally@example.com")
 
     def test_contains(self):
-        employee = Employee.objects.filter(email__contains="sal").get()
+        employee = Employee.objects.get(email__contains="sal")
         self.assertEqual(employee.email, "johnson.sally@example.com")
 
     def test_icontains(self):
-        employee = Employee.objects.filter(email__icontains="SAL").get()
+        employee = Employee.objects.get(email__icontains="SAL")
         self.assertEqual(employee.email, "johnson.sally@example.com")
 
     def test_startswith(self):
-        employee = Employee.objects.filter(email__startswith="john").get()
+        employee = Employee.objects.get(email__startswith="john")
         self.assertEqual(employee.email, "johnson.sally@example.com")
 
     def test_istartswith(self):
-        employee = Employee.objects.filter(email__istartswith="JOHN").get()
+        employee = Employee.objects.get(email__istartswith="JOHN")
         self.assertEqual(employee.email, "johnson.sally@example.com")
 
     def test_endswith(self):
-        employee = Employee.objects.filter(email__endswith="com").get()
+        employee = Employee.objects.get(email__endswith="com")
         self.assertEqual(employee.email, "johnson.sally@example.com")
 
     def test_iendswith(self):
-        employee = Employee.objects.filter(email__iendswith="COM").get()
+        employee = Employee.objects.get(email__iendswith="COM")
         self.assertEqual(employee.email, "johnson.sally@example.com")
diff --git a/uv.lock b/uv.lock
