Skip to content

Commit f2293d6

Browse files
committed
Remove tox
Resolves #1817 Resolves #1890
1 parent eb44f49 commit f2293d6

File tree

8 files changed

+10
-40
lines changed

8 files changed

+10
-40
lines changed

.coveragerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
branch = 1
33

44
[report]
5-
omit = .tox*,*tests*,*migrations*
5+
omit = *tests*,*migrations*

.github/workflows/tests.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ on:
1010
jobs:
1111
tests:
1212
runs-on: ubuntu-24.04
13-
strategy:
14-
fail-fast: false
15-
matrix:
16-
# tox-gh-actions will only run the tox environments which match the currently
17-
# running python-version. See [gh-actions] in tox.ini for the mapping.
18-
python-version: ["3.12"]
1913

2014
services:
2115
postgres:
@@ -35,10 +29,11 @@ jobs:
3529
- name: Set up Python
3630
uses: actions/setup-python@v5
3731
with:
38-
python-version: "${{ matrix.python-version }}"
32+
python-version: 3.12
3933
- name: Install dependencies
4034
run: |
41-
python -m pip install --upgrade pip setuptools coveralls "tox<5" "tox-gh-actions<4"
35+
python -m pip install --upgrade pip setuptools coveralls
36+
python -m pip install -r requirements/tests.txt
4237
- name: Set up databases
4338
run: |
4439
PGPASSWORD="postgres" createuser -U postgres -d djangoproject --superuser -h localhost
@@ -59,9 +54,9 @@ jobs:
5954
echo '"trac_db_host": "localhost", ' >> conf/secrets.json
6055
echo '"trac_db_password": "secret", ' >> conf/secrets.json
6156
echo '"secret_key": "a"}' >> conf/secrets.json
62-
- name: Run tox
57+
- name: Run tests
6358
run: |
64-
python -m tox
59+
make ci
6560
- name: Coveralls
6661
env:
6762
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ locale/*/LC_MESSAGES/django.mo
1212
.coverage
1313
.direnv
1414
.envrc
15-
.tox
1615
djangoproject/cache
1716
djangoproject/static/css/*.map
1817
djangoproject/static/css/*.css

.pre-commit-config.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ repos:
6161
hooks:
6262
- id: djhtml
6363
files: .*/templates/.*\.html$
64-
- repo: https://github.com/tox-dev/pyproject-fmt
65-
rev: "v2.6.0"
66-
hooks:
67-
- id: pyproject-fmt
6864
- repo: https://github.com/mrtazz/checkmake.git
6965
rev: 0.2.2
7066
hooks:

README.rst

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,13 @@ Our test results can be found here:
130130

131131
* https://github.com/django/djangoproject.com/actions
132132

133-
For local development don't hesitate to install
134-
`tox <https://tox.readthedocs.io/>`_ to run the website's test suite.
135-
136133
Then in the root directory (next to the ``manage.py`` file) run::
137134

138-
tox
135+
make test
139136

140137
Behind the scenes, this will run the usual ``python -m manage test`` management
141138
command with a preset list of apps that we want to test. We
142-
collect test coverage data as part of that tox run, to show the result
139+
collect test coverage data as part of that test run, to show the result
143140
simply run::
144141

145142
python -m coverage report
@@ -364,7 +361,6 @@ Running Locally with Docker
364361

365362
4. Run the tests::
366363

367-
docker compose run --rm web tox
368364
docker compose run --rm web python -m manage test
369365

370366
Pre-commit checks

requirements/tests.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
coverage==7.10.2
33
requests-mock==1.12.1
44
tblib>=3.0.0
5-
tox<5.0.0

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[flake8]
2-
exclude = djangodocs,.tox,*/migrations/*,.direnv,.venv
2+
exclude = djangodocs,*/migrations/*,.direnv,.venv
33
ignore = F405,W504,W503
44
# black enforces an 88 char line length but in some edge cases it's unable to
55
# do so, and in that case it creates an unresolvable E501 error. The solution
@@ -11,7 +11,7 @@ per-file-ignores =
1111
[isort]
1212
line_length = 88
1313
profile = black
14-
skip = .tox,djangodocs,.direnv,.venv
14+
skip = djangodocs,.direnv,.venv
1515
known_first_party = accounts,aggregator,blog,contact,dashboard,djangoproject,docs,foundation,fundraising,legacy,members,releases,svntogit,tracdb
1616
combine_as_imports = true
1717
include_trailing_comma = true

tox.ini

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)