From b210f411cd7514c43959aae1a47969b9bb2af7e1 Mon Sep 17 00:00:00 2001 From: Chintan Joshi Date: Fri, 5 Apr 2024 11:13:22 +0300 Subject: [PATCH 1/2] build: add python3.11 support --- .github/workflows/ci.yml | 1 + requirements/base.txt | 6 +++--- requirements/common_constraints.txt | 9 +++++++++ requirements/pip.txt | 4 ++-- requirements/pip_tools.txt | 16 +++++++++------- requirements/test.txt | 8 ++++---- setup.py | 1 + 7 files changed, 29 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bca496d..0361417 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,7 @@ jobs: - ubuntu-20.04 python-version: - 3.8 + - 3.11 steps: - uses: actions/checkout@v4 diff --git a/requirements/base.txt b/requirements/base.txt index 25ec0c5..77c66d5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,7 +8,7 @@ appdirs==1.4.4 # via fs fs==2.4.16 # via xblock -lxml==5.1.0 +lxml==5.2.1 # via xblock mako==1.3.2 # via xblock @@ -29,13 +29,13 @@ six==1.16.0 # -r requirements/base.in # fs # python-dateutil -web-fragments==2.1.0 +web-fragments==2.2.0 # via # -r requirements/base.in # xblock webob==1.8.7 # via xblock -xblock==2.0.0 +xblock==3.1.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 96cc5db..e3bf8ea 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -21,3 +21,12 @@ 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 diff --git a/requirements/pip.txt b/requirements/pip.txt index 6665603..cf44902 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -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 diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index abed760..4e1105e 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,15 +4,17 @@ # # make upgrade # -build==1.1.1 +build==1.2.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 @@ -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: diff --git a/requirements/test.txt b/requirements/test.txt index edda8fc..b81ddf9 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,19 +4,19 @@ # # make upgrade # -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via pytest-cov exceptiongroup==1.2.0 # via pytest iniconfig==2.0.0 # via pytest -packaging==23.2 +packaging==24.0 # via pytest pluggy==1.4.0 # via pytest -pytest==8.1.0 +pytest==8.1.1 # via pytest-cov -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.in tomli==2.0.1 # via diff --git a/setup.py b/setup.py index ef63e3c..c08f825 100644 --- a/setup.py +++ b/setup.py @@ -135,6 +135,7 @@ def get_version(file_path): 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: Implementation :: CPython', ], ) From a109393263ae2684517120ebc166ff66bf7eaedc Mon Sep 17 00:00:00 2001 From: Chintan Joshi Date: Fri, 5 Apr 2024 11:21:22 +0300 Subject: [PATCH 2/2] chore: bump version --- crowdsourcehinter/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdsourcehinter/__init__.py b/crowdsourcehinter/__init__.py index 3a81892..2a19630 100644 --- a/crowdsourcehinter/__init__.py +++ b/crowdsourcehinter/__init__.py @@ -1,3 +1,3 @@ from .crowdsourcehinter import CrowdsourceHinter -__version__ = '0.6' +__version__ = '0.7'