From 7d9749461e178a7b64c0c9bf5ce10fa9fbb4d0d0 Mon Sep 17 00:00:00 2001 From: erikvw Date: Tue, 10 Oct 2023 00:08:00 -0500 Subject: [PATCH] setup --- .github/workflows/build.yml | 7 ++----- .pre-commit-config.yaml | 2 +- pyproject.toml | 14 +++++--------- setup.cfg | 5 ++--- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 625f24a..b38bb90 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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'] steps: - name: Install pycups and words dependency run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 55139a2..39c69a9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - "-x *test*.py" - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.9.1 hooks: - id: black language_version: python3.10 diff --git a/pyproject.toml b/pyproject.toml index ae58c93..53b74a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,18 +1,17 @@ [build-system] -requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"] -build-backend = "setuptools.build_meta" +requires = ["setuptools>=60", "setuptools-scm>=8.0"] [tool.setuptools_scm] -write_to = "_version.py" +version_file="_version.py" [tool.black] line-length = 95 -target-version = ["py310"] +target-version = ["py311"] extend-exclude = '''^(.*\/)*\b(migrations)\b($|\/.*$)''' [tool.isort] profile = "black" -py_version = "310" +py_version = "311" skip = [".tox", ".eggs", "migrations"] [tool.coverage.run] @@ -36,19 +35,17 @@ exclude_lines = [ legacy_tox_ini = """ [tox] envlist = - py{310,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 @@ -58,7 +55,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 diff --git a/setup.cfg b/setup.cfg index a36e9da..53bbcd6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,17 +12,16 @@ keywords = django edc INTECOMM EDC eligibility, 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 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: