Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpin tox, tox-battery and pytest-metadata #33532

Closed
wants to merge 9 commits into from
Closed

Unpin tox, tox-battery and pytest-metadata #33532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6590ead
fix: overidded tox<4.0.0 constraint using sed command
zubairshakoorarbisoft Oct 17, 2023
80dfb0c
fix: compile-requirements updated
zubairshakoorarbisoft Oct 17, 2023
3653a25
fix: duplicate makefile code removed
zubairshakoorarbisoft Oct 17, 2023
97a8b54
fix: tox-battery removed from testing.ini
zubairshakoorarbisoft Oct 17, 2023
c62f957
chore: Updating Python Requirements (#33522)
edx-requirements-bot Oct 17, 2023
947a5a9
fix: pytest-metadata version pin removed
zubairshakoorarbisoft Oct 18, 2023
4749209
chore: Updating Python Requirements (#33531)
edx-requirements-bot Oct 18, 2023
163698b
fix: pytest-metadata removed from testing.in as its already required
zubairshakoorarbisoft Oct 18, 2023
3002490
chore: Updating Python Requirements (#33543)
edx-requirements-bot Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ $(COMMON_CONSTRAINTS_TXT):

compile-requirements: export CUSTOM_COMPILE_COMMAND=make upgrade
compile-requirements: pre-requirements $(COMMON_CONSTRAINTS_TXT) ## Re-compile *.in requirements to *.txt
sed 's/tox<4.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
@# Bootstrapping: Rebuild pip and pip-tools first, and then install them
@# so that if there are any failures we'll know now, rather than the next
@# time someone tries to use the outputs.
Expand Down
2 changes: 1 addition & 1 deletion requirements/common_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ elasticsearch<7.14.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

28 changes: 14 additions & 14 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ boto==2.39.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
boto3==1.28.62
boto3==1.28.66
# via
# -r requirements/edx/kernel.in
# django-ses
# fs-s3fs
# ora2
botocore==1.31.62
botocore==1.31.66
# via
# -r requirements/edx/kernel.in
# boto3
Expand Down Expand Up @@ -169,7 +169,7 @@ cryptography==38.0.4
# pyopenssl
# snowflake-connector-python
# social-auth-core
cssutils==2.7.1
cssutils==2.9.0
# via pynliner
defusedxml==0.7.1
# via
Expand Down Expand Up @@ -265,7 +265,7 @@ django-config-models==2.5.1
# edx-enterprise
# edx-name-affirmation
# lti-consumer-xblock
django-cors-headers==4.2.0
django-cors-headers==4.3.0
# via -r requirements/edx/kernel.in
django-countries==7.5.1
# via
Expand Down Expand Up @@ -323,7 +323,7 @@ django-mptt==0.14.0
# openedx-django-wiki
django-multi-email-field==0.7.0
# via edx-enterprise
django-mysql==4.11.0
django-mysql==4.12.0
# via -r requirements/edx/kernel.in
django-oauth-toolkit==1.7.1
# via
Expand Down Expand Up @@ -452,7 +452,7 @@ edx-django-release-util==1.3.0
# -r requirements/edx/kernel.in
# edxval
# openedx-blockstore
edx-django-sites-extensions==4.0.1
edx-django-sites-extensions==4.0.2
# via -r requirements/edx/kernel.in
edx-django-utils==5.7.0
# via
Expand Down Expand Up @@ -520,7 +520,7 @@ edx-proctoring==4.16.1
# edx-proctoring-proctortrack
edx-rbac==1.8.0
# via edx-enterprise
edx-rest-api-client==5.6.0
edx-rest-api-client==5.6.1
# via
# -r requirements/edx/kernel.in
# edx-enterprise
Expand Down Expand Up @@ -793,7 +793,7 @@ openedx-mongodbproxy==0.2.0
# via -r requirements/edx/kernel.in
optimizely-sdk==4.1.1
# via -r requirements/edx/bundled.in
ora2==5.5.5
ora2==5.5.6
# via -r requirements/edx/bundled.in
oscrypto==1.3.0
# via snowflake-connector-python
Expand Down Expand Up @@ -841,7 +841,7 @@ polib==1.2.0
# via edx-i18n-tools
prompt-toolkit==3.0.39
# via click-repl
psutil==5.9.5
psutil==5.9.6
# via
# -r requirements/edx/paver.txt
# edx-django-utils
Expand Down Expand Up @@ -1015,7 +1015,7 @@ requests-oauthlib==1.3.1
# via
# -r requirements/edx/kernel.in
# social-auth-core
rpds-py==0.10.4
rpds-py==0.10.6
# via
# jsonschema
# referencing
Expand All @@ -1040,7 +1040,7 @@ scipy==1.7.3
# openedx-calc
semantic-version==2.10.0
# via edx-drf-extensions
shapely==2.0.1
shapely==2.0.2
# via -r requirements/edx/kernel.in
simplejson==3.19.2
# via
Expand Down Expand Up @@ -1084,7 +1084,7 @@ slumber==0.7.1
# edx-bulk-grades
# edx-enterprise
# edx-rest-api-client
snowflake-connector-python==3.2.1
snowflake-connector-python==3.3.1
# via edx-enterprise
social-auth-app-django==5.0.0
# via
Expand Down Expand Up @@ -1161,7 +1161,7 @@ uritemplate==4.1.1
# coreapi
# drf-spectacular
# drf-yasg
urllib3==1.26.17
urllib3==1.26.18
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/paver.txt
Expand Down Expand Up @@ -1221,7 +1221,7 @@ xblock[django]==1.8.1
# xblock-google-drive
# xblock-poll
# xblock-utils
xblock-drag-and-drop-v2==3.2.0
xblock-drag-and-drop-v2==3.2.1
# via -r requirements/edx/bundled.in
xblock-google-drive==0.4.0
# via -r requirements/edx/bundled.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/coverage.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ chardet==5.2.0
# via diff-cover
coverage==7.3.2
# via -r requirements/edx/coverage.in
diff-cover==7.7.0
diff-cover==8.0.0
# via -r requirements/edx/coverage.in
jinja2==3.1.2
# via diff-cover
Expand Down
Loading