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

fix: add local django constraint #253

Closed
wants to merge 1 commit into from
Closed

fix: add local django constraint #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -106,6 +106,8 @@ $(COMMON_CONSTRAINTS_TXT):

upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
# Make sure to compile files after any other files they include!
Expand Down
21 changes: 11 additions & 10 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ asgiref==3.7.2
# via
# django
# django-cors-headers
# django-simple-history
async-timeout==4.0.3
# via redis
attrs==23.2.0
Expand All @@ -19,9 +20,9 @@ attrs==23.2.0
# openedx-events
bleach==6.1.0
# via lti-consumer-xblock
boto3==1.34.45
boto3==1.34.52
# via fs-s3fs
botocore==1.34.45
botocore==1.34.52
# via
# boto3
# s3transfer
Expand All @@ -45,7 +46,7 @@ coreapi==2.3.3
# openapi-codec
coreschema==0.0.4
# via coreapi
cryptography==42.0.3
cryptography==42.0.5
# via
# pyjwt
# social-auth-core
Expand All @@ -55,7 +56,7 @@ defusedxml==0.8.0rc2
# social-auth-core
django==3.2.24
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
# django-appconf
# django-config-models
Expand Down Expand Up @@ -102,7 +103,7 @@ django-model-utils==4.4.0
# via -r requirements/base.in
django-rest-swagger==2.2.0
# via -r requirements/base.in
django-simple-history==3.4.0
django-simple-history==3.5.0
# via -r requirements/base.in
django-statici18n==2.4.0
# via lti-consumer-xblock
Expand Down Expand Up @@ -175,7 +176,7 @@ fs==2.4.16
# xblock
fs-s3fs==1.1.1
# via openedx-django-pyfs
future==0.18.3
future==1.0.0
# via pyjwkest
idna==3.6
# via requests
Expand Down Expand Up @@ -212,7 +213,7 @@ markupsafe==2.1.5
# xblock
mysqlclient==2.2.4
# via -r requirements/base.in
newrelic==9.6.0
newrelic==9.7.0
# via edx-django-utils
oauthlib==3.2.2
# via
Expand Down Expand Up @@ -280,7 +281,7 @@ pyyaml==6.0.1
# drf-yasg
# edx-django-release-util
# xblock
redis==5.0.1
redis==5.0.2
# via walrus
requests==2.31.0
# via
Expand Down Expand Up @@ -321,14 +322,14 @@ social-auth-core==4.5.3
# social-auth-app-django
sqlparse==0.4.4
# via django
stevedore==5.1.0
stevedore==5.2.0
# via
# code-annotations
# edx-django-utils
# edx-opaque-keys
text-unidecode==1.3
# via python-slugify
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# asgiref
# edx-opaque-keys
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
cachetools==5.3.2
cachetools==5.3.3
# via tox
chardet==5.2.0
# via tox
Expand Down Expand Up @@ -34,5 +34,5 @@ tomli==2.0.1
# tox
tox==4.13.0
# via -r requirements/ci.in
virtualenv==20.25.0
virtualenv==20.25.1
# via tox
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 @@ -14,7 +14,7 @@


# 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
Expand Down
3 changes: 3 additions & 0 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@
-c common_constraints.txt

edx-drf-extensions<10.0.0 # JWT changes in v10 break LTI authenication

## Stay on LTS Django release
Django<4.0
55 changes: 23 additions & 32 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ asgiref==3.7.2
# -r requirements/validation.txt
# django
# django-cors-headers
astroid==3.0.3
# django-simple-history
astroid==3.1.0
# via
# -r requirements/validation.txt
# pylint
Expand All @@ -31,11 +32,11 @@ bleach==6.1.0
# via
# -r requirements/validation.txt
# lti-consumer-xblock
boto3==1.34.45
boto3==1.34.52
# via
# -r requirements/validation.txt
# fs-s3fs
botocore==1.34.45
botocore==1.34.52
# via
# -r requirements/validation.txt
# boto3
Expand All @@ -44,7 +45,7 @@ build==1.0.3
# via
# -r requirements/pip-tools.txt
# pip-tools
cachetools==5.3.2
cachetools==5.3.3
# via
# -r requirements/validation.txt
# tox
Expand Down Expand Up @@ -97,17 +98,16 @@ coreschema==0.0.4
# via
# -r requirements/validation.txt
# coreapi
coverage[toml]==7.4.1
coverage[toml]==7.4.3
# via
# -r requirements/validation.txt
# pytest-cov
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/validation.txt
# pyjwt
# secretstorage
# social-auth-core
ddt==1.7.1
ddt==1.7.2
# via -r requirements/validation.txt
defusedxml==0.8.0rc2
# via
Expand Down Expand Up @@ -185,7 +185,7 @@ django-model-utils==4.4.0
# via -r requirements/validation.txt
django-rest-swagger==2.2.0
# via -r requirements/validation.txt
django-simple-history==3.4.0
django-simple-history==3.5.0
# via -r requirements/validation.txt
django-statici18n==2.4.0
# via
Expand Down Expand Up @@ -270,7 +270,7 @@ exceptiongroup==1.2.0
# pytest
factory-boy==3.3.0
# via -r requirements/validation.txt
faker==23.2.1
faker==23.3.0
# via
# -r requirements/validation.txt
# factory-boy
Expand All @@ -295,7 +295,7 @@ fs-s3fs==1.1.1
# via
# -r requirements/validation.txt
# openedx-django-pyfs
future==0.18.3
future==1.0.0
# via
# -r requirements/validation.txt
# pyjwkest
Expand All @@ -310,7 +310,7 @@ importlib-metadata==7.0.1
# build
# keyring
# twine
importlib-resources==6.1.1
importlib-resources==6.1.2
# via
# -r requirements/validation.txt
# keyring
Expand All @@ -334,11 +334,6 @@ jaraco-classes==3.3.1
# via
# -r requirements/validation.txt
# keyring
jeepney==0.8.0
# via
# -r requirements/validation.txt
# keyring
# secretstorage
jinja2==3.1.3
# via
# -r requirements/validation.txt
Expand All @@ -354,7 +349,7 @@ jsonfield==3.1.0
# via
# -r requirements/validation.txt
# lti-consumer-xblock
keyring==24.3.0
keyring==24.3.1
# via
# -r requirements/validation.txt
# twine
Expand Down Expand Up @@ -401,7 +396,7 @@ more-itertools==10.2.0
# jaraco-classes
mysqlclient==2.2.4
# via -r requirements/validation.txt
newrelic==9.6.0
newrelic==9.7.0
# via
# -r requirements/validation.txt
# edx-django-utils
Expand Down Expand Up @@ -503,7 +498,7 @@ pyjwt[crypto]==2.8.0
# edx-drf-extensions
# edx-rest-api-client
# social-auth-core
pylint==3.0.3
pylint==3.1.0
# via
# -r requirements/validation.txt
# edx-lint
Expand Down Expand Up @@ -542,7 +537,7 @@ pyproject-hooks==1.0.0
# -r requirements/pip-tools.txt
# build
# pip-tools
pytest==8.0.1
pytest==8.0.2
# via
# -r requirements/validation.txt
# pytest-cov
Expand Down Expand Up @@ -582,11 +577,11 @@ pyyaml==6.0.1
# edx-i18n-tools
# responses
# xblock
readme-renderer==42.0
readme-renderer==43.0
# via
# -r requirements/validation.txt
# twine
redis==5.0.1
redis==5.0.2
# via
# -r requirements/validation.txt
# walrus
Expand Down Expand Up @@ -617,18 +612,14 @@ rfc3986==2.0.0
# via
# -r requirements/validation.txt
# twine
rich==13.7.0
rich==13.7.1
# via
# -r requirements/validation.txt
# twine
s3transfer==0.10.0
# via
# -r requirements/validation.txt
# boto3
secretstorage==3.3.3
# via
# -r requirements/validation.txt
# keyring
semantic-version==2.10.0
# via
# -r requirements/validation.txt
Expand Down Expand Up @@ -672,7 +663,7 @@ sqlparse==0.4.4
# -r requirements/validation.txt
# django
# django-debug-toolbar
stevedore==5.1.0
stevedore==5.2.0
# via
# -r requirements/validation.txt
# code-annotations
Expand All @@ -694,15 +685,15 @@ tomli==2.0.1
# pyproject-hooks
# pytest
# tox
tomlkit==0.12.3
tomlkit==0.12.4
# via
# -r requirements/validation.txt
# pylint
tox==4.13.0
# via -r requirements/validation.txt
twine==5.0.0
# via -r requirements/validation.txt
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# -r requirements/validation.txt
# asgiref
Expand All @@ -723,7 +714,7 @@ urllib3==1.26.18
# requests
# responses
# twine
virtualenv==20.25.0
virtualenv==20.25.1
# via
# -r requirements/validation.txt
# tox
Expand Down
Loading
Loading