Skip to content

Commit

Permalink
chore: running make upgrade job.
Browse files Browse the repository at this point in the history
  • Loading branch information
awais786 committed May 21, 2024
1 parent f72abaf commit 6a5ecb7
Show file tree
Hide file tree
Showing 15 changed files with 111 additions and 203 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ endef
COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
.PHONY: $(COMMON_CONSTRAINTS_TXT)
$(COMMON_CONSTRAINTS_TXT):
curl -L https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt > "$(@)"
printf "$(COMMON_CONSTRAINTS_TEMP_COMMENT)" | cat - $(@) > temp && mv temp $(@)


compile-requirements: export CUSTOM_COMPILE_COMMAND=make upgrade
compile-requirements: pre-requirements $(COMMON_CONSTRAINTS_TXT) ## Re-compile *.in requirements to *.txt
Expand Down
35 changes: 0 additions & 35 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
@@ -1,35 +0,0 @@
# 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<5.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

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7
8 changes: 5 additions & 3 deletions requirements/edx-sandbox/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ joblib==1.4.2
kiwisolver==1.4.5
# via matplotlib
lxml==4.9.4
# via openedx-calc
# via
# -c requirements/edx-sandbox/../constraints.txt
# openedx-calc
markupsafe==2.1.5
# via
# chem
Expand Down Expand Up @@ -69,7 +71,7 @@ python-dateutil==2.9.0.post0
# via matplotlib
random2==1.0.2
# via -r requirements/edx-sandbox/base.in
regex==2024.5.10
regex==2024.5.15
# via nltk
scipy==1.10.1
# via
Expand All @@ -86,5 +88,5 @@ sympy==1.12
# openedx-calc
tqdm==4.66.4
# via nltk
zipp==3.18.1
zipp==3.18.2
# via importlib-resources
48 changes: 19 additions & 29 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ analytics-python==1.4.post1
# via -r requirements/edx/kernel.in
aniso8601==9.0.1
# via edx-tincan-py35
annotated-types==0.6.0
annotated-types==0.7.0
# via pydantic
appdirs==1.4.4
# via fs
Expand Down Expand Up @@ -88,13 +88,13 @@ bleach[css]==6.1.0
# xblock-poll
boto==2.49.0
# via -r requirements/edx/kernel.in
boto3==1.34.104
boto3==1.34.109
# via
# -r requirements/edx/kernel.in
# django-ses
# fs-s3fs
# ora2
botocore==1.34.104
botocore==1.34.109
# via
# -r requirements/edx/kernel.in
# boto3
Expand All @@ -103,7 +103,7 @@ bridgekeeper==0.9
# via -r requirements/edx/kernel.in
camel-converter[pydantic]==3.1.2
# via meilisearch
celery==5.4.0
celery==5.3.6
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
Expand Down Expand Up @@ -178,7 +178,7 @@ cryptography==42.0.7
# pyopenssl
# snowflake-connector-python
# social-auth-core
cssutils==2.10.3
cssutils==2.11.0
# via pynliner
defusedxml==0.7.1
# via
Expand All @@ -189,7 +189,6 @@ defusedxml==0.7.1
# social-auth-core
django==4.2.13
# via
# -c requirements/edx/../common_constraints.txt
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
# django-appconf
Expand Down Expand Up @@ -408,8 +407,6 @@ done-xblock==2.3.0
# via -r requirements/edx/bundled.in
drf-jwt==1.19.2
# via edx-drf-extensions
drf-nested-routers==0.93.5
# via openedx-blockstore
drf-spectacular==0.27.2
# via -r requirements/edx/kernel.in
drf-yasg==1.21.5
Expand Down Expand Up @@ -489,7 +486,7 @@ edx-event-bus-kafka==5.7.0
# via -r requirements/edx/kernel.in
edx-event-bus-redis==0.5.0
# via -r requirements/edx/kernel.in
edx-i18n-tools==1.6.0
edx-i18n-tools==1.5.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/bundled.in
Expand Down Expand Up @@ -522,7 +519,7 @@ edx-proctoring==4.17.0
# edx-proctoring-proctortrack
edx-rbac==1.9.0
# via edx-enterprise
edx-rest-api-client==5.7.0
edx-rest-api-client==5.6.1
# via
# -r requirements/edx/kernel.in
# edx-enterprise
Expand Down Expand Up @@ -557,10 +554,8 @@ edx-when==2.5.0
# edx-proctoring
edxval==2.5.0
# via -r requirements/edx/kernel.in
elasticsearch==7.13.4
# via
# -c requirements/edx/../common_constraints.txt
# edx-search
elasticsearch==7.17.9
# via edx-search
enmerkar==0.7.1
# via enmerkar-underscore
enmerkar-underscore==2.3.0
Expand Down Expand Up @@ -606,11 +601,8 @@ idna==3.7
# requests
# snowflake-connector-python
# yarl
importlib-metadata==6.11.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/kernel.in
# markdown
importlib-metadata==7.1.0
# via markdown
importlib-resources==5.13.0
# via
# jsonschema
Expand Down Expand Up @@ -678,22 +670,19 @@ loremipsum==1.0.5
# via ora2
lti-consumer-xblock==9.11.0
# via -r requirements/edx/kernel.in
lxml[html-clean,html_clean]==5.2.1
lxml[html-clean,html_clean]==4.9.4
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
# edx-i18n-tools
# edxval
# lti-consumer-xblock
# lxml-html-clean
# olxcleaner
# openedx-calc
# ora2
# python3-saml
# xblock
# xmlsec
lxml-html-clean==0.1.1
# via lxml
mailsnake==1.6.4
# via -r requirements/edx/bundled.in
mako==1.3.5
Expand Down Expand Up @@ -837,7 +826,7 @@ pillow==10.3.0
# edxval
pkgutil-resolve-name==1.3.10
# via jsonschema
platformdirs==4.2.1
platformdirs==4.2.2
# via snowflake-connector-python
polib==1.2.0
# via edx-i18n-tools
Expand Down Expand Up @@ -989,9 +978,9 @@ referencing==0.35.1
# via
# jsonschema
# jsonschema-specifications
regex==2024.5.10
regex==2024.5.15
# via nltk
requests==2.31.0
requests==2.32.1
# via
# -r requirements/edx/paver.txt
# algoliasearch
Expand Down Expand Up @@ -1028,7 +1017,7 @@ ruamel-yaml==0.18.6
# via drf-yasg
ruamel-yaml-clib==0.2.8
# via ruamel-yaml
rules==3.3
rules==3.4
# via
# -r requirements/edx/kernel.in
# edx-enterprise
Expand Down Expand Up @@ -1111,6 +1100,7 @@ sortedcontainers==2.4.0
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.5.0
# via django
staff-graded-xblock==2.3.0
# via -r requirements/edx/bundled.in
stevedore==5.2.0
Expand All @@ -1125,7 +1115,7 @@ stevedore==5.2.0
super-csv==3.2.0
# via edx-bulk-grades
sympy==1.12
# via openedx-cal
# via openedx-calc
testfixtures==8.2.0
# via edx-enterprise
text-unidecode==1.3
Expand Down Expand Up @@ -1240,7 +1230,7 @@ xss-utils==0.6.0
# via -r requirements/edx/kernel.in
yarl==1.9.4
# via aiohttp
zipp==3.18.1
zipp==3.18.2
# via
# importlib-metadata
# importlib-resources
Expand Down
Loading

0 comments on commit 6a5ecb7

Please sign in to comment.