v3.0.0

ambient-innovation · Apr 11, 2024 · 6f8f1a8 · 6f8f1a8
1 parent 1bffa86
commit 6f8f1a8
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 29 deletions.
diff --git a/.ambient-package-update/metadata.py b/.ambient-package-update/metadata.py
@@ -139,7 +139,7 @@ def get_dynamic_city_field(self, data):
 Now the package should be available in your virtual environment
 and any changes should be directly visible.
 
-Alternatively, simply copy the directory `dynamic_admin_forms`
+Alternatively, copy the directory `dynamic_admin_forms`
 into any normal django project, so that the python interpreter
 finds the local version instead of the installed (old) version.
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python 3.12
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.12"
 
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', ]
-        django-version: ['32', '41', '42', '50', ]
+        django-version: ['42', '50', ]
 
         exclude:
           - python-version: '3.12'
@@ -45,7 +45,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install tox
@@ -67,7 +67,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.6
+    rev: v0.3.5
     hooks:
       # Run the Ruff linter.
       - id: ruff
@@ -12,15 +12,15 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: [ --py38-plus ]
         stages: [ push ]
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.15.0
+    rev: 1.16.0
     hooks:
       - id: django-upgrade
-        args: [--target-version, "3.2"]
+        args: [--target-version, "4.2"]
         stages: [ push ]
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changelog
 
+**3.0.0**
+  * Dropped Django 3.2 & 4.1 support (via `ambient-package-update`)
+  * Internal updates via `ambient-package-update`
+
 **2.2.1**
 
 - Fixed security issue with URL not being wrapped in `admin_view`

diff --git a/README.md b/README.md
@@ -116,14 +116,14 @@ outerHTML of the correct HTML elements to update the form.
 For local development, create a virtual environment
 in the `testproj` folder:
 ```shell
-$ cd testapp
+$ cd testproj
 $ python3 -m venv .venv
 $ source .venv/bin/activate
 $ cd ..
-$ pip install -e .
+$ flit install --symlink
 ```
 Now the package should be available in your virtual environment
-and any changes should be directly visible. Run the project as a Django server and navigate to the admin page.
+and any changes should be directly visible.
 
 Alternatively, copy the directory `dynamic_admin_forms`
 into any normal django project, so that the python interpreter
@@ -133,7 +133,7 @@ finds the local version instead of the installed (old) version.
 
 To run end-to-end tests locally:
 ```shell
-$ cd testapp
+$ cd testproj
 $ python manage.py runserver 0.0.0.0:8000 &  # start server
 $ python manage.py loaddata fixtures/fixtures-dev.json
 $ cd ../e2e

diff --git a/django_dynamic_admin_forms/__init__.py b/django_dynamic_admin_forms/__init__.py
@@ -1,3 +1,3 @@
 """Add simple dynamic interaction to the otherwise static django admin."""
 
-__version__ = "2.2.1"
+__version__ = "3.0.0"
diff --git a/docs/conf.py b/docs/conf.py
@@ -36,7 +36,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "django-dynamic-admin-forms"
-copyright = "2023, Ambient Innovation: GmbH"  # noqa: A001
+copyright = "2024, Ambient Innovation: GmbH"  # noqa: A001
 author = "Ambient Innovation: GmbH <[email protected]>"
 version = __version__
 release = __version__

diff --git a/manage.py b/manage.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -13,8 +13,6 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Web Environment",
     "Framework :: Django",
-    "Framework :: Django :: 3.2",
-    "Framework :: Django :: 4.1",
     "Framework :: Django :: 4.2",
     "Framework :: Django :: 5.0",
     "Intended Audience :: Developers",
@@ -46,12 +44,12 @@ dev = [
    'coverage~=7.3',
    'pre-commit~=3.5',
    'ruff~=0.1.7',
-   'sphinx==4.2.0',
-   'sphinx-rtd-theme==1.0.0',
-   'm2r2==0.3.1',
+   'sphinx~=7.1',
+   'sphinx-rtd-theme~=2.0',
+   'm2r2==0.3.3.post2',
    'mistune<2.0.0',
    'flit~=3.9',
-   'ambient-package-update~=23.12.4',
+   'ambient-package-update~=24.4.4',
    'unittest-parametrize~=1.4',
 ]
 
@@ -66,7 +64,7 @@ name = "django_dynamic_admin_forms"
 'Changelog' = 'https://django-dynamic-admin-forms.readthedocs.io/en/latest/features/changelog.html'
 
 [tool.ruff]
-select = [
+lint.select = [
     "E",       # pycodestyle errors
     "W",       # pycodestyle warnings
     "F",       # Pyflakes
@@ -88,11 +86,11 @@ select = [
     "PGH",     # No all-purpose "# noqa" and eval validation
     "PL",      # PyLint
 ]
-ignore = [
+lint.ignore = [
 ]
 
 # Allow autofix for all enabled rules (when `--fix`) is provided.
-fixable = [
+lint.fixable = [
     "E",       # pycodestyle errors
     "W",       # pycodestyle warnings
     "F",       # Pyflakes
@@ -114,7 +112,7 @@ fixable = [
     "PGH",     # No all-purpose "# noqa" and eval validation
     "PL",      # PyLint
 ]
-unfixable = []
+lint.unfixable = []
 
 exclude = [
     ".bzr",
@@ -171,8 +169,6 @@ isolated_build = True
 [testenv]
 # Django deprecation overview: https://www.djangoproject.com/download/
 deps =
-    django32: Django==3.2.*
-    django41: Django==4.1.*
     django42: Django==4.2.*
     django50: Django==5.0.*
 extras = dev,
@@ -187,3 +183,10 @@ python =
     3.11: py311
     3.12: py312
 """
+
+[tool.pytest.ini_options]
+python_files = [
+    "tests.py",
+    "test_*.py",
+    "*_tests.py",
+]
diff --git a/pytest.init b/pytest.init
diff --git a/testapp/urls.py b/testapp/urls.py
@@ -13,6 +13,7 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+
 from django.contrib import admin
 from django.urls import include, path