Skip to content

Commit 80f019f

Browse files
authored
Merge pull request #55 from meshy/fix-ci
Fix CI
2 parents 3020ca5 + c4dbb2a commit 80f019f

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install dependencies
2424
run: |
2525
python -m pip install --upgrade pip
26-
pip install tox tox-gh-actions pre-commit tox-poetry-dev-dependencies
26+
pip install tox tox-gh-actions pre-commit
2727
2828
- name: Test with tox
2929
run: tox

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ Version numbers should follow https://semver.org/spec/v2.0.0.html
77

88
## [Unreleased]
99

10+
### Changed
11+
12+
- Remove upper boundary on supported Python version.
13+
- Python 3.10 tests now only run against Django 3.2+, because Django <3.2 does
14+
not support Python 3.10.
15+
- Specify a minimum `attrs` version of `21.4.0`.
16+
17+
## Fixed
18+
19+
- Fix broken CI by removing `tox-poetry-dev-dependencies`.
1020

1121
## [2.1.0] - 2022-08-01
1222

pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,13 @@ classifiers = [
3838

3939

4040
[tool.poetry.dependencies]
41-
python = ">=3.6,<3.11"
42-
attrs = ""
41+
python = "^3.6"
42+
attrs = "^21.4.0"
4343

4444
[tool.poetry.dev-dependencies]
4545
django-environ = "^0.4.5"
4646
pytest = "^6.2.2"
4747
pytest-django = "^4.1.0"
48-
tox-poetry-dev-dependencies = "^0.0.9"
4948

5049
[build-system]
5150
requires = ["poetry>=0.12"]

tox.ini

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ envlist =
44
py37-django{111,20,21,22,30,31,32}
55
py38-django{22,30,31,32,40}
66
py39-django{22,30,31,32,40}
7-
py310-django{22,30,31,32,40}
7+
py310-django{32,40}
88

99
isolated_build = True
1010

@@ -17,10 +17,13 @@ python =
1717
3.10: py310
1818

1919
[testenv]
20-
poetry_add_dev_dependencies = True
2120
commands =
2221
python -m pytest {posargs:tests} -vv
2322
deps =
23+
django-environ>=0.4.5
24+
pytest>=6.2.2
25+
pytest-django>=4.1.0
26+
2427
django111: django~=1.11.0
2528
django20: django~=2.0.0
2629
django21: django~=2.1.0

0 commit comments

Comments
 (0)