Skip to content

Commit a159914

Browse files
committed
deps: adaptations for Django 5.x
1 parent 4de8b2e commit a159914

File tree

4 files changed

+58
-61
lines changed

4 files changed

+58
-61
lines changed

.github/workflows/test-docs.yml

+44-44
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Test & Docs
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66
pull_request:
7-
branches: [ master ]
7+
branches: [master]
88

99
jobs:
1010
tests:
@@ -24,57 +24,57 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
python-version: ["3.8", "3.12"]
27+
python-version: ['3.10', '3.12']
2828
database: [postgresql]
2929

3030
steps:
31-
- uses: actions/checkout@v3
32-
- name: Set up Python ${{ matrix.python-version }}
33-
uses: actions/setup-python@v4
34-
with:
35-
python-version: ${{ matrix.python-version }}
36-
cache: 'pip'
37-
cache-dependency-path: '**/pyproject.toml'
38-
- name: Install dependencies
39-
run: |
40-
sudo apt update
41-
sudo apt install libgdal-dev
42-
python -m pip install --upgrade pip
43-
make develop installjs vendors
44-
- name: run tests
45-
run: make test
46-
env:
47-
DJANGO_SETTINGS_MODULE: 'umap.tests.settings'
48-
UMAP_SETTINGS: 'umap/tests/settings.py'
31+
- uses: actions/checkout@v3
32+
- name: Set up Python ${{ matrix.python-version }}
33+
uses: actions/setup-python@v4
34+
with:
35+
python-version: ${{ matrix.python-version }}
36+
cache: 'pip'
37+
cache-dependency-path: '**/pyproject.toml'
38+
- name: Install dependencies
39+
run: |
40+
sudo apt update
41+
sudo apt install libgdal-dev
42+
python -m pip install --upgrade pip
43+
make develop installjs vendors
44+
- name: run tests
45+
run: make test
46+
env:
47+
DJANGO_SETTINGS_MODULE: 'umap.tests.settings'
48+
UMAP_SETTINGS: 'umap/tests/settings.py'
4949
lint:
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@v3
53-
- name: Set up Python
54-
uses: actions/setup-python@v4
55-
with:
56-
python-version: "3.11"
57-
- name: Install dependencies
58-
run: |
59-
python3 -m pip install -e .[test,dev]
52+
- uses: actions/checkout@v3
53+
- name: Set up Python
54+
uses: actions/setup-python@v4
55+
with:
56+
python-version: '3.11'
57+
- name: Install dependencies
58+
run: |
59+
python3 -m pip install -e .[test,dev]
60+
61+
- name: Run Lint
62+
run: make lint
6063

61-
- name: Run Lint
62-
run: make lint
63-
64-
- name: Run Docs
65-
run: make docs
64+
- name: Run Docs
65+
run: make docs
6666

6767
docs:
6868
runs-on: ubuntu-latest
6969
steps:
70-
- uses: actions/checkout@v3
71-
- name: Set up Python
72-
uses: actions/setup-python@v4
73-
with:
74-
python-version: "3.11"
75-
- name: Install dependencies
76-
run: |
77-
python3 -m pip install -r docs/requirements.txt
70+
- uses: actions/checkout@v3
71+
- name: Set up Python
72+
uses: actions/setup-python@v4
73+
with:
74+
python-version: '3.11'
75+
- name: Install dependencies
76+
run: |
77+
python3 -m pip install -r docs/requirements.txt
7878
79-
- name: Run Docs
80-
run: mkdocs build
79+
- name: Run Docs
80+
run: mkdocs build

.travis.yml

+10-11
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,30 @@ os: linux
22
language: python
33
dist: focal
44
python:
5-
- "3.6"
6-
- "3.7"
7-
- "3.8"
8-
- "3.9"
5+
- '3.10'
6+
- '3.11'
7+
- '3.12'
98
services:
109
- postgresql
1110
addons:
1211
apt:
1312
packages:
14-
- libgdal-dev
15-
- postgresql-12-postgis-3
13+
- libgdal-dev
14+
- postgresql-12-postgis-3
1615
env:
1716
global:
18-
- PGPORT=5432
19-
- UMAP_SETTINGS=umap/tests/settings.py
17+
- PGPORT=5432
18+
- UMAP_SETTINGS=umap/tests/settings.py
2019
install:
21-
- make develop
20+
- make develop
2221
script: make test
2322
notifications:
2423
irc:
2524
channels:
26-
- "irc.libera.chat#umap"
25+
- 'irc.libera.chat#umap'
2726
on_success: change
2827
on_failure: always
2928
email: false
3029
branches:
3130
only:
32-
- master
31+
- master

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ develop: ## Install the test and dev dependencies
1616
format: ## Format the code and templates files
1717
djlint umap/templates --reformat &&\
1818
isort --profile black . &&\
19-
ruff format --target-version=py38 .
19+
ruff format --target-version=py310 .
2020

2121
.PHONY: lint
2222
lint: ## Lint the code and template files
2323
djlint umap/templates --lint &&\
2424
isort --check --profile black umap/ &&\
25-
ruff format --check --target-version=py38 umap/ &&\
26-
vermin --no-tips --violations -t=3.8- umap/
25+
ruff format --check --target-version=py310 umap/ &&\
26+
vermin --no-tips --violations -t=3.10- umap/
2727

2828
docs: ## Compile the docs
2929
mkdocs build

pyproject.toml

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@ maintainers = [
1515
]
1616
homepage = "https://github.com/umap-project/umap"
1717
keywords = ["django", "leaflet", "geodjango", "openstreetmap", "map"]
18-
requires-python = ">=3.8"
18+
requires-python = ">=3.10"
1919
classifiers = [
2020
"Development Status :: 4 - Beta",
2121
"Intended Audience :: Developers",
2222
"Operating System :: OS Independent",
2323
"Topic :: Software Development :: Libraries :: Python Modules",
2424
"Programming Language :: Python",
2525
"Programming Language :: Python :: 3 :: Only",
26-
"Programming Language :: Python :: 3.8",
27-
"Programming Language :: Python :: 3.9",
2826
"Programming Language :: Python :: 3.10",
2927
"Programming Language :: Python :: 3.11",
3028
"Programming Language :: Python :: 3.12",

0 commit comments

Comments
 (0)