From 7dcc0d7ffa1dc40bdbf83029abb20de5df87db36 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Wed, 1 Nov 2023 19:00:39 +0500 Subject: [PATCH 1/2] fix: tox 40 changes added --- tox.ini | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 4a19447..bbc2d45 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = [testenv] deps = -rrequirements/test.txt - -e git+https://github.com/openedx/codejail.git@3.0.0#egg=codejail + -e git+https://github.com/openedx/codejail.git@3.0.0\#egg=codejail django32: Django>=3.2,<4.0 django42: Django>=4.2,<4.3 commands = @@ -22,7 +22,10 @@ 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 = @@ -30,14 +33,20 @@ 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 = From b688ca5c12bd7e0fe5f56a78f41070e40be39149 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Fri, 10 Nov 2023 22:07:32 +0500 Subject: [PATCH 2/2] chore: upgrade requirements --- requirements/base.txt | 2 +- requirements/ci.txt | 27 ++++++++++++++++++--------- requirements/common_constraints.txt | 4 ---- requirements/quality.txt | 6 +++--- requirements/test.txt | 2 +- requirements/tox.txt | 26 +++++++++++++++++--------- 6 files changed, 40 insertions(+), 27 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 0545d63..1f02b35 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 diff --git a/requirements/ci.txt b/requirements/ci.txt index 2d8e911..04adb2e 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -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 @@ -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 diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index afe6aa8..15aafb2 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -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 diff --git a/requirements/quality.txt b/requirements/quality.txt index 3434c1f..01af18b 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -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 @@ -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 diff --git a/requirements/test.txt b/requirements/test.txt index 5c45164..0959bfa 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -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 diff --git a/requirements/tox.txt b/requirements/tox.txt index 5ffd9e7..4685671 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,6 +4,12 @@ # # 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 @@ -11,20 +17,22 @@ filelock==3.13.1 # 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