deps: adaptations for Django 5.x

.github/workflows/test-docs.yml

@@ -2,9 +2,9 @@ name: Test & Docs
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   tests:
@@ -24,57 +24,57 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.12"]
+        python-version: ['3.10', '3.12']
         database: [postgresql]
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+        uses: actions/setup-python@v4
-      with:
+        with:
-        python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python-version }}
-        cache: 'pip'
+          cache: 'pip'
-        cache-dependency-path: '**/pyproject.toml'
+          cache-dependency-path: '**/pyproject.toml'
-    - name: Install dependencies
+      - name: Install dependencies
-      run: |
+        run: |
-        sudo apt update
+          sudo apt update
-        sudo apt install libgdal-dev
+          sudo apt install libgdal-dev
-        python -m pip install --upgrade pip
+          python -m pip install --upgrade pip
-        make develop installjs vendors
+          make develop installjs vendors
-    - name: run tests
+      - name: run tests
-      run: make test
+        run: make test
-      env:
+        env:
-        DJANGO_SETTINGS_MODULE: 'umap.tests.settings'
+          DJANGO_SETTINGS_MODULE: 'umap.tests.settings'
-        UMAP_SETTINGS: 'umap/tests/settings.py'
+          UMAP_SETTINGS: 'umap/tests/settings.py'
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
-    - name: Set up Python
+      - name: Set up Python
-      uses: actions/setup-python@v4
+        uses: actions/setup-python@v4
-      with:
+        with:
-        python-version: "3.11"
+          python-version: '3.11'
-    - name: Install dependencies
+      - name: Install dependencies
-      run: |
+        run: |
-        python3 -m pip install -e .[test,dev]
+          python3 -m pip install -e .[test,dev]
 
-    - name: Run Lint
+      - name: Run Lint
-      run: make lint
+        run: make lint
 
-    - name: Run Docs
+      - name: Run Docs
-      run: make docs
+        run: make docs
 
   docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
-    - name: Set up Python
+      - name: Set up Python
-      uses: actions/setup-python@v4
+        uses: actions/setup-python@v4
-      with:
+        with:
-        python-version: "3.11"
+          python-version: '3.11'
-    - name: Install dependencies
+      - name: Install dependencies
-      run: |
+        run: |
-        python3 -m pip install -r docs/requirements.txt
+          python3 -m pip install -r docs/requirements.txt
 
-    - name: Run Docs
+      - name: Run Docs
-      run: mkdocs build
+        run: mkdocs build

.travis.yml

@@ -2,31 +2,30 @@ os: linux
 language: python
 dist: focal
 python:
-- "3.6"
+  - '3.10'
-- "3.7"
+  - '3.11'
-- "3.8"
+  - '3.12'
-- "3.9"
 services:
   - postgresql
 addons:
   apt:
     packages:
-    - libgdal-dev
+      - libgdal-dev
-    - postgresql-12-postgis-3
+      - postgresql-12-postgis-3
 env:
   global:
-  - PGPORT=5432
+    - PGPORT=5432
-  - UMAP_SETTINGS=umap/tests/settings.py
+    - UMAP_SETTINGS=umap/tests/settings.py
 install:
-- make develop
+  - make develop
 script: make test
 notifications:
   irc:
     channels:
-    - "irc.libera.chat#umap"
+      - 'irc.libera.chat#umap'
     on_success: change
     on_failure: always
   email: false
 branches:
   only:
-  - master
+    - master

Makefile

@@ -16,14 +16,14 @@ develop: ## Install the test and dev dependencies
 format: ## Format the code and templates files
 	djlint umap/templates --reformat &&\
 	isort --profile black . &&\
-	ruff format --target-version=py38 .
+	ruff format --target-version=py310 .
 
 .PHONY: lint
 lint: ## Lint the code and template files
 	djlint umap/templates --lint &&\
 	isort --check --profile black umap/ &&\
-    ruff format --check --target-version=py38 umap/ &&\
+    ruff format --check --target-version=py310 umap/ &&\
-	vermin --no-tips --violations -t=3.8- umap/
+	vermin --no-tips --violations -t=3.10- umap/
 
 docs: ## Compile the docs
 	mkdocs build

pyproject.toml

@@ -15,7 +15,7 @@ maintainers = [
 ]
 homepage = "https://github.com/umap-project/umap"
 keywords = ["django", "leaflet", "geodjango", "openstreetmap", "map"]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 classifiers = [
   "Development Status :: 4 - Beta",
   "Intended Audience :: Developers",
@@ -23,8 +23,6 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",