Skip to content

Commit d19386f

Browse files
committed
Fix tox config.
1 parent 5e82e72 commit d19386f

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
tests:
1313
name: "Python ${{ matrix.python-version }}"
14-
runs-on: "ubuntu-latest"
14+
runs-on: "ubuntu-20.04"
1515
services:
1616
redis:
1717
image: redis

pyproject.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ packages = [{ include = "cacheback" }]
3232
include = ["LICENSE"]
3333

3434
[tool.poetry.dependencies]
35-
python = ">=3.6,<4"
35+
python = ">=3.6.2,<4"
3636
importlib-metadata = {version = "*", python = "<3.8"}
3737

3838
django = ">=2"
@@ -46,11 +46,13 @@ pytest-django = ">=4.1"
4646
pytest-cov = ">=2.10"
4747
pytest-isort = ">=1.2"
4848
pytest-flake8 = ">=1.0"
49-
pytest-black = {version = ">=0.3", python = ">=3.6.2,<4"}
49+
flake8 = "<5"
50+
pytest-black = {version = ">=0.3"}
5051
freezegun = ">=1.0"
5152
coverage = {version = ">=5.0", extras = ["toml"]}
5253
celery = ">=4"
5354
django-rq = ">=2"
55+
typing_extensions = { version = ">=3.10", python = "<3.10" }
5456

5557
[tool.poetry.extras]
5658
celery = ["celery"]

tox.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ deps =
2121
django31: Django>=3.1,<3.2
2222
django32: Django>=3.2,<3.3
2323
django40: Django>=4.0,<4.1
24-
whitelist_externals =
24+
allowlist_externals =
2525
poetry
2626
sh
2727
skip_install = true
2828
commands =
29-
poetry export --dev --without-hashes -o {toxworkdir}/requirements.txt
29+
poetry export --with dev --without-hashes -o {toxworkdir}/requirements.txt
3030
sh -c 'grep -v "^[dD]jango==" {toxworkdir}/requirements.txt | poetry run pip install --no-deps -r /dev/stdin'
31-
poetry run pytest --isort --flake8 --black --cov
31+
pytest --isort --flake8 --black --cov

0 commit comments

Comments
 (0)