Skip to content

Commit

Permalink
Merge branch 'maint/update-gh-tox-support-matrix' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
JonathanWillitts committed Apr 26, 2023
2 parents adfbc26 + 6396437 commit c29c9da
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ on: [push, pull_request]

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

strategy:
fail-fast: false
matrix:
python-version: ['3.9', '3.10']
django-version: ['3.2', '4.0', '4.1', 'dev']
python-version: ['3.10', '3.11']

services:
mysql:
Expand Down
17 changes: 10 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ write_to = "_version.py"

[tool.black]
line-length = 95
target-version = ["py39"]
target-version = ["py310"]
extend-exclude = '''^(.*\/)*\b(migrations)\b($|\/.*$)'''

[tool.isort]
profile = "black"
py_version = "39"
py_version = "310"
skip = [".tox", ".eggs", "migrations"]

[tool.coverage.run]
Expand All @@ -27,21 +27,23 @@ source = ["edc_constants"]
show_missing = true
skip_covered = true
omit = ["requirements.txt"]
exclude_lines = [
"pragma: no cover",
"if TYPE_CHECKING:",
]

[tool.tox]
legacy_tox_ini = """
[tox]
envlist =
lint
isolated_build = true
[gh-actions]
python =
3.8: py38
3.9: py39, lint
3.10: py310
3.10: py310, lint
3.11: py311, lint
[testenv]
deps =
Expand All @@ -50,6 +52,7 @@ deps =
commands =
pip install -U pip
pip --version
pip freeze
[testenv:lint]
deps = -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/lint.txt
Expand Down
7 changes: 2 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,17 @@ keywords = django edc choices constants, clinicedc, clinical trials
classifiers=
Environment :: Web Environment
Framework :: Django
Framework :: Django :: 3.2
Framework :: Django :: 4.0
Framework :: Django :: 4.1
Intended Audience :: Developers
Intended Audience :: Science/Research
Operating System :: OS Independent
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
License :: OSI Approved :: GNU General Public License v3 (GPLv3)


[options]
python_requires = >=3.9
python_requires = >=3.10
zip_safe = False
include_package_data = True
packages = find:
Expand Down

0 comments on commit c29c9da

Please sign in to comment.