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: include new assets.txt file in make upgrade #32860

Merged
merged 8 commits into from
Jul 27, 2023
Merged

fix: include new assets.txt file in make upgrade #32860

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5436511
fix: include new assets.txt file in make upgrade
UsamaSadiq Jul 27, 2023
ddaf1f1
test: update click version to resolve upgrade job failure
UsamaSadiq Jul 27, 2023
ad03f51
chore: Updating Python Requirements (#32861)
edx-requirements-bot Jul 27, 2023
48e907e
chore: Removed one package
awais786 Jul 27, 2023
d957231
chore: Removed package
awais786 Jul 27, 2023
883f472
chore: Removed package
awais786 Jul 27, 2023
fbc852c
chore: Update testing.txt
awais786 Jul 27, 2023
f48e3bb
chore: fixing some packages.
awais786 Jul 27, 2023
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
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ REQ_FILES = \
requirements/edx/doc \
requirements/edx/testing \
requirements/edx/development \
requirements/edx/assets \
scripts/xblock/requirements

define COMMON_CONSTRAINTS_TEMP_COMMENT
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/assets.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
click==8.1.5
click==8.1.6
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/assets.in
Expand Down
11 changes: 6 additions & 5 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ django==3.2.20
# django-statici18n
# django-storages
# django-user-tasks
# django-waffle
# djangorestframework
# done-xblock
# drf-jwt
Expand Down Expand Up @@ -362,7 +363,7 @@ django-storages==1.9.1
# edxval
django-user-tasks==3.1.0
# via -r requirements/edx/kernel.in
django-waffle==3.0.0
django-waffle==4.0.0
# via
# -r requirements/edx/kernel.in
# edx-django-utils
Expand Down Expand Up @@ -429,22 +430,22 @@ edx-auth-backends==4.1.0
# openedx-blockstore
edx-braze-client==0.1.7
# via -r requirements/edx/bundled.in
edx-bulk-grades==1.0.1
edx-bulk-grades==1.0.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This package looks ok.

# via
# -r requirements/edx/kernel.in
# staff-graded-xblock
edx-ccx-keys==1.2.1
# via -r requirements/edx/kernel.in
edx-celeryutils==1.2.2
edx-celeryutils==1.2.3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This package looks ok.

# via
# -r requirements/edx/kernel.in
# edx-name-affirmation
# super-csv
edx-codejail==3.3.3
# via -r requirements/edx/kernel.in
edx-completion==4.2.1
edx-completion==4.3.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks ok

# via -r requirements/edx/kernel.in
edx-django-release-util==1.2.0
edx-django-release-util==1.3.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has migration due to django40

# via
# -r requirements/edx/kernel.in
# edxval
Expand Down
17 changes: 9 additions & 8 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ django==3.2.20
# django-stubs
# django-stubs-ext
# django-user-tasks
# django-waffle
# djangorestframework
# done-xblock
# drf-jwt
Expand Down Expand Up @@ -586,7 +587,7 @@ django-user-tasks==3.1.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
django-waffle==3.0.0
django-waffle==4.0.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -687,7 +688,7 @@ edx-braze-client==0.1.7
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
edx-bulk-grades==1.0.1
edx-bulk-grades==1.0.2
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand All @@ -696,7 +697,7 @@ edx-ccx-keys==1.2.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
edx-celeryutils==1.2.2
edx-celeryutils==1.2.3
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand All @@ -706,11 +707,11 @@ edx-codejail==3.3.3
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
edx-completion==4.2.1
edx-completion==4.3.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
edx-django-release-util==1.2.0
edx-django-release-util==1.3.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1461,11 +1462,11 @@ pycryptodomex==3.18.0
# lti-consumer-xblock
# pyjwkest
# snowflake-connector-python
pydantic==2.0.3
pydantic==2.1.1
# via
# -r requirements/edx/testing.txt
# fastapi
pydantic-core==2.3.0
pydantic-core==2.4.0
# via
# -r requirements/edx/testing.txt
# pydantic
Expand Down Expand Up @@ -2023,7 +2024,7 @@ tomli==2.0.1
# pyproject-hooks
# pytest
# tox
tomlkit==0.11.8
tomlkit==0.12.0
# via
# -r requirements/edx/testing.txt
# pylint
Expand Down
13 changes: 7 additions & 6 deletions requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ django==3.2.20
# django-statici18n
# django-storages
# django-user-tasks
# django-waffle
# djangorestframework
# done-xblock
# drf-jwt
Expand Down Expand Up @@ -426,7 +427,7 @@ django-storages==1.9.1
# edxval
django-user-tasks==3.1.0
# via -r requirements/edx/base.txt
django-waffle==3.0.0
django-waffle==4.0.0
# via
# -r requirements/edx/base.txt
# edx-django-utils
Expand Down Expand Up @@ -506,22 +507,22 @@ edx-auth-backends==4.1.0
# openedx-blockstore
edx-braze-client==0.1.7
# via -r requirements/edx/base.txt
edx-bulk-grades==1.0.1
edx-bulk-grades==1.0.2
# via
# -r requirements/edx/base.txt
# staff-graded-xblock
edx-ccx-keys==1.2.1
# via -r requirements/edx/base.txt
edx-celeryutils==1.2.2
edx-celeryutils==1.2.3
# via
# -r requirements/edx/base.txt
# edx-name-affirmation
# super-csv
edx-codejail==3.3.3
# via -r requirements/edx/base.txt
edx-completion==4.2.1
edx-completion==4.3.0
# via -r requirements/edx/base.txt
edx-django-release-util==1.2.0
edx-django-release-util==1.3.0
# via
# -r requirements/edx/base.txt
# edxval
Expand Down Expand Up @@ -555,7 +556,7 @@ edx-drf-extensions==8.8.0
# edx-rbac
# edx-when
# edxval
edx-enterprise==4.0.4
edx-enterprise==4.0.5
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down
17 changes: 9 additions & 8 deletions requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ django==3.2.20
# django-statici18n
# django-storages
# django-user-tasks
# django-waffle
# djangorestframework
# done-xblock
# drf-jwt
Expand Down Expand Up @@ -458,7 +459,7 @@ django-storages==1.9.1
# edxval
django-user-tasks==3.1.0
# via -r requirements/edx/base.txt
django-waffle==3.0.0
django-waffle==4.0.0
# via
# -r requirements/edx/base.txt
# edx-django-utils
Expand Down Expand Up @@ -535,22 +536,22 @@ edx-auth-backends==4.1.0
# openedx-blockstore
edx-braze-client==0.1.7
# via -r requirements/edx/base.txt
edx-bulk-grades==1.0.1
edx-bulk-grades==1.0.2
# via
# -r requirements/edx/base.txt
# staff-graded-xblock
edx-ccx-keys==1.2.1
# via -r requirements/edx/base.txt
edx-celeryutils==1.2.2
edx-celeryutils==1.2.3
# via
# -r requirements/edx/base.txt
# edx-name-affirmation
# super-csv
edx-codejail==3.3.3
# via -r requirements/edx/base.txt
edx-completion==4.2.1
edx-completion==4.3.0
# via -r requirements/edx/base.txt
edx-django-release-util==1.2.0
edx-django-release-util==1.3.0
# via
# -r requirements/edx/base.txt
# edxval
Expand Down Expand Up @@ -1097,9 +1098,9 @@ pycryptodomex==3.18.0
# lti-consumer-xblock
# pyjwkest
# snowflake-connector-python
pydantic==2.0.3
pydantic==2.1.1
# via fastapi
pydantic-core==2.3.0
pydantic-core==2.4.0
# via pydantic
pygments==2.15.1
# via
Expand Down Expand Up @@ -1490,7 +1491,7 @@ tomli==2.0.1
# pylint
# pytest
# tox
tomlkit==0.11.8
tomlkit==0.12.0
# via pylint
tox==3.28.0
# via
Expand Down