fix: all tox-battery stuff removed manually

openedx · Oct 31, 2023 · 9dc5e93 · 9dc5e93
1 parent 4d23bc5
commit 9dc5e93
Show file tree

Hide file tree

Showing 11 changed files with 171 additions and 156 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -21,7 +21,7 @@ cffi==1.16.0
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==3.3.1
+charset-normalizer==3.3.0
     # via requests
 click==8.1.7
     # via edx-django-utils
@@ -33,7 +33,7 @@ defusedxml==0.8.0rc2
     # via
     #   python3-openid
     #   social-auth-core
-django==4.2.6
+django==4.2.5
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
@@ -60,7 +60,7 @@ django==4.2.6
     #   social-auth-app-django
 django-clearcache==1.2.1
     # via -r requirements/base.in
-django-cors-headers==4.3.0
+django-cors-headers==4.2.0
     # via -r requirements/base.in
 django-crum==0.7.9
     # via
@@ -82,7 +82,7 @@ django-object-actions==4.2.0
     # via
     #   -r requirements/base.in
     #   openedx-ledger
-django-simple-history==3.0.0
+django-simple-history==3.4.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -122,7 +122,7 @@ edx-django-utils==5.7.0
     #   edx-rest-api-client
     #   getsmarter-api-clients
     #   openedx-ledger
-edx-drf-extensions==8.12.0
+edx-drf-extensions==8.10.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
@@ -134,9 +134,9 @@ edx-rbac==1.8.0
     # via
     #   -r requirements/base.in
     #   openedx-ledger
-edx-rest-api-client==5.6.1
+edx-rest-api-client==5.6.0
     # via -r requirements/base.in
-fastavro==1.8.4
+fastavro==1.8.3
     # via openedx-events
 getsmarter-api-clients==0.6.1
     # via -r requirements/base.in
@@ -162,14 +162,14 @@ mysqlclient==2.2.0
     # via
     #   -r requirements/base.in
     #   openedx-ledger
-newrelic==9.1.1
+newrelic==9.1.0
     # via edx-django-utils
 oauthlib==3.2.2
     # via
     #   getsmarter-api-clients
     #   requests-oauthlib
     #   social-auth-core
-openedx-events==9.0.0
+openedx-events==8.6.0
     # via
     #   -r requirements/base.in
     #   openedx-ledger
@@ -183,7 +183,7 @@ pkgutil-resolve-name==1.3.10
     # via jsonschema
 ply==3.11
     # via djangoql
-psutil==5.9.6
+psutil==5.9.5
     # via edx-django-utils
 pycparser==2.21
     # via cffi
@@ -193,7 +193,6 @@ pyjwt[crypto]==2.8.0
     #   edx-auth-backends
     #   edx-drf-extensions
     #   edx-rest-api-client
-    #   pyjwt
     #   social-auth-core
 pymemcache==4.0.0
     # via -r requirements/base.in
@@ -232,7 +231,7 @@ requests-oauthlib==1.3.1
     # via
     #   getsmarter-api-clients
     #   social-auth-core
-rpds-py==0.10.6
+rpds-py==0.10.3
     # via
     #   jsonschema
     #   referencing
@@ -249,7 +248,7 @@ six==1.16.0
     #   edx-rbac
 slumber==0.7.1
     # via edx-rest-api-client
-social-auth-app-django==5.4.0
+social-auth-app-django==5.3.0
     # via edx-auth-backends
 social-auth-core==4.4.2
     # via
@@ -269,7 +268,7 @@ uritemplate==4.1.1
     # via
     #   drf-spectacular
     #   drf-yasg
-urllib3==2.0.7
+urllib3==2.0.5
     # via requests
 zipp==3.17.0
     # via importlib-resources
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -12,7 +12,7 @@ filelock==3.12.4
     #   virtualenv
 packaging==23.2
     # via tox
-platformdirs==3.11.0
+platformdirs==3.10.0
     # via virtualenv
 pluggy==1.3.0
     # via tox

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -1,7 +1,3 @@
-# This is a temporary solution to override the real common_constraints.txt
-# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
-# See BOM-2721 for more details.
-# Below is the copied and edited version of common_constraints
 
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
@@ -18,14 +14,14 @@
 
 
 # using LTS django version
-
+Django<4.0
 
 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
 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

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -8,7 +8,7 @@ asgiref==3.7.2
     # via
     #   -r requirements/validation.txt
     #   django
-astroid==3.0.1
+astroid==2.15.8
     # via
     #   -r requirements/validation.txt
     #   pylint
@@ -42,7 +42,7 @@ cffi==1.16.0
     #   pynacl
 chardet==5.2.0
     # via diff-cover
-charset-normalizer==3.3.1
+charset-normalizer==3.3.0
     # via
     #   -r requirements/validation.txt
     #   requests
@@ -63,10 +63,9 @@ code-annotations==1.5.0
     # via
     #   -r requirements/validation.txt
     #   edx-lint
-coverage[toml]==7.3.2
+coverage[toml]==7.3.1
     # via
     #   -r requirements/validation.txt
-    #   coverage
     #   pytest-cov
 cryptography==41.0.4
     # via
@@ -83,7 +82,7 @@ defusedxml==0.8.0rc2
     #   -r requirements/validation.txt
     #   python3-openid
     #   social-auth-core
-diff-cover==8.0.0
+diff-cover==7.7.0
     # via -r requirements/dev.in
 dill==0.3.7
     # via
@@ -93,7 +92,7 @@ distlib==0.3.7
     # via
     #   -r requirements/validation.txt
     #   virtualenv
-django==4.2.6
+django==4.2.5
     # via
     #   -r requirements/validation.txt
     #   django-clearcache
@@ -121,7 +120,7 @@ django==4.2.6
     #   social-auth-app-django
 django-clearcache==1.2.1
     # via -r requirements/validation.txt
-django-cors-headers==4.3.0
+django-cors-headers==4.2.0
     # via -r requirements/validation.txt
 django-crum==0.7.9
     # via
@@ -152,7 +151,7 @@ django-object-actions==4.2.0
     #   -r requirements/dev.in
     #   -r requirements/validation.txt
     #   openedx-ledger
-django-simple-history==3.0.0
+django-simple-history==3.4.0
     # via
     #   -r requirements/validation.txt
     #   openedx-ledger
@@ -197,37 +196,36 @@ edx-django-utils==5.7.0
     #   edx-rest-api-client
     #   getsmarter-api-clients
     #   openedx-ledger
-edx-drf-extensions==8.12.0
+edx-drf-extensions==8.10.0
     # via
     #   -r requirements/validation.txt
     #   edx-rbac
-edx-i18n-tools==1.3.0
+edx-i18n-tools==1.2.0
     # via -r requirements/dev.in
 edx-lint==5.3.4
     # via -r requirements/validation.txt
 edx-opaque-keys[django]==2.5.1
     # via
     #   -r requirements/validation.txt
     #   edx-drf-extensions
-    #   edx-opaque-keys
     #   openedx-events
 edx-rbac==1.8.0
     # via
     #   -r requirements/validation.txt
     #   openedx-ledger
-edx-rest-api-client==5.6.1
+edx-rest-api-client==5.6.0
     # via -r requirements/validation.txt
 exceptiongroup==1.1.3
     # via
     #   -r requirements/validation.txt
     #   pytest
 factory-boy==3.3.0
     # via -r requirements/validation.txt
-faker==19.11.0
+faker==19.6.2
     # via
     #   -r requirements/validation.txt
     #   factory-boy
-fastavro==1.8.4
+fastavro==1.8.3
     # via
     #   -r requirements/validation.txt
     #   openedx-events
@@ -298,8 +296,10 @@ keyring==24.2.0
     # via
     #   -r requirements/validation.txt
     #   twine
-lxml==4.9.3
-    # via edx-i18n-tools
+lazy-object-proxy==1.9.0
+    # via
+    #   -r requirements/validation.txt
+    #   astroid
 markdown-it-py==3.0.0
     # via
     #   -r requirements/validation.txt
@@ -326,7 +326,7 @@ mysqlclient==2.2.0
     # via
     #   -r requirements/validation.txt
     #   openedx-ledger
-newrelic==9.1.1
+newrelic==9.1.0
     # via
     #   -r requirements/validation.txt
     #   edx-django-utils
@@ -340,7 +340,7 @@ oauthlib==3.2.2
     #   getsmarter-api-clients
     #   requests-oauthlib
     #   social-auth-core
-openedx-events==9.0.0
+openedx-events==8.6.0
     # via
     #   -r requirements/validation.txt
     #   openedx-ledger
@@ -370,7 +370,7 @@ pkgutil-resolve-name==1.3.10
     # via
     #   -r requirements/validation.txt
     #   jsonschema
-platformdirs==3.11.0
+platformdirs==3.10.0
     # via
     #   -r requirements/validation.txt
     #   pylint
@@ -387,15 +387,15 @@ ply==3.11
     #   djangoql
 polib==1.2.0
     # via edx-i18n-tools
-psutil==5.9.6
+psutil==5.9.5
     # via
     #   -r requirements/validation.txt
     #   edx-django-utils
 py==1.11.0
     # via
     #   -r requirements/validation.txt
     #   tox
-pycodestyle==2.11.1
+pycodestyle==2.11.0
     # via -r requirements/validation.txt
 pycparser==2.21
     # via
@@ -416,9 +416,8 @@ pyjwt[crypto]==2.8.0
     #   edx-auth-backends
     #   edx-drf-extensions
     #   edx-rest-api-client
-    #   pyjwt
     #   social-auth-core
-pylint==3.0.2
+pylint==2.17.7
     # via
     #   -r requirements/validation.txt
     #   edx-lint
@@ -429,7 +428,7 @@ pylint-celery==0.3
     # via
     #   -r requirements/validation.txt
     #   edx-lint
-pylint-django==2.5.4
+pylint-django==2.5.3
     # via
     #   -r requirements/validation.txt
     #   edx-lint
@@ -532,7 +531,7 @@ rich==13.6.0
     # via
     #   -r requirements/validation.txt
     #   twine
-rpds-py==0.10.6
+rpds-py==0.10.3
     # via
     #   -r requirements/validation.txt
     #   jsonschema
@@ -566,7 +565,7 @@ snowballstemmer==2.2.0
     # via
     #   -r requirements/validation.txt
     #   pydocstyle
-social-auth-app-django==5.4.0
+social-auth-app-django==5.3.0
     # via
     #   -r requirements/validation.txt
     #   edx-auth-backends
@@ -627,7 +626,7 @@ uritemplate==4.1.1
     #   -r requirements/validation.txt
     #   drf-spectacular
     #   drf-yasg
-urllib3==2.0.7
+urllib3==2.0.5
     # via
     #   -r requirements/validation.txt
     #   requests
@@ -641,6 +640,10 @@ wheel==0.41.2
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
+wrapt==1.15.0
+    # via
+    #   -r requirements/validation.txt
+    #   astroid
 zipp==3.17.0
     # via
     #   -r requirements/pip-tools.txt

diff --git a/requirements/django.txt b/requirements/django.txt
@@ -1 +1 @@
-django==4.2.6
+django==4.2.5