From 4de8b2ec96d08382b70bdda6c3dc07be940234c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 09:53:07 +0000 Subject: [PATCH 1/2] chore: bump django from 4.2 to 5.0.1 Bumps [django](https://github.com/django/django) from 4.2 to 5.0.1. - [Commits](https://github.com/django/django/compare/4.2...5.0.1) --- updated-dependencies: - dependency-name: django dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 543d6e3f..5be883a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ classifiers = [ "Programming Language :: Python :: 3.12", ] dependencies = [ - "Django==4.2", + "Django==5.0.1", "django-agnocomplete==2.2.0", "django-environ==0.10.0", "django-probes==1.7.0", From a159914c53fbccc401e91a22875efcbafff679a1 Mon Sep 17 00:00:00 2001 From: David Larlet Date: Mon, 29 Jan 2024 13:36:05 -0500 Subject: [PATCH 2/2] deps: adaptations for Django 5.x --- .github/workflows/test-docs.yml | 88 ++++++++++++++++----------------- .travis.yml | 21 ++++---- Makefile | 6 +-- pyproject.toml | 4 +- 4 files changed, 58 insertions(+), 61 deletions(-) diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml index 08011612..5822423e 100644 --- a/.github/workflows/test-docs.yml +++ b/.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 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: '**/pyproject.toml' - - name: Install dependencies - run: | - sudo apt update - sudo apt install libgdal-dev - python -m pip install --upgrade pip - make develop installjs vendors - - name: run tests - run: make test - env: - DJANGO_SETTINGS_MODULE: 'umap.tests.settings' - UMAP_SETTINGS: 'umap/tests/settings.py' + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' + cache-dependency-path: '**/pyproject.toml' + - name: Install dependencies + run: | + sudo apt update + sudo apt install libgdal-dev + python -m pip install --upgrade pip + make develop installjs vendors + - name: run tests + run: make test + env: + DJANGO_SETTINGS_MODULE: 'umap.tests.settings' + UMAP_SETTINGS: 'umap/tests/settings.py' lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.11" - - name: Install dependencies - run: | - python3 -m pip install -e .[test,dev] + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.11' + - name: Install dependencies + run: | + python3 -m pip install -e .[test,dev] - - name: Run Lint - run: make lint - - - name: Run Docs - run: make docs + - name: Run Lint + run: make lint + + - name: Run Docs + run: make docs docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.11" - - name: Install dependencies - run: | - python3 -m pip install -r docs/requirements.txt + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.11' + - name: Install dependencies + run: | + python3 -m pip install -r docs/requirements.txt - - name: Run Docs - run: mkdocs build + - name: Run Docs + run: mkdocs build diff --git a/.travis.yml b/.travis.yml index c8edc1a4..0f904422 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,31 +2,30 @@ os: linux language: python dist: focal python: -- "3.6" -- "3.7" -- "3.8" -- "3.9" + - '3.10' + - '3.11' + - '3.12' services: - postgresql addons: apt: packages: - - libgdal-dev - - postgresql-12-postgis-3 + - libgdal-dev + - postgresql-12-postgis-3 env: global: - - PGPORT=5432 - - UMAP_SETTINGS=umap/tests/settings.py + - PGPORT=5432 + - 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 diff --git a/Makefile b/Makefile index 6939e99a..70a4500d 100644 --- a/Makefile +++ b/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/ &&\ - vermin --no-tips --violations -t=3.8- umap/ + ruff format --check --target-version=py310 umap/ &&\ + vermin --no-tips --violations -t=3.10- umap/ docs: ## Compile the docs mkdocs build diff --git a/pyproject.toml b/pyproject.toml index 5be883a9..8cfb976f 100644 --- a/pyproject.toml +++ b/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",