From 2671389d520235a236396b598c0877e5b3a59e5e Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Wed, 1 Nov 2023 19:23:40 +0500 Subject: [PATCH 1/2] fix: tox40 chnages added --- requirements/ci.txt | 2 +- requirements/tox.txt | 2 +- tox.ini | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index 317c774..89af7d2 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -51,7 +51,7 @@ tomli==2.0.1 # via # -r requirements/tox.txt # tox -tox==3.28.0 +tox==4.11.3 # via # -c requirements/common_constraints.txt # -r requirements/tox.txt diff --git a/requirements/tox.txt b/requirements/tox.txt index eef11a1..af3c84c 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -22,7 +22,7 @@ six==1.16.0 # via tox tomli==2.0.1 # via tox -tox==3.28.0 +tox==4.11.3 # via # -c requirements/common_constraints.txt # -r requirements/tox.in diff --git a/tox.ini b/tox.ini index 2cb4e06..f33a5c4 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,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 = make requirements_js {toxinidir}/node_modules/csslint/dist/cli.js imagemodal/public/ @@ -29,7 +32,10 @@ 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 = make requirements_js {toxinidir}/node_modules/eslint/bin/eslint.js --fix imagemodal/public/view.js @@ -37,7 +43,10 @@ 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 11ec53770620bf3ea65b7925e6f78fa58d0f9069 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Wed, 1 Nov 2023 19:27:28 +0500 Subject: [PATCH 2/2] fix: make added in allowlist as per tox40 update --- requirements/ci.txt | 2 +- requirements/tox.txt | 2 +- tox.ini | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index 89af7d2..317c774 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -51,7 +51,7 @@ tomli==2.0.1 # via # -r requirements/tox.txt # tox -tox==4.11.3 +tox==3.28.0 # via # -c requirements/common_constraints.txt # -r requirements/tox.txt diff --git a/requirements/tox.txt b/requirements/tox.txt index af3c84c..eef11a1 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -22,7 +22,7 @@ six==1.16.0 # via tox tomli==2.0.1 # via tox -tox==4.11.3 +tox==3.28.0 # via # -c requirements/common_constraints.txt # -r requirements/tox.in diff --git a/tox.ini b/tox.ini index f33a5c4..7a7fa59 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,9 @@ deps = skip_install = True [testenv:csslint] -allowlist_externals = {toxinidir}/node_modules/csslint/dist/cli.js +allowlist_externals = + make + {toxinidir}/node_modules/csslint/dist/cli.js passenv = TRAVIS TRAVIS_JOB_ID @@ -31,7 +33,9 @@ deps = skip_install = True [testenv:eslint] -allowlist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js +allowlist_externals = + make + {toxinidir}/node_modules/eslint/bin/eslint.js passenv = TRAVIS TRAVIS_JOB_ID