build: python 3.11 and 3.12 support.

build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. chore: Updating Python Requirements (#396) build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. build: python 3.11 and 3.12 support. fix: include setuptools in quality requirements chore: quality fixes
openedx · Apr 1, 2024 · 73700eb · 73700eb
1 parent 393cd0b
commit 73700eb
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 54 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,8 +15,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8']
-        toxenv: [quality, docs, pii_check, django32, django42]
+        python-version: ['3.8', '3.11', '3.12']
+        toxenv: [quality, docs, pii_check, django42]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
 	$(PIP_COMPILE) -o requirements/base.txt requirements/base.in
 	$(PIP_COMPILE) -o requirements/test.txt requirements/test.in
 	$(PIP_COMPILE) -o requirements/doc.txt requirements/doc.in
-	$(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in
+	$(PIP_COMPILE) --allow-unsafe -o requirements/quality.txt requirements/quality.in
 	$(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in
 	$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
 	# Let tox control the Django version for tests

diff --git a/event_routing_backends/processors/xapi/tests/test_xapi.py b/event_routing_backends/processors/xapi/tests/test_xapi.py
@@ -64,22 +64,22 @@ def test_send_method_with_successfull_flow(self, mocked_logger, mocked_get_trans
 
         self.processor([self.sample_event])
 
-        self.assertIn(call(transformed_event.to_json()), mocked_logger.mock_calls)
+        self.assertIn(call.info(transformed_event.to_json()), mocked_logger.mock_calls)
 
     @patch(
         'event_routing_backends.processors.xapi.transformer_processor.XApiTransformersRegistry.get_transformer'
     )
     @patch('event_routing_backends.processors.xapi.transformer_processor.xapi_logger')
     def test_send_method_with_event_list_successfull_flow(self, mocked_logger, mocked_get_transformer):
+
         transformed_event = Statement()
         transformed_event.object = Activity(id=str(uuid.uuid4()))
         mocked_transformer = MagicMock()
         mocked_transformer.transform.return_value = [transformed_event]
         mocked_get_transformer.return_value = mocked_transformer
 
         self.processor([self.sample_event])
-
-        self.assertIn(call(transformed_event.to_json()), mocked_logger.mock_calls)
+        self.assertIn(call.info(transformed_event.to_json()), mocked_logger.mock_calls)
 
     @patch(
         'event_routing_backends.processors.xapi.transformer_processor.XApiTransformersRegistry.get_transformer'

diff --git a/requirements/base.in b/requirements/base.in
@@ -17,3 +17,4 @@ apache-libcloud           # For bulk event log loading
 fasteners                 # Locking tools, required by apache-libcloud, but somehow not installed with it
 openedx-filters
 django-redis
+setuptools                # Python 3.12 requires setuptools package
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -16,8 +16,9 @@ async-timeout==4.0.3
     # via redis
 attrs==23.2.0
     # via openedx-events
-backports-zoneinfo[tzdata]==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   celery
     #   django
     #   djangorestframework
@@ -92,7 +93,7 @@ djangorestframework==3.15.1
     # via django-config-models
 edx-celeryutils==1.2.5
     # via -r requirements/base.in
-edx-django-utils==5.11.0
+edx-django-utils==5.12.0
     # via
     #   django-config-models
     #   edx-toggles
@@ -120,13 +121,13 @@ jsonfield==3.1.0
     # via
     #   -r requirements/base.in
     #   edx-celeryutils
-kombu==5.3.5
+kombu==5.3.6
     # via celery
 markupsafe==2.1.5
     # via jinja2
-newrelic==9.7.1
+newrelic==9.8.0
     # via edx-django-utils
-openedx-events==9.5.2
+openedx-events==9.6.0
     # via event-tracking
 openedx-filters==1.6.0
     # via -r requirements/base.in
@@ -136,7 +137,7 @@ prompt-toolkit==3.0.43
     # via click-repl
 psutil==5.9.8
     # via edx-django-utils
-pycparser==2.21
+pycparser==2.22
     # via cffi
 pymongo==3.13.0
     # via
@@ -197,3 +198,6 @@ vine==5.1.0
     #   kombu
 wcwidth==0.2.13
     # via prompt-toolkit
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -23,3 +23,5 @@ sphinx==4.2.0
 # This pin can be removed once sphinx constraint is removed.
 docutils<0.18
 doc8<1.0.0
+# it is not availablein python3.9
+backports.zoneinfo;python_version<"3.9"
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -12,8 +12,6 @@ aniso8601==9.0.1
     # via
     #   -r requirements/quality.txt
     #   tincan
-annotated-types==0.6.0
-    # via pydantic
 apache-libcloud==3.8.0
     # via -r requirements/quality.txt
 asgiref==3.8.1
@@ -33,8 +31,9 @@ attrs==23.2.0
     # via
     #   -r requirements/quality.txt
     #   openedx-events
-backports-zoneinfo[tzdata]==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/quality.txt
     #   celery
     #   django
@@ -44,7 +43,7 @@ billiard==4.2.0
     # via
     #   -r requirements/quality.txt
     #   celery
-build==1.1.1
+build==1.2.1
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
@@ -179,7 +178,7 @@ djangorestframework==3.15.1
     #   django-config-models
 edx-celeryutils==1.2.5
     # via -r requirements/quality.txt
-edx-django-utils==5.11.0
+edx-django-utils==5.12.0
     # via
     #   -r requirements/quality.txt
     #   django-config-models
@@ -230,7 +229,8 @@ importlib-metadata==6.11.0
     #   -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
+    #   typeguard
+inflect==7.2.0
     # via jinja2-pluralize
 iniconfig==2.0.0
     # via
@@ -254,11 +254,11 @@ jsonfield==3.1.0
     # via
     #   -r requirements/quality.txt
     #   edx-celeryutils
-kombu==5.3.5
+kombu==5.3.6
     # via
     #   -r requirements/quality.txt
     #   celery
-lxml==5.1.0
+lxml==5.2.0
     # via edx-i18n-tools
 markupsafe==2.1.5
     # via
@@ -270,11 +270,13 @@ mccabe==0.7.0
     #   pylint
 mock==5.1.0
     # via -r requirements/quality.txt
-newrelic==9.7.1
+more-itertools==10.2.0
+    # via inflect
+newrelic==9.8.0
     # via
     #   -r requirements/quality.txt
     #   edx-django-utils
-openedx-events==9.5.2
+openedx-events==9.6.0
     # via
     #   -r requirements/quality.txt
     #   event-tracking
@@ -323,14 +325,10 @@ psutil==5.9.8
     #   edx-django-utils
 pycodestyle==2.11.1
     # via -r requirements/quality.txt
-pycparser==2.21
+pycparser==2.22
     # via
     #   -r requirements/quality.txt
     #   cffi
-pydantic==2.6.4
-    # via inflect
-pydantic-core==2.16.3
-    # via pydantic
 pydocstyle==6.3.0
     # via -r requirements/quality.txt
 pygments==2.17.2
@@ -455,19 +453,19 @@ tomlkit==0.12.4
     #   pylint
 tox==4.14.2
     # via -r requirements/ci.txt
+typeguard==4.2.1
+    # via inflect
 typing-extensions==4.10.0
     # via
     #   -r requirements/quality.txt
-    #   annotated-types
     #   asgiref
     #   astroid
     #   edx-opaque-keys
     #   faker
     #   inflect
     #   kombu
-    #   pydantic
-    #   pydantic-core
     #   pylint
+    #   typeguard
 tzdata==2024.1
     # via
     #   -r requirements/quality.txt
@@ -494,6 +492,7 @@ wcwidth==0.2.13
 wheel==0.43.0
     # via
     #   -r requirements/pip-tools.txt
+    #   -r requirements/quality.txt
     #   pip-tools
 zipp==3.18.1
     # via

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -34,8 +34,9 @@ babel==2.14.0
     # via
     #   pydata-sphinx-theme
     #   sphinx
-backports-zoneinfo[tzdata]==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   celery
     #   django
@@ -47,7 +48,7 @@ billiard==4.2.0
     # via
     #   -r requirements/test.txt
     #   celery
-build==1.1.1
+build==1.2.1
     # via -r requirements/doc.in
 celery==5.3.6
     # via
@@ -159,7 +160,7 @@ docutils==0.17.1
     #   sphinx
 edx-celeryutils==1.2.5
     # via -r requirements/test.txt
-edx-django-utils==5.11.0
+edx-django-utils==5.12.0
     # via
     #   -r requirements/test.txt
     #   django-config-models
@@ -212,7 +213,7 @@ iniconfig==2.0.0
     #   pytest
 isodate==0.6.1
     # via -r requirements/test.txt
-jaraco-classes==3.3.1
+jaraco-classes==3.4.0
     # via keyring
 jaraco-context==4.3.0
     # via keyring
@@ -233,7 +234,7 @@ jsonfield==3.1.0
     #   edx-celeryutils
 keyring==25.0.0
     # via twine
-kombu==5.3.5
+kombu==5.3.6
     # via
     #   -r requirements/test.txt
     #   celery
@@ -251,13 +252,13 @@ more-itertools==10.2.0
     # via
     #   jaraco-classes
     #   jaraco-functools
-newrelic==9.7.1
+newrelic==9.8.0
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
 nh3==0.2.17
     # via readme-renderer
-openedx-events==9.5.2
+openedx-events==9.6.0
     # via
     #   -r requirements/test.txt
     #   event-tracking
@@ -288,7 +289,7 @@ psutil==5.9.8
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
-pycparser==2.21
+pycparser==2.22
     # via
     #   -r requirements/test.txt
     #   cffi

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-build==1.1.1
+build==1.2.1
     # via pip-tools
 click==8.1.7
     # via pip-tools

diff --git a/requirements/quality.in b/requirements/quality.in
@@ -7,3 +7,5 @@ edx-lint                  # edX pylint rules and plugins
 isort                     # to standardize order of imports
 pycodestyle               # PEP 8 compliance validation
 pydocstyle                # PEP 257 compliance validation
+wheel
+setuptools
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -30,8 +30,9 @@ attrs==23.2.0
     # via
     #   -r requirements/test.txt
     #   openedx-events
-backports-zoneinfo[tzdata]==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   celery
     #   django
@@ -145,7 +146,7 @@ djangorestframework==3.15.1
     #   django-config-models
 edx-celeryutils==1.2.5
     # via -r requirements/test.txt
-edx-django-utils==5.11.0
+edx-django-utils==5.12.0
     # via
     #   -r requirements/test.txt
     #   django-config-models
@@ -202,7 +203,7 @@ jsonfield==3.1.0
     # via
     #   -r requirements/test.txt
     #   edx-celeryutils
-kombu==5.3.5
+kombu==5.3.6
     # via
     #   -r requirements/test.txt
     #   celery
@@ -214,11 +215,11 @@ mccabe==0.7.0
     # via pylint
 mock==5.1.0
     # via -r requirements/test.txt
-newrelic==9.7.1
+newrelic==9.8.0
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
-openedx-events==9.5.2
+openedx-events==9.6.0
     # via
     #   -r requirements/test.txt
     #   event-tracking
@@ -248,7 +249,7 @@ psutil==5.9.8
     #   edx-django-utils
 pycodestyle==2.11.1
     # via -r requirements/quality.in
-pycparser==2.21
+pycparser==2.22
     # via
     #   -r requirements/test.txt
     #   cffi
@@ -373,3 +374,9 @@ wcwidth==0.2.13
     # via
     #   -r requirements/test.txt
     #   prompt-toolkit
+wheel==0.43.0
+    # via -r requirements/quality.in
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==69.2.0
+    # via -r requirements/quality.in