Skip to content

Commit

Permalink
build: unpin DRF
Browse files Browse the repository at this point in the history
  • Loading branch information
iloveagent57 committed Aug 19, 2024
1 parent c48a7a0 commit 29da5ed
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 54 deletions.
6 changes: 2 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,8 @@ djangoql==0.18.1
# via
# -r requirements/base.in
# openedx-ledger
djangorestframework==3.14.0
djangorestframework==3.15.2
# via
# -c requirements/constraints.txt
# -r requirements/base.in
# drf-jwt
# drf-spectacular
Expand Down Expand Up @@ -199,7 +198,7 @@ openedx-events==9.11.0
# -r requirements/base.in
# edx-event-bus-kafka
# openedx-ledger
openedx-ledger==1.5.6
openedx-ledger==1.5.7
# via -r requirements/base.in
packaging==24.1
# via drf-yasg
Expand Down Expand Up @@ -231,7 +230,6 @@ python3-openid==3.2.0
pytz==2024.1
# via
# -r requirements/base.in
# djangorestframework
# drf-yasg
# getsmarter-api-clients
# openedx-ledger
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
cachetools==5.4.0
cachetools==5.5.0
# via tox
chardet==5.2.0
# via tox
Expand All @@ -28,7 +28,7 @@ pluggy==1.5.0
# via tox
pyproject-api==1.7.1
# via tox
tox==4.17.1
tox==4.18.0
# via -r requirements/ci.in
virtualenv==20.26.3
# via tox
5 changes: 5 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# 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 Down
5 changes: 0 additions & 5 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,3 @@

# django-simple-history>3.4.0 for this repo... we were not concerned about migration issues
django-simple-history>=3.4.0,<3.5.0

# DRF 3.15.0 is providing some backwards-compatibility issues for us
# around default model fields vs. the serializer field defs,
# and the discontinued use of OrderedDict in serializers.
djangorestframework<3.15
13 changes: 6 additions & 7 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build==1.2.1
# via
# -r requirements/pip-tools.txt
# pip-tools
cachetools==5.4.0
cachetools==5.5.0
# via
# -r requirements/validation.txt
# tox
Expand Down Expand Up @@ -181,7 +181,7 @@ djangoql==0.18.1
# via
# -r requirements/validation.txt
# openedx-ledger
djangorestframework==3.14.0
djangorestframework==3.15.2
# via
# -r requirements/validation.txt
# drf-jwt
Expand Down Expand Up @@ -250,7 +250,7 @@ edx-toggles==5.2.0
# via
# -r requirements/validation.txt
# edx-event-bus-kafka
factory-boy==3.3.0
factory-boy==3.3.1
# via -r requirements/validation.txt
faker==27.0.0
# via
Expand Down Expand Up @@ -375,7 +375,7 @@ openedx-events==9.11.0
# -r requirements/validation.txt
# edx-event-bus-kafka
# openedx-ledger
openedx-ledger==1.5.6
openedx-ledger==1.5.7
# via -r requirements/validation.txt
packaging==24.1
# via
Expand Down Expand Up @@ -505,7 +505,6 @@ python3-openid==3.2.0
pytz==2024.1
# via
# -r requirements/validation.txt
# djangorestframework
# drf-yasg
# getsmarter-api-clients
# openedx-ledger
Expand Down Expand Up @@ -620,11 +619,11 @@ text-unidecode==1.3
# via
# -r requirements/validation.txt
# python-slugify
tomlkit==0.13.0
tomlkit==0.13.2
# via
# -r requirements/validation.txt
# pylint
tox==4.17.1
tox==4.18.0
# via -r requirements/validation.txt
twine==5.1.1
# via -r requirements/validation.txt
Expand Down
16 changes: 7 additions & 9 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ beautifulsoup4==4.12.3
# via pydata-sphinx-theme
build==1.2.1
# via -r requirements/doc.in
cachetools==5.4.0
cachetools==5.5.0
# via
# -r requirements/test.txt
# tox
Expand Down Expand Up @@ -178,9 +178,8 @@ djangoql==0.18.1
# via
# -r requirements/test.txt
# openedx-ledger
djangorestframework==3.14.0
djangorestframework==3.15.2
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# drf-jwt
# drf-spectacular
Expand Down Expand Up @@ -251,7 +250,7 @@ edx-toggles==5.2.0
# via
# -r requirements/test.txt
# edx-event-bus-kafka
factory-boy==3.3.0
factory-boy==3.3.1
# via -r requirements/test.txt
faker==27.0.0
# via
Expand Down Expand Up @@ -358,7 +357,7 @@ openedx-events==9.11.0
# -r requirements/test.txt
# edx-event-bus-kafka
# openedx-ledger
openedx-ledger==1.5.6
openedx-ledger==1.5.7
# via -r requirements/test.txt
packaging==24.1
# via
Expand Down Expand Up @@ -477,7 +476,6 @@ python3-openid==3.2.0
pytz==2024.1
# via
# -r requirements/test.txt
# djangorestframework
# drf-yasg
# getsmarter-api-clients
# openedx-ledger
Expand Down Expand Up @@ -567,7 +565,7 @@ social-auth-core==4.5.4
# -r requirements/test.txt
# edx-auth-backends
# social-auth-app-django
soupsieve==2.5
soupsieve==2.6
# via beautifulsoup4
sphinx==8.0.2
# via
Expand Down Expand Up @@ -603,11 +601,11 @@ text-unidecode==1.3
# via
# -r requirements/test.txt
# python-slugify
tomlkit==0.13.0
tomlkit==0.13.2
# via
# -r requirements/test.txt
# pylint
tox==4.17.1
tox==4.18.0
# via -r requirements/test.txt
twine==5.1.1
# via -r requirements/doc.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.44.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.2
# via -r requirements/pip.in
setuptools==72.1.0
setuptools==72.2.0
# via -r requirements/pip.in
5 changes: 2 additions & 3 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ djangoql==0.18.1
# via
# -r requirements/base.txt
# openedx-ledger
djangorestframework==3.14.0
djangorestframework==3.15.2
# via
# -r requirements/base.txt
# drf-jwt
Expand Down Expand Up @@ -244,7 +244,7 @@ openedx-events==9.11.0
# -r requirements/base.txt
# edx-event-bus-kafka
# openedx-ledger
openedx-ledger==1.5.6
openedx-ledger==1.5.7
# via -r requirements/base.txt
packaging==24.1
# via
Expand Down Expand Up @@ -298,7 +298,6 @@ python3-openid==3.2.0
pytz==2024.1
# via
# -r requirements/base.txt
# djangorestframework
# drf-yasg
# getsmarter-api-clients
# openedx-ledger
Expand Down
14 changes: 6 additions & 8 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ avro==1.12.0
# via
# -r requirements/test.txt
# confluent-kafka
cachetools==5.4.0
cachetools==5.5.0
# via
# -r requirements/test.txt
# tox
Expand Down Expand Up @@ -166,9 +166,8 @@ djangoql==0.18.1
# via
# -r requirements/test.txt
# openedx-ledger
djangorestframework==3.14.0
djangorestframework==3.15.2
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# drf-jwt
# drf-spectacular
Expand Down Expand Up @@ -234,7 +233,7 @@ edx-toggles==5.2.0
# via
# -r requirements/test.txt
# edx-event-bus-kafka
factory-boy==3.3.0
factory-boy==3.3.1
# via -r requirements/test.txt
faker==27.0.0
# via
Expand Down Expand Up @@ -339,7 +338,7 @@ openedx-events==9.11.0
# -r requirements/test.txt
# edx-event-bus-kafka
# openedx-ledger
openedx-ledger==1.5.6
openedx-ledger==1.5.7
# via -r requirements/test.txt
packaging==24.1
# via
Expand Down Expand Up @@ -451,7 +450,6 @@ python3-openid==3.2.0
pytz==2024.1
# via
# -r requirements/test.txt
# djangorestframework
# drf-yasg
# getsmarter-api-clients
# openedx-ledger
Expand Down Expand Up @@ -552,11 +550,11 @@ text-unidecode==1.3
# via
# -r requirements/test.txt
# python-slugify
tomlkit==0.13.0
tomlkit==0.13.2
# via
# -r requirements/test.txt
# pylint
tox==4.17.1
tox==4.18.0
# via -r requirements/test.txt
twine==5.1.1
# via -r requirements/quality.in
Expand Down
14 changes: 6 additions & 8 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ avro==1.12.0
# via
# -r requirements/base.txt
# confluent-kafka
cachetools==5.4.0
cachetools==5.5.0
# via tox
certifi==2024.7.4
# via
Expand Down Expand Up @@ -153,9 +153,8 @@ djangoql==0.18.1
# via
# -r requirements/base.txt
# openedx-ledger
djangorestframework==3.14.0
djangorestframework==3.15.2
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# drf-jwt
# drf-spectacular
Expand Down Expand Up @@ -217,7 +216,7 @@ edx-toggles==5.2.0
# via
# -r requirements/base.txt
# edx-event-bus-kafka
factory-boy==3.3.0
factory-boy==3.3.1
# via -r requirements/test.in
faker==27.0.0
# via factory-boy
Expand Down Expand Up @@ -288,7 +287,7 @@ openedx-events==9.11.0
# -r requirements/base.txt
# edx-event-bus-kafka
# openedx-ledger
openedx-ledger==1.5.6
openedx-ledger==1.5.7
# via -r requirements/base.txt
packaging==24.1
# via
Expand Down Expand Up @@ -377,7 +376,6 @@ python3-openid==3.2.0
pytz==2024.1
# via
# -r requirements/base.txt
# djangorestframework
# drf-yasg
# getsmarter-api-clients
# openedx-ledger
Expand Down Expand Up @@ -464,9 +462,9 @@ text-unidecode==1.3
# via
# -r requirements/base.txt
# python-slugify
tomlkit==0.13.0
tomlkit==0.13.2
# via pylint
tox==4.17.1
tox==4.18.0
# via -r requirements/test.in
typing-extensions==4.12.2
# via
Expand Down
Loading

0 comments on commit 29da5ed

Please sign in to comment.