deps: adaptations for Django 5.x

This commit is contained in:
David Larlet 2024-01-29 13:36:05 -05:00
parent 4de8b2ec96
commit a159914c53
No known key found for this signature in database
GPG key ID: 3E2953A359E7E7BD
4 changed files with 58 additions and 61 deletions

View file

@ -2,9 +2,9 @@ name: Test & Docs
on: on:
push: push:
branches: [ master ] branches: [master]
pull_request: pull_request:
branches: [ master ] branches: [master]
jobs: jobs:
tests: tests:
@ -24,7 +24,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
python-version: ["3.8", "3.12"] python-version: ['3.10', '3.12']
database: [postgresql] database: [postgresql]
steps: steps:
@ -53,7 +53,7 @@ jobs:
- 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]
@ -71,7 +71,7 @@ jobs:
- 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

View file

@ -2,10 +2,9 @@ os: linux
language: python language: python
dist: focal dist: focal
python: python:
- "3.6" - '3.10'
- "3.7" - '3.11'
- "3.8" - '3.12'
- "3.9"
services: services:
- postgresql - postgresql
addons: addons:
@ -18,12 +17,12 @@ env:
- PGPORT=5432 - PGPORT=5432
- UMAP_SETTINGS=umap/tests/settings.py - UMAP_SETTINGS=umap/tests/settings.py
install: install:
- make develop - make develop
script: make test script: make test
notifications: notifications:
irc: irc:
channels: channels:
- "irc.libera.chat#umap" - 'irc.libera.chat#umap'
on_success: change on_success: change
on_failure: always on_failure: always
email: false email: false

View file

@ -16,14 +16,14 @@ develop: ## Install the test and dev dependencies
format: ## Format the code and templates files format: ## Format the code and templates files
djlint umap/templates --reformat &&\ djlint umap/templates --reformat &&\
isort --profile black . &&\ isort --profile black . &&\
ruff format --target-version=py38 . ruff format --target-version=py310 .
.PHONY: lint .PHONY: lint
lint: ## Lint the code and template files lint: ## Lint the code and template files
djlint umap/templates --lint &&\ djlint umap/templates --lint &&\
isort --check --profile black umap/ &&\ 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 docs: ## Compile the docs
mkdocs build mkdocs build

View file

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