Skip to content

Commit 0699662

Browse files
committed
updated tox.ini
1 parent a536fc5 commit 0699662

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
python-version: '3.13'
6161

6262
- name: Install dependencies
63-
run: pip install -e .[testing]
63+
run: pip install -e .[documentation]
6464

6565
# Start mkdocs server and wait for it to be ready
6666
- run: mkdocs serve &

pyproject.toml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies = [ "django>=4.2" ]
3636

3737
optional-dependencies.documentation = [
3838
# MkDocs to build our documentation.
39-
"mkdocs==1.6",
39+
"mkdocs==1.6.0",
4040
# pylinkvalidator to check for broken links in documentation.
4141
"pylinkvalidator==0.3",
4242
]
@@ -45,7 +45,7 @@ optional-dependencies.optional = [
4545
"coreapi==2.3.1",
4646
"coreschema==0.0.4",
4747
"django-filter",
48-
"django-guardian>=2.4,<2.5",
48+
"django-guardian>=2.4.0,<2.5",
4949
"inflection==0.5.1",
5050
"legacy-cgi; python_version>='3.13'",
5151
"markdown>=3.3.7",
@@ -60,18 +60,20 @@ optional-dependencies.packaging = [
6060
"twine>=3.4.2,<4.0.2",
6161

6262
# Wheel for PyPI installs.
63-
"wheel>=0.36.2,<0.40",
63+
"wheel>=0.36.2,<0.40.0",
6464

6565
]
6666
optional-dependencies.testing = [
6767
# temporary pin of attrs
68-
"attrs==22.1",
69-
"importlib-metadata<5",
68+
"attrs==22.1.0",
69+
"importlib-metadata<5.0",
7070

7171
# Pytest for running the tests.
72-
"pytest>=7.0.1,<8",
73-
"pytest-cov>=4,<5",
74-
"pytest-django>=4.5.2,<5",
72+
"pytest>=7.0.1,<8.0",
73+
"pytest-cov>=4.0.0,<5.0",
74+
"pytest-django>=4.5.2,<5.0",
75+
76+
# Remove when dropping support for Django<5.0
7577
"pytz",
7678
]
7779
urls.Changelog = "https://www.django-rest-framework.org/community/release-notes/"

tox.ini

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,29 @@ setenv =
1616
PYTHONDONTWRITEBYTECODE=1
1717
PYTHONWARNINGS=once
1818
deps =
19-
django42: Django>=4.2,<5.0
20-
django50: Django>=5.0,<5.1
21-
django51: Django>=5.1,<5.2
22-
django52: Django>=5.2,<6.0
23-
django60: Django>=6.0,<6.1
24-
djangomain: https://github.com/django/django/archive/main.tar.gz
25-
.[testing, optional]
19+
django42: Django>=4.2,<5.0
20+
django50: Django>=5.0,<5.1
21+
django51: Django>=5.1,<5.2
22+
django52: Django>=5.2,<6.0
23+
django60: Django>=6.0,<6.1
24+
djangomain: https://github.com/django/django/archive/main.tar.gz
25+
.[testing,optional]
2626

2727
[testenv:base]
2828
; Ensure optional dependencies are not required
2929
deps =
30-
.[testing]
30+
.[testing]
3131

3232
[testenv:dist]
3333
commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py --no-pkgroot --staticfiles {posargs}
3434
deps =
35-
.[testing, optional]
35+
.[testing,optional]
3636

3737
[testenv:docs]
3838
skip_install = true
3939
commands = mkdocs build
4040
deps =
41-
.[testing, optional]
42-
41+
.[testing,documentation]
4342

4443
[testenv:py312-djangomain]
4544
ignore_outcome = true

0 commit comments

Comments
 (0)