Skip to content

Commit

Permalink
fix: Replaced whitelist_externals with allowlist_externals in tox and…
Browse files Browse the repository at this point in the history
… removed tox-battery
  • Loading branch information
edx-requirements-bot authored and macdiesel committed Oct 30, 2023
1 parent 190a779 commit 4d23bc5
Show file tree
Hide file tree
Showing 14 changed files with 191 additions and 178 deletions.
27 changes: 14 additions & 13 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via edx-django-utils
Expand All @@ -33,7 +33,7 @@ defusedxml==0.8.0rc2
# via
# python3-openid
# social-auth-core
django==4.2.5
django==4.2.6
# via
# -c requirements/constraints.txt
# -r requirements/base.in
Expand All @@ -60,7 +60,7 @@ django==4.2.5
# social-auth-app-django
django-clearcache==1.2.1
# via -r requirements/base.in
django-cors-headers==4.2.0
django-cors-headers==4.3.0
# via -r requirements/base.in
django-crum==0.7.9
# via
Expand All @@ -82,7 +82,7 @@ django-object-actions==4.2.0
# via
# -r requirements/base.in
# openedx-ledger
django-simple-history==3.4.0
django-simple-history==3.0.0
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand Down Expand Up @@ -122,7 +122,7 @@ edx-django-utils==5.7.0
# edx-rest-api-client
# getsmarter-api-clients
# openedx-ledger
edx-drf-extensions==8.10.0
edx-drf-extensions==8.12.0
# via
# -r requirements/base.in
# edx-rbac
Expand All @@ -134,9 +134,9 @@ edx-rbac==1.8.0
# via
# -r requirements/base.in
# openedx-ledger
edx-rest-api-client==5.6.0
edx-rest-api-client==5.6.1
# via -r requirements/base.in
fastavro==1.8.3
fastavro==1.8.4
# via openedx-events
getsmarter-api-clients==0.6.1
# via -r requirements/base.in
Expand All @@ -162,14 +162,14 @@ mysqlclient==2.2.0
# via
# -r requirements/base.in
# openedx-ledger
newrelic==9.1.0
newrelic==9.1.1
# via edx-django-utils
oauthlib==3.2.2
# via
# getsmarter-api-clients
# requests-oauthlib
# social-auth-core
openedx-events==8.6.0
openedx-events==9.0.0
# via
# -r requirements/base.in
# openedx-ledger
Expand All @@ -183,7 +183,7 @@ pkgutil-resolve-name==1.3.10
# via jsonschema
ply==3.11
# via djangoql
psutil==5.9.5
psutil==5.9.6
# via edx-django-utils
pycparser==2.21
# via cffi
Expand All @@ -193,6 +193,7 @@ 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
Expand Down Expand Up @@ -231,7 +232,7 @@ requests-oauthlib==1.3.1
# via
# getsmarter-api-clients
# social-auth-core
rpds-py==0.10.3
rpds-py==0.10.6
# via
# jsonschema
# referencing
Expand All @@ -248,7 +249,7 @@ six==1.16.0
# edx-rbac
slumber==0.7.1
# via edx-rest-api-client
social-auth-app-django==5.3.0
social-auth-app-django==5.4.0
# via edx-auth-backends
social-auth-core==4.4.2
# via
Expand All @@ -268,7 +269,7 @@ uritemplate==4.1.1
# via
# drf-spectacular
# drf-yasg
urllib3==2.0.5
urllib3==2.0.7
# via requests
zipp==3.17.0
# via importlib-resources
1 change: 0 additions & 1 deletion requirements/ci.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
-c constraints.txt

tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
5 changes: 1 addition & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ filelock==3.12.4
# virtualenv
packaging==23.2
# via tox
platformdirs==3.10.0
platformdirs==3.11.0
# via virtualenv
pluggy==1.3.0
# via tox
Expand All @@ -26,8 +26,5 @@ 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
virtualenv==20.24.5
# via tox
8 changes: 6 additions & 2 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 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.
Expand All @@ -14,14 +18,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
Expand Down
32 changes: 32 additions & 0 deletions requirements/common_constraints.txt.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# 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.
#
# Similar to other constraint files this file doesn't install any packages.
# It specifies version constraints that will be applied if a package is needed.
# When pinning something here, please provide an explanation of why it is a good
# idea to pin this package across all edx repos, Ideally, link to other information
# that will help people in the future to remove the pin when possible.
# Writing an issue against the offending project and linking to it here is good.
#
# Note: Changes to this file will automatically be used by other repos, referencing
# this file from Github directly. It does not require packaging in edx-lint.


# 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
tox<4.0.0
Loading

0 comments on commit 4d23bc5

Please sign in to comment.