Skip to content

Commit

Permalink
Align Tox, GH Actions, setup.cfg (py312,dj42,dj51)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
JonathanWillitts committed Sep 5, 2024
1 parent b7a15e2 commit d32a01e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ on: [push, pull_request]

jobs:
build:
name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }})
name: |
build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }}, ${{ matrix.database-engine }})
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
python-version: ['3.12']
django-version: ['4.2', '5.0', '5.1', 'dev']
django-version: ['4.2', '5.1', 'dev']
database-engine: ["mysql", "postgres"]

services:
Expand Down Expand Up @@ -68,7 +69,6 @@ jobs:
python -m pip install --upgrade pip
python -m pip install -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/tox.txt
- name: Tox tests
run: |
tox -v
Expand Down
6 changes: 2 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exclude_lines = [
legacy_tox_ini = """
[tox]
envlist =
py{312}-dj{42,50,51,dev},
py{312}-dj{42,51,dev},
lint
isolated_build = true
Expand All @@ -47,7 +47,6 @@ python =
[gh-actions:env]
DJANGO =
4.2: dj42
5.0: dj50
5.1: dj51
dev: djdev, lint
Expand All @@ -58,8 +57,7 @@ deps =
-r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/edc.txt
-r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/third_party_dev.txt
dj42: Django>=4.2,<5.0
dj50: Django>=5.0,<5.1
dj51: Django>=5.1
dj51: Django>=5.1,<5.2
djdev: https://github.com/django/django/tarball/main
commands =
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ classifiers=
Programming Language :: Python :: 3.12
License :: OSI Approved :: GNU General Public License v3 (GPLv3)


[options]
python_requires = >=3.12
zip_safe = False
Expand Down

0 comments on commit d32a01e

Please sign in to comment.