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.

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

Python Requirements Update #178

Merged
merged 2 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions invideoquiz/invideoquiz.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,20 @@
videos at specific time points.
"""

import os
import json
import os

import pkg_resources

from xblock.core import XBlock
from xblock.fields import Scope
from xblock.fields import String
from xblock.fragment import Fragment

try:
from web_fragments.fragment import Fragment
except ImportError:
# For backward compatibility with quince and earlier.
from xblock.fragment import Fragment
from xblock.validation import ValidationMessage
try:
from xblock.utils.studio_editable import StudioEditableXBlockMixin
Expand Down
16 changes: 9 additions & 7 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
#
appdirs==1.4.4
# via fs
asgiref==3.7.2
asgiref==3.8.1
# via django
django==3.2.24
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand All @@ -22,12 +26,10 @@ markupsafe==2.1.5
# via
# mako
# xblock
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via xblock
pytz==2024.1
# via
# django
# xblock
# via xblock
pyyaml==6.0.1
# via xblock
simplejson==3.19.2
Expand All @@ -45,7 +47,7 @@ web-fragments==2.1.0
# via xblock
webob==1.8.7
# via xblock
xblock==1.10.0
xblock==3.0.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
11 changes: 10 additions & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,20 @@


# using LTS django version
Django<4.0
Django<5.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
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7
1 change: 1 addition & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@

# This file contains all common constraints for edx-repos
-c common_constraints.txt
backports.zoneinfo;python_version<"3.9"
4 changes: 2 additions & 2 deletions requirements/pip.txt
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
16 changes: 9 additions & 7 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
#
# make upgrade
#
build==1.0.3
build==1.1.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.0.1
# via build
packaging==23.2
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# build
packaging==24.0
# via build
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip_tools.in
pyproject-hooks==1.0.0
# via
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.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
22 changes: 13 additions & 9 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,22 @@ appdirs==1.4.4
# via
# -r requirements/base.txt
# fs
asgiref==3.7.2
asgiref==3.8.1
# via
# -r requirements/base.txt
# django
astroid==3.1.0
# via pylint
coverage==7.4.3
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# django
coverage==7.4.4
# via -r requirements/test.txt
dill==0.3.8
# via pylint
django==3.2.24
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -53,7 +58,7 @@ mccabe==0.7.0
# via pylint
mock==5.1.0
# via -r requirements/test.txt
packaging==23.2
packaging==24.0
# via
# -r requirements/test.txt
# pytest
Expand All @@ -67,20 +72,19 @@ pycodestyle==2.11.1
# via -r requirements/quality.in
pylint==3.1.0
# via -r requirements/quality.in
pytest==8.0.2
pytest==8.1.1
# via
# -r requirements/test.txt
# pytest-django
pytest-django==4.8.0
# via -r requirements/test.txt
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# -r requirements/base.txt
# xblock
pytz==2024.1
# via
# -r requirements/base.txt
# django
# xblock
pyyaml==6.0.1
# via
Expand All @@ -104,7 +108,7 @@ tomli==2.0.1
# -r requirements/test.txt
# pylint
# pytest
tomlkit==0.12.3
tomlkit==0.12.4
# via pylint
typing-extensions==4.10.0
# via
Expand All @@ -120,7 +124,7 @@ webob==1.8.7
# via
# -r requirements/base.txt
# xblock
xblock==1.10.0
xblock==3.0.0
# via -r requirements/base.txt

# The following packages are considered to be unsafe in a requirements file:
Expand Down
6 changes: 3 additions & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#
# make upgrade
#
coverage==7.4.3
coverage==7.4.4
# via -r requirements/test.in
exceptiongroup==1.2.0
# via pytest
iniconfig==2.0.0
# via pytest
mock==5.1.0
# via -r requirements/test.in
packaging==23.2
packaging==24.0
# via pytest
pluggy==1.4.0
# via pytest
pytest==8.0.2
pytest==8.1.1
# via pytest-django
pytest-django==4.8.0
# via -r requirements/test.in
Expand Down
8 changes: 4 additions & 4 deletions requirements/tox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#
# make upgrade
#
cachetools==5.3.2
cachetools==5.3.3
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.13.1
filelock==3.13.3
# via
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via
# pyproject-api
# tox
Expand All @@ -32,7 +32,7 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.13.0
tox==4.14.2
# via -r requirements/tox.in
virtualenv==20.25.1
# via tox
8 changes: 4 additions & 4 deletions requirements/travis.txt
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
# -r requirements/tox.txt
# tox
Expand All @@ -30,14 +30,14 @@ distlib==0.3.8
# virtualenv
docopt==0.6.2
# via coveralls
filelock==3.13.1
filelock==3.13.3
# via
# -r requirements/tox.txt
# tox
# virtualenv
idna==3.6
# via requests
packaging==23.2
packaging==24.0
# via
# -r requirements/tox.txt
# pyproject-api
Expand All @@ -62,7 +62,7 @@ tomli==2.0.1
# -r requirements/tox.txt
# pyproject-api
# tox
tox==4.13.0
tox==4.14.2
# via -r requirements/tox.txt
urllib3==2.2.1
# via requests
Expand Down
Loading