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 the Django dependency #726

Merged
merged 4 commits into from
Mar 15, 2024
Merged

Unpin the Django dependency #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfd97bf
chore: Run `make upgrade`
feanil Mar 14, 2024
646e8ea
build: Don't explicityl pin the django version here.
feanil Mar 14, 2024
08110af
build: Explicitly restrict backports.zoneinfo to python<3.9
feanil Mar 14, 2024
e3e059f
chore: Run `make upgrade`
feanil Mar 14, 2024
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: 1 addition & 1 deletion requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via
# pyproject-api
# tox
Expand Down
34 changes: 21 additions & 13 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ appdirs==1.4.4
# via
# -r requirements/test.txt
# fs
asgiref==3.7.2
# via
# -r requirements/test.txt
# django
astroid==3.1.0
# via
# -r requirements/test.txt
Expand All @@ -21,11 +25,15 @@ attrs==23.2.0
# via
# -r requirements/test.txt
# hypothesis
boto3==1.34.59
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements/test.txt
# django
boto3==1.34.62
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.34.59
botocore==1.34.62
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -56,7 +64,7 @@ click-log==0.4.0
# via
# -r requirements/test.txt
# edx-lint
code-annotations==1.6.0
code-annotations==1.7.0
# via
# -r requirements/test.txt
# edx-lint
Expand Down Expand Up @@ -85,7 +93,7 @@ distlib==0.3.8
# -r requirements/ci.txt
# -r requirements/test.txt
# virtualenv
django==2.2.28
django==4.2.11
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -114,10 +122,11 @@ fs-s3fs==1.1.1
# via
# -r requirements/test.txt
# openedx-django-pyfs
hypothesis==6.99.0
hypothesis==6.99.6
# via -r requirements/test.txt
importlib-metadata==7.0.2
importlib-metadata==6.11.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/pip-tools.txt
# build
inflect==7.0.0
Expand Down Expand Up @@ -168,7 +177,7 @@ mock==5.1.0
# via -r requirements/test.txt
openedx-django-pyfs==3.5.0
# via -r requirements/test.txt
packaging==23.2
packaging==24.0
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand Down Expand Up @@ -201,7 +210,7 @@ pluggy==1.4.0
# tox
pycodestyle==2.11.1
# via -r requirements/test.txt
pydantic==2.6.3
pydantic==2.6.4
# via
# -r requirements/test.txt
# inflect
Expand Down Expand Up @@ -265,9 +274,7 @@ python-slugify==8.0.4
# -r requirements/test.txt
# code-annotations
pytz==2024.1
# via
# -r requirements/test.txt
# django
# via -r requirements/test.txt
pyyaml==6.0.1
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -327,6 +334,7 @@ typing-extensions==4.10.0
# via
# -r requirements/test.txt
# annotated-types
# asgiref
# astroid
# edx-opaque-keys
# inflect
Expand All @@ -346,11 +354,11 @@ web-fragments==2.1.0
# via -r requirements/test.txt
webob==1.8.7
# via -r requirements/test.txt
wheel==0.42.0
wheel==0.43.0
# via
# -r requirements/pip-tools.txt
# pip-tools
zipp==3.17.0
zipp==3.18.0
# via
# -r requirements/pip-tools.txt
# importlib-metadata
Expand Down
6 changes: 5 additions & 1 deletion requirements/django.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

-r base.txt # Core XBlock dependencies

Django>=2.2,<3.0
Django
openedx-django-pyfs>=1.0.5
lazy

# Needed until we drop testing on Python 3.8 so that
# we don't try to install this on newer versions of python.
backports.zoneinfo;python_version<"3.9"
17 changes: 11 additions & 6 deletions requirements/django.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,19 @@ appdirs==1.4.4
# via
# -r requirements/base.txt
# fs
boto3==1.34.59
asgiref==3.7.2
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements/django.in
# django
boto3==1.34.62
# via fs-s3fs
botocore==1.34.59
botocore==1.34.62
# via
# boto3
# s3transfer
django==2.2.28
django==4.2.11
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/django.in
Expand Down Expand Up @@ -59,9 +65,7 @@ python-dateutil==2.9.0.post0
# -r requirements/base.txt
# botocore
pytz==2024.1
# via
# -r requirements/base.txt
# django
# via -r requirements/base.txt
pyyaml==6.0.1
# via -r requirements/base.txt
s3transfer==0.10.0
Expand All @@ -83,6 +87,7 @@ stevedore==5.2.0
typing-extensions==4.10.0
# via
# -r requirements/base.txt
# asgiref
# edx-opaque-keys
urllib3==1.26.18
# via botocore
Expand Down
26 changes: 18 additions & 8 deletions requirements/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,25 @@ appdirs==1.4.4
# via
# -r requirements/django.txt
# fs
asgiref==3.7.2
# via
# -r requirements/django.txt
# django
babel==2.14.0
# via
# pydata-sphinx-theme
# sphinx
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements/django.txt
# django
beautifulsoup4==4.12.3
# via pydata-sphinx-theme
boto3==1.34.59
boto3==1.34.62
# via
# -r requirements/django.txt
# fs-s3fs
botocore==1.34.59
botocore==1.34.62
# via
# -r requirements/django.txt
# boto3
Expand All @@ -31,7 +39,7 @@ certifi==2024.2.2
# via requests
charset-normalizer==3.3.2
# via requests
django==2.2.28
django==4.2.11
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/django.txt
Expand All @@ -55,8 +63,10 @@ idna==3.6
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==7.0.2
# via sphinx
importlib-metadata==6.11.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# sphinx
jinja2==3.1.3
# via sphinx
jmespath==1.0.1
Expand All @@ -81,7 +91,7 @@ mock==5.1.0
# via -r requirements/doc.in
openedx-django-pyfs==3.5.0
# via -r requirements/django.txt
packaging==23.2
packaging==24.0
# via
# pydata-sphinx-theme
# sphinx
Expand All @@ -108,7 +118,6 @@ pytz==2024.1
# via
# -r requirements/django.txt
# babel
# django
pyyaml==6.0.1
# via -r requirements/django.txt
requests==2.31.0
Expand Down Expand Up @@ -159,6 +168,7 @@ stevedore==5.2.0
typing-extensions==4.10.0
# via
# -r requirements/django.txt
# asgiref
# edx-opaque-keys
# pydata-sphinx-theme
urllib3==1.26.18
Expand All @@ -170,7 +180,7 @@ web-fragments==2.1.0
# via -r requirements/django.txt
webob==1.8.7
# via -r requirements/django.txt
zipp==3.17.0
zipp==3.18.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
12 changes: 7 additions & 5 deletions requirements/pip-tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ build==1.1.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.0.2
# via build
packaging==23.2
importlib-metadata==6.11.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# build
packaging==24.0
# via build
pip-tools==7.4.1
# via -r requirements/pip-tools.in
Expand All @@ -23,9 +25,9 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.42.0
wheel==0.43.0
# via pip-tools
zipp==3.17.0
zipp==3.18.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.42.0
wheel==0.43.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.1.1
setuptools==69.2.0
# via -r requirements/pip.in
25 changes: 16 additions & 9 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,26 @@ appdirs==1.4.4
# via
# -r requirements/django.txt
# fs
asgiref==3.7.2
# via
# -r requirements/django.txt
# django
astroid==3.1.0
# via
# -r requirements/test.in
# pylint
# pylint-celery
attrs==23.2.0
# via hypothesis
boto3==1.34.59
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements/django.txt
# django
boto3==1.34.62
# via
# -r requirements/django.txt
# fs-s3fs
botocore==1.34.59
botocore==1.34.62
# via
# -r requirements/django.txt
# boto3
Expand All @@ -37,7 +45,7 @@ click==8.1.7
# edx-lint
click-log==0.4.0
# via edx-lint
code-annotations==1.6.0
code-annotations==1.7.0
# via edx-lint
colorama==0.4.6
# via tox
Expand Down Expand Up @@ -80,7 +88,7 @@ fs-s3fs==1.1.1
# via
# -r requirements/django.txt
# openedx-django-pyfs
hypothesis==6.99.0
hypothesis==6.99.6
# via -r requirements/test.in
inflect==7.0.0
# via jinja2-pluralize
Expand Down Expand Up @@ -119,7 +127,7 @@ mock==5.1.0
# via -r requirements/test.in
openedx-django-pyfs==3.5.0
# via -r requirements/django.txt
packaging==23.2
packaging==24.0
# via
# pyproject-api
# pytest
Expand All @@ -142,7 +150,7 @@ pluggy==1.4.0
# tox
pycodestyle==2.11.1
# via -r requirements/test.in
pydantic==2.6.3
pydantic==2.6.4
# via inflect
pydantic-core==2.16.3
# via pydantic
Expand Down Expand Up @@ -185,9 +193,7 @@ python-dateutil==2.9.0.post0
python-slugify==8.0.4
# via code-annotations
pytz==2024.1
# via
# -r requirements/django.txt
# django
# via -r requirements/django.txt
pyyaml==6.0.1
# via
# -r requirements/django.txt
Expand Down Expand Up @@ -233,6 +239,7 @@ typing-extensions==4.10.0
# via
# -r requirements/django.txt
# annotated-types
# asgiref
# astroid
# edx-opaque-keys
# inflect
Expand Down
Loading