Skip to content

Commit

Permalink
Merge branch 'release/0.3.26' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvw committed Sep 25, 2023
2 parents a6c1873 + ceb2d03 commit 7de6667
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
python-version: ['3.11']
django-version: ['4.1', '4.2', 'dev']
django-version: ['4.2', 'dev']
services:
mysql:
image: mysql:latest
Expand Down
9 changes: 3 additions & 6 deletions pyproject.toml
@@ -1,9 +1,8 @@
[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
Expand Down Expand Up @@ -36,7 +35,7 @@ exclude_lines = [
legacy_tox_ini = """
[tox]
envlist =
py{311}-dj{41,42,dev},
py{311}-dj{42,dev},
lint
isolated_build = true
Expand All @@ -47,7 +46,6 @@ python =
[gh-actions:env]
DJANGO =
4.1: dj41
4.2: dj42, lint
dev: djdev
Expand All @@ -57,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
Expand Down
Empty file removed requirements.txt
Empty file.

0 comments on commit 7de6667

Please sign in to comment.