diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be1fb8f..9820392 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: Python CI on: push: branches: - - master + - master pull_request: branches: - - '**' + - '**' jobs: run_tests: @@ -15,10 +15,8 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 - python-version: - - 3.8 - + - ubuntu-20.04 + python-version: ['3.8', '3.11'] steps: - uses: actions/checkout@v1 - name: setup python diff --git a/recommender/__init__.py b/recommender/__init__.py index 31462d1..f3dd7a1 100644 --- a/recommender/__init__.py +++ b/recommender/__init__.py @@ -6,4 +6,4 @@ # which is not loaded when running `manage.py` commands (which is used by `make compile_translations`) # from .recommender import RecommenderXBlock -__version__ = '2.1.1' +__version__ = '2.2.0' diff --git a/requirements/base.txt b/requirements/base.txt index 6b7d50c..ea40e4d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,11 +6,15 @@ # appdirs==1.4.4 # via fs -asgiref==3.7.2 +asgiref==3.8.1 # via django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # django bleach==6.1.0 # via -r requirements/base.in -django==3.2.22 +django==4.2.11 # via # -c requirements/common_constraints.txt # edx-i18n-tools @@ -18,18 +22,16 @@ edx-i18n-tools==1.3.0 # via -r requirements/base.in fs==2.4.16 # via -r requirements/base.in -lxml==4.9.3 +lxml==5.1.0 # via edx-i18n-tools -mako==1.2.4 +mako==1.3.2 # via -r requirements/base.in -markupsafe==2.1.3 +markupsafe==2.1.5 # via mako -path==16.7.1 +path==16.10.0 # via edx-i18n-tools polib==1.2.0 # via edx-i18n-tools -pytz==2023.3.post1 - # via django pyyaml==6.0.1 # via edx-i18n-tools simplejson==3.19.2 @@ -40,7 +42,7 @@ six==1.16.0 # fs sqlparse==0.4.4 # via django -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via asgiref web-fragments==2.1.0 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index 9ce47fc..28a82f2 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -8,13 +8,18 @@ appdirs==1.4.4 # via # -r requirements/test.txt # fs -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/test.txt # django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # django bleach==6.1.0 # via -r requirements/test.txt -django==3.2.22 +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/test.txt @@ -23,17 +28,17 @@ edx-i18n-tools==1.3.0 # via -r requirements/test.txt fs==2.4.16 # via -r requirements/test.txt -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/test.txt # edx-i18n-tools -mako==1.2.4 +mako==1.3.2 # via -r requirements/test.txt -markupsafe==2.1.3 +markupsafe==2.1.5 # via # -r requirements/test.txt # mako -path==16.7.1 +path==16.10.0 # via # -r requirements/test.txt # edx-i18n-tools @@ -41,12 +46,8 @@ polib==1.2.0 # via # -r requirements/test.txt # edx-i18n-tools -pycodestyle==2.11.0 +pycodestyle==2.11.1 # via -r requirements/test.txt -pytz==2023.3.post1 - # via - # -r requirements/test.txt - # django pyyaml==6.0.1 # via # -r requirements/test.txt @@ -62,7 +63,7 @@ sqlparse==0.4.4 # via # -r requirements/test.txt # django -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via # -r requirements/test.txt # asgiref diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index afe6aa8..e3bf8ea 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -13,7 +13,7 @@ # 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 @@ -22,6 +22,11 @@ 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 -# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. -# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 -tox<4.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 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index a51cb08..089eb3f 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -10,3 +10,6 @@ # Common constraints for edx repos -c common_constraints.txt + +# Temporary to Support the python 3.11 Upgrade +backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library \ No newline at end of file diff --git a/requirements/pip.txt b/requirements/pip.txt index 3e7d8f4..cf44902 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.41.2 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.2.1 +pip==24.0 # via -r requirements/pip.in -setuptools==68.2.2 +setuptools==69.2.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index fed3370..3db2d4c 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,26 +4,30 @@ # # make upgrade # -build==1.0.3 +build==1.1.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.8.0 - # 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.3.0 +pip-tools==7.4.1 # via -r requirements/pip_tools.in pyproject-hooks==1.0.0 - # via build + # via + # build + # pip-tools tomli==2.0.1 # via # build # pip-tools # pyproject-hooks -wheel==0.41.2 +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: diff --git a/requirements/test.txt b/requirements/test.txt index 8cbf13c..28d048c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,13 +8,18 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/base.txt # django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/base.txt + # django bleach==6.1.0 # via -r requirements/base.txt -django==3.2.22 +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -23,17 +28,17 @@ edx-i18n-tools==1.3.0 # via -r requirements/base.txt fs==2.4.16 # via -r requirements/base.txt -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/base.txt # edx-i18n-tools -mako==1.2.4 +mako==1.3.2 # via -r requirements/base.txt -markupsafe==2.1.3 +markupsafe==2.1.5 # via # -r requirements/base.txt # mako -path==16.7.1 +path==16.10.0 # via # -r requirements/base.txt # edx-i18n-tools @@ -41,12 +46,8 @@ polib==1.2.0 # via # -r requirements/base.txt # edx-i18n-tools -pycodestyle==2.11.0 +pycodestyle==2.11.1 # via -r requirements/test.in -pytz==2023.3.post1 - # via - # -r requirements/base.txt - # django pyyaml==6.0.1 # via # -r requirements/base.txt @@ -62,7 +63,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via # -r requirements/base.txt # asgiref diff --git a/setup.py b/setup.py index 13b50c8..ef169a3 100644 --- a/setup.py +++ b/setup.py @@ -93,5 +93,6 @@ def get_version(file_path): "Natural Language :: English", "Programming Language :: Python :: 3", 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.11', ], )