Skip to content

Commit 149654f

Browse files
Align Tox, GH Actions, setup.cfg (py312,dj42,dj51)
Includes: - align pyproject.toml files - align build.yml files - align setup.cfg (somewhat) - add Python 3.12 support - add Django 5.1 support, tests - drop Python 3.11 support - drop Django 5.0 support - fix (some) typos
1 parent a6542d9 commit 149654f

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

.github/workflows/build.yml

+16-9
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,17 @@ on: [push, pull_request]
55

66
jobs:
77
build:
8-
name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }})
8+
name: |
9+
build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }}, ${{ matrix.database-engine }})
910
runs-on: ubuntu-latest
1011

1112
strategy:
1213
fail-fast: false
1314
matrix:
14-
python-version: ['3.11', '3.12']
15-
django-version: ['4.2', '5.0', 'dev']
15+
python-version: ['3.12']
16+
django-version: ['4.2', '5.1', 'dev']
17+
database-engine: ["mysql", "postgres"]
1618

17-
exclude:
18-
- python-version: '3.12'
19-
django-version: '4.2'
20-
- python-version: '3.11'
21-
django-version: 'dev'
2219
services:
2320
mysql:
2421
image: mysql:latest
@@ -28,6 +25,17 @@ jobs:
2825
ports:
2926
- 3306:3306
3027
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
28+
postgres:
29+
image: postgres:latest
30+
env:
31+
POSTGRES_PASSWORD: postgres
32+
options: >-
33+
--health-cmd pg_isready
34+
--health-interval 10s
35+
--health-timeout 5s
36+
--health-retries 5
37+
ports:
38+
- 5432:5432
3139

3240
steps:
3341
- name: Install pycups and words dependency
@@ -61,7 +69,6 @@ jobs:
6169
python -m pip install --upgrade pip
6270
python -m pip install -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/tox.txt
6371
64-
6572
- name: Tox tests
6673
run: |
6774
tox -v

pyproject.toml

+5-7
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ version_file="_version.py"
66

77
[tool.black]
88
line-length = 95
9-
target-version = ["py311"]
9+
target-version = ["py312"]
1010
extend-exclude = '''^(.*\/)*\b(migrations)\b($|\/.*$)'''
1111

1212
[tool.isort]
1313
profile = "black"
14-
py_version = "311"
14+
py_version = "312"
1515
skip = [".tox", ".eggs", "migrations"]
1616

1717
[tool.coverage.run]
@@ -35,21 +35,19 @@ exclude_lines = [
3535
legacy_tox_ini = """
3636
[tox]
3737
envlist =
38-
py{311}-dj{42,50},
39-
py{312}-dj{50,dev},
38+
py{312}-dj{42,51,dev},
4039
lint
4140
4241
isolated_build = true
4342
4443
[gh-actions]
4544
python =
46-
3.11: py311
4745
3.12: py312, lint
4846
4947
[gh-actions:env]
5048
DJANGO =
5149
4.2: dj42
52-
5.0: dj50
50+
5.1: dj51
5351
dev: djdev, lint
5452
5553
[testenv]
@@ -59,7 +57,7 @@ deps =
5957
-r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/edc.txt
6058
-r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/third_party_dev.txt
6159
dj42: Django>=4.2,<5.0
62-
dj50: Django>=5.0
60+
dj51: Django>=5.1,<5.2
6361
djdev: https://github.com/django/django/tarball/main
6462
6563
commands =

setup.cfg

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ classifiers=
1313
Environment :: Web Environment
1414
Framework :: Django
1515
Framework :: Django :: 4.2
16+
Framework :: Django :: 5.1
1617
Intended Audience :: Developers
1718
Intended Audience :: Science/Research
1819
Operating System :: OS Independent
19-
Programming Language :: Python :: 3.11
2020
Programming Language :: Python :: 3.12
2121
License :: OSI Approved :: GNU General Public License v3 (GPLv3)
2222

23-
2423
[options]
25-
python_requires = >=3.11
24+
python_requires = >=3.12
2625
zip_safe = False
2726
include_package_data = True
2827
packages = find:

0 commit comments

Comments
 (0)