Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TOX 40 Updates. #125

Merged
merged 2 commits into from
Nov 10, 2023
Merged

TOX 40 Updates. #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dcc0d7
fix: tox 40 changes added
zubairshakoorarbisoft Nov 1, 2023
b688ca5
chore: upgrade requirements
UsamaSadiq Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fs==2.4.16
# via xblock
lxml==4.9.3
# via xblock
mako==1.2.4
mako==1.3.0
# via xblock
markupsafe==2.1.3
# via
Expand Down
27 changes: 18 additions & 9 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@
#
# make upgrade
#
cachetools==5.3.2
# via
# -r requirements/tox.txt
# tox
chardet==5.2.0
# via
# -r requirements/tox.txt
# tox
colorama==0.4.6
# via
# -r requirements/tox.txt
# tox
distlib==0.3.7
# via
# -r requirements/tox.txt
Expand All @@ -16,31 +28,28 @@ filelock==3.13.1
packaging==23.2
# via
# -r requirements/tox.txt
# pyproject-api
# tox
platformdirs==3.11.0
# via
# -r requirements/tox.txt
# tox
# virtualenv
pluggy==1.3.0
# via
# -r requirements/tox.txt
# tox
py==1.11.0
# via
# -r requirements/tox.txt
# tox
six==1.16.0
pyproject-api==1.6.1
# via
# -r requirements/tox.txt
# tox
tomli==2.0.1
# via
# -r requirements/tox.txt
# pyproject-api
# tox
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/tox.txt
tox==4.11.3
# via -r requirements/tox.txt
virtualenv==20.24.6
# via
# -r requirements/tox.txt
Expand Down
4 changes: 0 additions & 4 deletions requirements/common_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,3 @@ elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
6 changes: 3 additions & 3 deletions requirements/quality.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ lxml==4.9.3
# via
# -r requirements/base.txt
# xblock
mako==1.2.4
mako==1.3.0
# via
# -r requirements/base.txt
# xblock
Expand All @@ -47,11 +47,11 @@ markupsafe==2.1.3
# xblock
mccabe==0.7.0
# via pylint
pbr==5.11.1
pbr==6.0.0
# via
# -r requirements/test.txt
# stevedore
platformdirs==3.11.0
platformdirs==4.0.0
# via pylint
pycodestyle==2.11.1
# via -r requirements/quality.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ coverage==7.3.2
# via -r requirements/test.in
edx-opaque-keys==2.5.1
# via -r requirements/test.in
pbr==5.11.1
pbr==6.0.0
# via stevedore
pymongo==3.13.0
# via edx-opaque-keys
Expand Down
26 changes: 17 additions & 9 deletions requirements/tox.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,35 @@
#
# make upgrade
#
cachetools==5.3.2
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.7
# via virtualenv
filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.2
# via tox
# via
# pyproject-api
# tox
platformdirs==3.11.0
# via virtualenv
# via
# tox
# virtualenv
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
six==1.16.0
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/tox.in
# pyproject-api
# tox
tox==4.11.3
# via -r requirements/tox.in
virtualenv==20.24.6
# via tox
17 changes: 13 additions & 4 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ envlist =
[testenv]
deps =
-rrequirements/test.txt
-e git+https://github.com/openedx/[email protected]#egg=codejail
-e git+https://github.com/openedx/[email protected]\#egg=codejail
django32: Django>=3.2,<4.0
django42: Django>=4.2,<4.3
commands =
Expand All @@ -22,22 +22,31 @@ skip_install = True

[testenv:csslint]
allowlist_externals = {toxinidir}/node_modules/csslint/dist/cli.js
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
passenv =
TRAVIS
TRAVIS_JOB_ID
TRAVIS_BRANCH
commands =
{toxinidir}/node_modules/csslint/dist/cli.js sql_grader/static/
deps =
skip_install = True

[testenv:eslint]
allowlist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
passenv =
TRAVIS
TRAVIS_JOB_ID
TRAVIS_BRANCH
commands =
{toxinidir}/node_modules/eslint/bin/eslint.js sql_grader/static/view.js
deps =
skip_install = True

[testenv:quality]
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
passenv =
TRAVIS
TRAVIS_JOB_ID
TRAVIS_BRANCH
deps =
-rrequirements/quality.txt
commands =
Expand Down
Loading