fix: Replaced whitelist_externals with allowlist_externals in tox and…

… removed tox-battery

requirements/ci.in

@@ -3,5 +3,4 @@
 
 coveralls                 # Code coverage reporting
 tox                       # Virtualenv management for tests
-tox-battery               # Makes tox aware of requirements file changes
 edx-i18n-tools            # Manage translation files, needed both for Travis and development

requirements/ci.txt

@@ -8,43 +8,50 @@ asgiref==3.7.2
     # via django
 certifi==2023.7.22
     # via requests
-charset-normalizer==3.3.2
+charset-normalizer==3.3.0
     # via requests
 coverage==6.5.0
     # via coveralls
 coveralls==3.3.1
     # via -r requirements/ci.in
 distlib==0.3.7
     # via virtualenv
-django==3.2.23
+django==3.2.22
     # via
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   edx-i18n-tools
 docopt==0.6.2
     # via coveralls
+edx-i18n-tools==1.3.0
 edx-i18n-tools==1.3.0
     # via -r requirements/ci.in
-filelock==3.13.1
+filelock==3.12.4
     # via
     #   tox
     #   virtualenv
 idna==3.4
     # via requests
+lxml==4.9.3
+    # via edx-i18n-tools
+packaging==23.2
 lxml==4.9.3
     # via edx-i18n-tools
 packaging==23.2
     # via tox
 path==16.7.1
     # via edx-i18n-tools
+platformdirs==3.11.0
 platformdirs==3.11.0
     # via virtualenv
+pluggy==1.3.0
 pluggy==1.3.0
     # via tox
 polib==1.2.0
     # via edx-i18n-tools
 py==1.11.0
     # via tox
+pytz==2023.3.post1
 pytz==2023.3.post1
     # via django
 pyyaml==6.0.1
@@ -61,12 +68,10 @@ tox==3.28.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/ci.in
-    #   tox-battery
-tox-battery==0.6.2
-    # via -r requirements/ci.in
 typing-extensions==4.8.0
     # via asgiref
+urllib3==2.0.7
 urllib3==2.0.7
     # via requests
-virtualenv==20.24.6
+virtualenv==20.24.5
     # via tox

requirements/dev.txt

@@ -6,6 +6,7 @@
 #
 appdirs==1.4.4
     # via fs
+arrow==1.3.0
 arrow==1.3.0
     # via cookiecutter
 asgiref==3.7.2
@@ -18,12 +19,13 @@ backports-functools-lru-cache==1.6.6
     # via caniusepython3
 binaryornot==0.4.4
     # via cookiecutter
-boto3==1.28.77
+boto3==1.28.67
     # via fs-s3fs
-botocore==1.31.77
+botocore==1.31.67
     # via
     #   boto3
     #   s3transfer
+build==1.0.3
 build==1.0.3
     # via pip-tools
 caniusepython3==7.3.0
@@ -34,8 +36,9 @@ chardet==5.2.0
     # via
     #   binaryornot
     #   diff-cover
-charset-normalizer==3.3.2
+charset-normalizer==3.3.0
     # via requests
+click==8.1.7
 click==8.1.7
     # via
     #   click-log
@@ -47,11 +50,13 @@ click-log==0.4.0
     # via edx-lint
 code-annotations==1.5.0
     # via edx-lint
+cookiecutter==2.4.0
 cookiecutter==2.4.0
     # via xblock-sdk
 coverage[toml]==6.5.0
     # via
     #   coverage
+    #   coverage
     #   coveralls
     #   pytest-cov
 coveralls==3.3.1
@@ -64,7 +69,7 @@ distlib==0.3.7
     # via
     #   caniusepython3
     #   virtualenv
-django==3.2.23
+django==3.2.22
     # via
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
@@ -74,13 +79,20 @@ django==3.2.23
     #   xblock-sdk
 docopt==0.6.2
     # via coveralls
+edx-i18n-tools==1.3.0
 edx-i18n-tools==1.3.0
     # via -r requirements/travis.in
+<<<<<<< HEAD
 edx-lint==5.3.6
+edx-lint==5.3.6
+=======
+edx-lint==5.3.4
+>>>>>>> fb6b5ee (fix: tox-battery changes removed manually)
     # via -r requirements/quality.in
+exceptiongroup==1.1.3
 exceptiongroup==1.1.3
     # via pytest
-filelock==3.13.1
+filelock==3.12.4
     # via
     #   tox
     #   virtualenv
@@ -93,14 +105,18 @@ fs-s3fs==1.1.1
     # via
     #   openedx-django-pyfs
     #   xblock-sdk
+gitdb==4.0.11
 gitdb==4.0.11
     # via gitpython
+gitpython==3.1.40
 gitpython==3.1.40
     # via transifex-client
 idna==3.4
     # via requests
 importlib-metadata==6.8.0
     # via build
+importlib-metadata==6.8.0
+    # via build
 iniconfig==2.0.0
     # via pytest
 isort==5.12.0
@@ -117,16 +133,22 @@ jmespath==1.0.1
     #   boto3
     #   botocore
 lazy==1.6
-    # via xblock
+    # via
+    #   bok-choy
+    #   xblock
 lazy-object-proxy==1.9.0
     # via astroid
 lxml==4.9.3
     # via
     #   edx-i18n-tools
+    #   edx-i18n-tools
     #   xblock
     #   xblock-sdk
 mako==1.2.4
-    # via xblock
+    # via
+    #   -r requirements/base.in
+    #   xblock
+    #   xblock-utils
 markdown-it-py==3.0.0
     # via rich
 markupsafe==2.1.3
@@ -138,12 +160,15 @@ mccabe==0.6.1
     # via pylint
 mdurl==0.1.2
     # via markdown-it-py
+mdurl==0.1.2
+    # via markdown-it-py
 mock==5.1.0
     # via -r requirements/test.in
 nose==1.3.7
     # via -r requirements/test.in
 openedx-django-pyfs==3.4.0
     # via xblock
+packaging==23.2
 packaging==23.2
     # via
     #   build
@@ -154,12 +179,15 @@ path==16.7.1
     # via edx-i18n-tools
 pbr==5.11.1
     # via stevedore
+pip-tools==7.3.0
 pip-tools==7.3.0
     # via -r requirements/dev.in
+platformdirs==3.11.0
 platformdirs==3.11.0
     # via
     #   pylint
     #   virtualenv
+pluggy==1.3.0
 pluggy==1.3.0
     # via
     #   diff-cover
@@ -169,6 +197,7 @@ polib==1.2.0
     # via edx-i18n-tools
 py==1.11.0
     # via tox
+pycodestyle==2.11.1
 pycodestyle==2.11.1
     # via -r requirements/quality.in
 pydocstyle==6.3.0
@@ -177,6 +206,10 @@ pygments==2.16.1
     # via
     #   diff-cover
     #   rich
+pygments==2.16.1
+    # via
+    #   diff-cover
+    #   rich
 pylint==2.12.2
     # via
     #   -c requirements/constraints.txt
@@ -186,7 +219,12 @@ pylint==2.12.2
     #   pylint-plugin-utils
 pylint-celery==0.3
     # via edx-lint
+<<<<<<< HEAD
+pylint-django==2.5.5
 pylint-django==2.5.5
+=======
+pylint-django==2.5.3
+>>>>>>> fb6b5ee (fix: tox-battery changes removed manually)
     # via edx-lint
 pylint-plugin-utils==0.8.2
     # via
@@ -198,7 +236,12 @@ pypng==0.20220715.0
     #   xblock-sdk
 pyproject-hooks==1.0.0
     # via build
+<<<<<<< HEAD
+pytest==7.4.3
 pytest==7.4.3
+=======
+pytest==7.4.2
+>>>>>>> fb6b5ee (fix: tox-battery changes removed manually)
     # via
     #   -r requirements/test.in
     #   pytest-cov
@@ -217,6 +260,7 @@ python-slugify==4.0.1
     #   code-annotations
     #   cookiecutter
     #   transifex-client
+pytz==2023.3.post1
 pytz==2023.3.post1
     # via
     #   django
@@ -235,13 +279,19 @@ requests==2.31.0
     #   coveralls
     #   transifex-client
     #   xblock-sdk
+rich==13.6.0
+    # via cookiecutter
+s3transfer==0.7.0
 rich==13.6.0
     # via cookiecutter
 s3transfer==0.7.0
     # via boto3
+selenium==3.141.0
+    # via bok-choy
 simplejson==3.19.2
     # via
     #   xblock
+    #   xblock
     #   xblock-sdk
 six==1.16.0
     # via
@@ -251,6 +301,7 @@ six==1.16.0
     #   python-dateutil
     #   tox
     #   transifex-client
+smmap==5.0.1
 smmap==5.0.1
     # via gitdb
 snowballstemmer==2.2.0
@@ -275,11 +326,11 @@ tox==3.28.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/travis.in
-    #   tox-battery
-tox-battery==0.6.2
-    # via -r requirements/travis.in
 transifex-client==0.14.4
     # via -r requirements/dev.in
+types-python-dateutil==2.8.19.14
+    # via arrow
+typing-extensions==4.8.0
 types-python-dateutil==2.8.19.14
     # via arrow
 typing-extensions==4.8.0
@@ -288,12 +339,19 @@ typing-extensions==4.8.0
     #   astroid
     #   pylint
     #   rich
+urllib3==1.26.18
+    #   rich
 urllib3==1.26.18
     # via
     #   botocore
     #   requests
     #   transifex-client
+<<<<<<< HEAD
 virtualenv==20.24.6
+virtualenv==20.24.6
+=======
+virtualenv==20.24.5
+>>>>>>> fb6b5ee (fix: tox-battery changes removed manually)
     # via tox
 web-fragments==2.1.0
     # via
@@ -303,10 +361,11 @@ webob==1.8.7
     # via
     #   xblock
     #   xblock-sdk
-wheel==0.41.3
+wheel==0.41.2
     # via pip-tools
 wrapt==1.13.3
     # via astroid
+xblock[django]==1.8.1
 xblock[django]==1.8.1
     # via
     #   -r requirements/base.in
@@ -315,6 +374,8 @@ xblock-sdk==0.7.0
     # via
     #   -r requirements/dev.in
     #   -r requirements/test.in
+xblock-utils==4.0.0
+    # via -r requirements/base.in
 zipp==3.17.0
     # via importlib-metadata