Skip to content

Commit

Permalink
Merge branch 'release/0.3.35' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvw committed Aug 23, 2023
2 parents 1bec4bc + 517602f commit b0b8891
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.10', '3.11']
django-version: ['4.1', '4.2', 'dev']
exclude:
- python-version: '3.10'
django-version: 'dev'
python-version: ['3.11']
django-version: ['4.2', 'dev']
services:
mysql:
image: mysql:latest
Expand Down
6 changes: 1 addition & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,17 @@ exclude_lines = [
legacy_tox_ini = """
[tox]
envlist =
py{310}-dj{41,42},
py{311}-dj{41,42,dev},
py{311}-dj{42,dev},
lint
isolated_build = true
[gh-actions]
python =
3.10: py310
3.11: py311, lint
[gh-actions:env]
DJANGO =
4.1: dj41
4.2: dj42, lint
dev: djdev
Expand All @@ -59,7 +56,6 @@ deps =
-r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/test_utils.txt
-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
dj41: Django>=4.1,<4.2
dj42: Django>=4.2,<5.0
djdev: https://github.com/django/django/tarball/main
Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ keywords = django Edc CSV, export, clinicedc, clinical trials
classifiers=
Environment :: Web Environment
Framework :: Django
Framework :: Django :: 4.1
Framework :: Django :: 4.2
Intended Audience :: Developers
Intended Audience :: Science/Research
Operating System :: OS Independent
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
License :: OSI Approved :: GNU General Public License v3 (GPLv3)


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

0 comments on commit b0b8891

Please sign in to comment.