Skip to content

Commit

Permalink
fix: fix common_constraints override
Browse files Browse the repository at this point in the history
  • Loading branch information
@UsamaSadiq
UsamaSadiq committed Oct 4, 2023
1 parent 86e9b64 commit 677356d
Show file tree
Hide file tree
Showing 9 changed files with 104 additions and 103 deletions.
1 change: 1 addition & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fil
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-271 for more details.
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
24 changes: 12 additions & 12 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ backports-zoneinfo[tzdata]==0.2.1
# kombu
billiard==4.1.0
# via celery
boto3==1.28.51
boto3==1.28.59
# via django-ses
botocore==1.31.51
botocore==1.31.59
# via
# boto3
# s3transfer
Expand All @@ -36,11 +36,11 @@ celery==5.3.4
# edx-celeryutils
certifi==2023.7.22
# via requests
cffi==1.15.1
cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.0
# via requests
click==8.1.7
# via
Expand All @@ -62,7 +62,7 @@ cryptography==41.0.4
# via
# pyjwt
# social-auth-core
defusedxml==0.7.1
defusedxml==0.8.0rc2
# via
# python3-openid
# social-auth-core
Expand Down Expand Up @@ -162,7 +162,7 @@ edx-drf-extensions==8.10.0
# via
# -r requirements/base.in
# edx-rbac
edx-opaque-keys==2.5.0
edx-opaque-keys==2.5.1
# via edx-drf-extensions
edx-rbac==1.8.0
# via -r requirements/base.in
Expand Down Expand Up @@ -190,13 +190,13 @@ monotonic==1.6
# via analytics-python
mysqlclient==2.2.0
# via -r requirements/base.in
newrelic==9.0.0
newrelic==9.1.0
# via edx-django-utils
oauthlib==3.2.2
# via
# requests-oauthlib
# social-auth-core
packaging==23.1
packaging==23.2
# via drf-yasg
pbr==5.11.1
# via stevedore
Expand Down Expand Up @@ -238,7 +238,7 @@ pyyaml==6.0.1
# via
# code-annotations
# drf-yasg
redis==5.0.0
redis==5.0.1
# via -r requirements/base.in
requests==2.31.0
# via
Expand All @@ -252,7 +252,7 @@ requests-oauthlib==1.3.1
# via social-auth-core
rules==3.3
# via -r requirements/base.in
s3transfer==0.6.2
s3transfer==0.7.0
# via boto3
semantic-version==2.10.0
# via edx-drf-extensions
Expand Down Expand Up @@ -295,7 +295,7 @@ unicodecsv==0.14.1
# via djangorestframework-csv
uritemplate==4.1.1
# via drf-yasg
urllib3==1.26.16
urllib3==1.26.17
# via
# botocore
# requests
Expand All @@ -304,7 +304,7 @@ vine==5.0.0
# amqp
# celery
# kombu
wcwidth==0.2.6
wcwidth==0.2.8
# via prompt-toolkit
zipp==3.17.0
# via -r requirements/base.in
34 changes: 17 additions & 17 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ billiard==4.1.0
# via
# -r requirements/validation.txt
# celery
boto3==1.28.51
boto3==1.28.59
# via
# -r requirements/validation.txt
# django-ses
botocore==1.31.51
botocore==1.31.59
# via
# -r requirements/validation.txt
# boto3
Expand All @@ -62,12 +62,12 @@ certifi==2023.7.22
# via
# -r requirements/validation.txt
# requests
cffi==1.15.1
cffi==1.16.0
# via
# -r requirements/validation.txt
# cryptography
# pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.0
# via
# -r requirements/validation.txt
# requests
Expand Down Expand Up @@ -105,7 +105,7 @@ code-annotations==1.5.0
# -r requirements/validation.txt
# edx-lint
# edx-toggles
coverage[toml]==7.3.1
coverage[toml]==7.3.2
# via
# -r requirements/validation.txt
# pytest-cov
Expand All @@ -118,7 +118,7 @@ ddt==1.6.0
# via
# -r requirements/dev.in
# -r requirements/validation.txt
defusedxml==0.7.1
defusedxml==0.8.0rc2
# via
# -r requirements/validation.txt
# python3-openid
Expand Down Expand Up @@ -246,7 +246,7 @@ edx-lint==5.2.5
# via
# -c requirements/constraints.txt
# -r requirements/validation.txt
edx-opaque-keys==2.5.0
edx-opaque-keys==2.5.1
# via
# -r requirements/validation.txt
# edx-drf-extensions
Expand All @@ -262,7 +262,7 @@ exceptiongroup==1.1.3
# pytest
factory-boy==3.3.0
# via -r requirements/validation.txt
faker==19.6.1
faker==19.6.2
# via
# -r requirements/validation.txt
# factory-boy
Expand Down Expand Up @@ -333,7 +333,7 @@ monotonic==1.6
# analytics-python
mysqlclient==2.2.0
# via -r requirements/validation.txt
newrelic==9.0.0
newrelic==9.1.0
# via
# -r requirements/validation.txt
# edx-django-utils
Expand All @@ -342,7 +342,7 @@ oauthlib==3.2.2
# -r requirements/validation.txt
# requests-oauthlib
# social-auth-core
packaging==23.1
packaging==23.2
# via
# -r requirements/pip-tools.txt
# -r requirements/validation.txt
Expand All @@ -362,7 +362,7 @@ pbr==5.11.1
# stevedore
pip-tools==7.3.0
# via -r requirements/pip-tools.txt
platformdirs==3.10.0
platformdirs==3.11.0
# via
# -r requirements/validation.txt
# pylint
Expand Down Expand Up @@ -393,9 +393,9 @@ pycparser==2.21
# via
# -r requirements/validation.txt
# cffi
pydantic==2.3.0
pydantic==2.4.2
# via inflect
pydantic-core==2.6.3
pydantic-core==2.10.1
# via pydantic
pydocstyle==6.3.0
# via -r requirements/validation.txt
Expand Down Expand Up @@ -481,7 +481,7 @@ pyyaml==6.0.1
# code-annotations
# drf-yasg
# edx-i18n-tools
redis==5.0.0
redis==5.0.1
# via -r requirements/validation.txt
requests==2.31.0
# via
Expand All @@ -498,7 +498,7 @@ requests-oauthlib==1.3.1
# social-auth-core
rules==3.3
# via -r requirements/validation.txt
s3transfer==0.6.2
s3transfer==0.7.0
# via
# -r requirements/validation.txt
# boto3
Expand Down Expand Up @@ -590,7 +590,7 @@ uritemplate==4.1.1
# via
# -r requirements/validation.txt
# drf-yasg
urllib3==1.26.16
urllib3==1.26.17
# via
# -r requirements/validation.txt
# botocore
Expand All @@ -601,7 +601,7 @@ vine==5.0.0
# amqp
# celery
# kombu
wcwidth==0.2.6
wcwidth==0.2.8
# via
# -r requirements/validation.txt
# prompt-toolkit
Expand Down
34 changes: 17 additions & 17 deletions requirements/doc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ async-timeout==4.0.3
# via
# -r requirements/test.txt
# redis
babel==2.12.1
babel==2.13.0
# via
# pydata-sphinx-theme
# sphinx
Expand All @@ -48,11 +48,11 @@ billiard==4.1.0
# via
# -r requirements/test.txt
# celery
boto3==1.28.51
boto3==1.28.59
# via
# -r requirements/test.txt
# django-ses
botocore==1.31.51
botocore==1.31.59
# via
# -r requirements/test.txt
# boto3
Expand All @@ -66,12 +66,12 @@ certifi==2023.7.22
# via
# -r requirements/test.txt
# requests
cffi==1.15.1
cffi==1.16.0
# via
# -r requirements/test.txt
# cryptography
# pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.0
# via
# -r requirements/test.txt
# requests
Expand Down Expand Up @@ -107,7 +107,7 @@ code-annotations==1.5.0
# -r requirements/test.txt
# edx-lint
# edx-toggles
coverage[toml]==7.3.1
coverage[toml]==7.3.2
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -118,7 +118,7 @@ cryptography==41.0.4
# social-auth-core
ddt==1.6.0
# via -r requirements/test.txt
defusedxml==0.7.1
defusedxml==0.8.0rc2
# via
# -r requirements/test.txt
# python3-openid
Expand Down Expand Up @@ -243,7 +243,7 @@ edx-lint==5.2.5
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
edx-opaque-keys==2.5.0
edx-opaque-keys==2.5.1
# via
# -r requirements/test.txt
# edx-drf-extensions
Expand All @@ -259,7 +259,7 @@ exceptiongroup==1.1.3
# pytest
factory-boy==3.3.0
# via -r requirements/test.txt
faker==19.6.1
faker==19.6.2
# via
# -r requirements/test.txt
# factory-boy
Expand Down Expand Up @@ -321,7 +321,7 @@ monotonic==1.6
# analytics-python
mysqlclient==2.2.0
# via -r requirements/test.txt
newrelic==9.0.0
newrelic==9.1.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -332,7 +332,7 @@ oauthlib==3.2.2
# -r requirements/test.txt
# requests-oauthlib
# social-auth-core
packaging==23.1
packaging==23.2
# via
# -r requirements/test.txt
# drf-yasg
Expand All @@ -343,7 +343,7 @@ pbr==5.11.1
# via
# -r requirements/test.txt
# stevedore
platformdirs==3.10.0
platformdirs==3.11.0
# via
# -r requirements/test.txt
# pylint
Expand All @@ -367,7 +367,7 @@ pycparser==2.21
# via
# -r requirements/test.txt
# cffi
pydata-sphinx-theme==0.14.0
pydata-sphinx-theme==0.14.1
# via sphinx-book-theme
pygments==2.16.1
# via
Expand Down Expand Up @@ -452,7 +452,7 @@ pyyaml==6.0.1
# drf-yasg
readme-renderer==42.0
# via -r requirements/doc.in
redis==5.0.0
redis==5.0.1
# via -r requirements/test.txt
requests==2.31.0
# via
Expand All @@ -472,7 +472,7 @@ restructuredtext-lint==1.4.0
# via doc8
rules==3.3
# via -r requirements/test.txt
s3transfer==0.6.2
s3transfer==0.7.0
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -576,7 +576,7 @@ uritemplate==4.1.1
# via
# -r requirements/test.txt
# drf-yasg
urllib3==1.26.16
urllib3==1.26.17
# via
# -r requirements/test.txt
# botocore
Expand All @@ -587,7 +587,7 @@ vine==5.0.0
# amqp
# celery
# kombu
wcwidth==0.2.6
wcwidth==0.2.8
# via
# -r requirements/test.txt
# prompt-toolkit
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ click==8.1.7
# via pip-tools
importlib-metadata==6.8.0
# via build
packaging==23.1
packaging==23.2
# via build
pip-tools==7.3.0
# via -r requirements/pip-tools.in
Expand Down
Loading

0 comments on commit 677356d

Please sign in to comment.