Merge pull request #153 from openedx/feanil/some_maintenance

Drop python 3.8 support and other maintenance

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8', '3.11', '3.12']
+        python-version: ['3.11', '3.12']
         toxenv: [django42, quality]
 
     steps:
@@ -31,17 +31,19 @@ jobs:
       run: pip install -r requirements/pip.txt
 
     - name: Install Dependencies
-      run:
+      run: |
         pip install setuptools
         pip install -r requirements/ci.txt
 
     - name: Run Tests
       env:
         TOXENV: ${{ matrix.toxenv }}
+      # Sleep is needed to give elasticsearch enough time to startup.
+      # Longer term we should switch to the upstream ES github action to start up the server
       run: sleep 10 && tox
 
     - name: Run Coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
+      if: matrix.python-version == '3.12' && matrix.toxenv=='django42'
       uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

Makefile

@@ -25,10 +25,10 @@ validate: clean
 	tox
 
 test.start_elasticsearch:
-	docker-compose up -d
+	docker compose up -d
 
 test.stop_elasticsearch:
-	docker-compose stop
+	docker compose stop
 
 test_with_es: clean test.start_elasticsearch
 	coverage run --source='.' manage.py test

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '2.2'
 services:
 
   test_elasticsearch:

edxsearch/__init__.py

@@ -1,3 +1,3 @@
 """ Container module for testing / demoing search """
 
-__version__ = '3.9.1'
+__version__ = '4.0.0'

pylintrc

@@ -64,7 +64,7 @@
 # SERIOUSLY.
 #
 # ------------------------------
-# Generated by edx-lint version: 5.3.0
+# Generated by edx-lint version: 5.3.7
 # ------------------------------
 [MASTER]
 ignore = 
@@ -259,6 +259,7 @@ enable =
 	useless-suppression,
 disable = 
 	bad-indentation,
+	broad-exception-raised,
 	consider-using-f-string,
 	duplicate-code,
 	file-ignored,
@@ -380,6 +381,6 @@ ext-import-graph =
 int-import-graph = 
 
 [EXCEPTIONS]
-overgeneral-exceptions = Exception
+overgeneral-exceptions = builtins.Exception
 
-# e79d284912469e90087c79e80233e873551b6ca9
+# 1a9b016a2ea1ded8c5b79b0e520a5566eba73b62

requirements/base.txt

@@ -1,25 +1,20 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
 #
 amqp==5.2.0
     # via kombu
-asgiref==3.7.2
+asgiref==3.8.1
     # via django
 attrs==23.2.0
     # via openedx-events
-backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
-    # via
-    #   -c requirements/constraints.txt
-    #   celery
-    #   kombu
 billiard==4.2.0
     # via celery
-celery==5.3.6
+celery==5.4.0
     # via event-tracking
-certifi==2024.2.2
+certifi==2024.7.4
     # via elasticsearch
 cffi==1.16.0
     # via pynacl
@@ -31,15 +26,15 @@ click==8.1.7
     #   click-repl
     #   code-annotations
     #   edx-django-utils
-click-didyoumean==0.3.0
+click-didyoumean==0.3.1
     # via celery
 click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-code-annotations==1.6.0
+code-annotations==1.8.0
     # via edx-toggles
-django==3.2.24
+django==4.2.14
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
@@ -57,82 +52,82 @@ django-waffle==4.1.0
     # via
     #   edx-django-utils
     #   edx-toggles
-edx-django-utils==5.10.1
+edx-ccx-keys==1.3.0
+    # via openedx-events
+edx-django-utils==5.14.2
     # via
     #   edx-toggles
     #   event-tracking
     #   openedx-events
-edx-opaque-keys[django]==2.5.1
-    # via openedx-events
-edx-toggles==5.1.1
+edx-opaque-keys[django]==2.10.0
+    # via
+    #   edx-ccx-keys
+    #   openedx-events
+edx-toggles==5.2.0
     # via
     #   -r requirements/base.in
     #   event-tracking
 elasticsearch==7.13.4
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
-event-tracking==2.3.0
-    # via -r requirements/base.in
-fastavro==1.9.4
+event-tracking==2.4.0
+    # via
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -r requirements/base.in
+fastavro==1.9.5
     # via openedx-events
-jinja2==3.1.3
+jinja2==3.1.4
     # via code-annotations
-kombu==5.3.5
+kombu==5.3.7
     # via celery
 markupsafe==2.1.5
     # via jinja2
-newrelic==9.6.0
+newrelic==9.12.0
     # via edx-django-utils
-openedx-events==9.5.2
+openedx-events==9.11.0
     # via event-tracking
 pbr==6.0.0
     # via stevedore
-prompt-toolkit==3.0.43
+prompt-toolkit==3.0.47
     # via click-repl
-psutil==5.9.8
+psutil==6.0.0
     # via edx-django-utils
-pycparser==2.21
+pycparser==2.22
     # via cffi
 pymongo==3.13.0
     # via
     #   edx-opaque-keys
     #   event-tracking
 pynacl==1.5.0
     # via edx-django-utils
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via celery
 python-slugify==8.0.4
     # via code-annotations
 pytz==2024.1
-    # via
-    #   django
-    #   event-tracking
+    # via event-tracking
 pyyaml==6.0.1
     # via code-annotations
 six==1.16.0
     # via
+    #   edx-ccx-keys
     #   event-tracking
     #   python-dateutil
-sqlparse==0.4.4
+sqlparse==0.5.1
     # via django
-stevedore==5.1.0
+stevedore==5.2.0
     # via
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
 text-unidecode==1.3
     # via python-slugify
-typing-extensions==4.9.0
-    # via
-    #   asgiref
-    #   edx-opaque-keys
-    #   kombu
+typing-extensions==4.12.2
+    # via edx-opaque-keys
 tzdata==2024.1
-    # via
-    #   backports-zoneinfo
-    #   celery
-urllib3==1.26.18
+    # via celery
+urllib3==1.26.19
     # via elasticsearch
 vine==5.1.0
     # via

requirements/ci.txt

@@ -1,38 +1,34 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
 #
-cachetools==5.3.2
+cachetools==5.4.0
     # 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.15.4
     # via
     #   tox
     #   virtualenv
-packaging==23.2
+packaging==24.1
     # via
     #   pyproject-api
     #   tox
-platformdirs==4.2.0
+platformdirs==4.2.2
     # via
     #   tox
     #   virtualenv
-pluggy==1.4.0
+pluggy==1.5.0
     # via tox
-pyproject-api==1.6.1
+pyproject-api==1.7.1
     # via tox
-tomli==2.0.1
-    # via
-    #   pyproject-api
-    #   tox
-tox==4.13.0
+tox==4.16.0
     # via -r requirements/ci.in
-virtualenv==20.25.0
+virtualenv==20.26.3
     # via tox