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
  • Loading branch information
JonathanWillitts committed Sep 6, 2024
1 parent 2d56d47 commit 9102838
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ on: [push, pull_request]
jobs:
build:
name: >
${{ matrix.codebase }}-
Py${{ matrix.python-version }}-
Dj${{ matrix.django-version }}-
${{ matrix.codebase }} /
py${{ matrix.python-version }} /
dj${{ matrix.django-version }} /
${{ matrix.database-engine }}
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
codebase: ['Prod', 'Dev']
django-version: ['4.2', '5.1', 'dev']
python-version: ['3.12']
django-version: ['4.2', '5.1', 'dev']
database-engine: ["mysql", "postgres"]
exclude:
- codebase: 'Prod'
Expand All @@ -43,6 +43,7 @@ jobs:
--health-retries 5
ports:
- 5432:5432

steps:
- name: Install pycups and words dependency
run: |
Expand Down Expand Up @@ -75,7 +76,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
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ exclude_lines = [
legacy_tox_ini = """
[tox]
envlist =
py{312}-dj{50}-edc{prod},
py{312}-dj{50,dev}-edc{dev},
py{312}-dj{42,51}-edc{prod,dev},
py{312}-dj{dev}-edc{dev},
lint
isolated_build = true
Expand All @@ -48,7 +48,7 @@ python =
[gh-actions:env]
DJANGO =
4.2: dj42
5.0: dj50, lint
5.1: dj51, lint
dev: djdev
EDC_CODEBASE =
Prod: edcprod, lint
Expand All @@ -60,7 +60,7 @@ deps =
-r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/test_utils.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,<6.0
dj51: Django>=5.1,<5.2
djdev: https://github.com/django/django/tarball/main
commands =
Expand All @@ -69,7 +69,7 @@ commands =
edcdev: pip install -U -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/edc.txt
edcdev: pip install -U git+https://github.com/intecomm-trial/intecomm-form-validators.git@develop
pip freeze
coverage run runtests.py
coverage run -a runtests.py
coverage report
[testenv:lint]
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 9102838

Please sign in to comment.