Merge pull request #46 from irtazaakram/depr-pkg-resources

Replace pkg_resources with importlib.resources

.github/workflows/merge-to-nightly.yml

@@ -23,7 +23,7 @@ jobs:
   merge-to-nightly:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # all branches and tags
       - name: Merge

.github/workflows/pypi-publish.yml

@@ -10,11 +10,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
 
       - name: Install pip
         run: pip install -r requirements/pip.txt

.github/workflows/test.yml

@@ -9,14 +9,18 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.11", "3.12"]
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up Python
-        uses: actions/setup-python@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: ${{ matrix.python-version }}
 
       - name: Upgrade pip
         run: python -m pip install --upgrade pip setuptools==44.0.0
@@ -37,7 +41,7 @@ jobs:
         run: make test-pythonpackage
 
       - name: Install caddy for Caddyfile syntax checking
-        run: |        
+        run: |
           sudo apt install -y debian-keyring debian-archive-keyring apt-transport-https
           curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
           curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | sudo tee /etc/apt/sources.list.d/caddy-stable.list

Makefile

@@ -5,7 +5,7 @@
 .DEFAULT_GOAL := help
 
 PACKAGE=tutorcoursegraph
-PROJECT=tutor-contrib-coursegraph
+PROJECT=tutor_contrib_coursegraph
 
 SOURCES=./setup.py ./$(PACKAGE)
 

requirements/base.txt

@@ -1,78 +1,76 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    make upgrade
 #
 appdirs==1.4.4
     # via tutor
-cachetools==5.2.0
+cachetools==5.5.0
     # via google-auth
-certifi==2022.6.15
+certifi==2024.12.14
     # via
     #   kubernetes
     #   requests
-charset-normalizer==2.0.12
+charset-normalizer==3.4.1
     # via requests
-click==8.1.3
+click==8.1.8
     # via
     #   -r requirements/base.in
     #   tutor
-google-auth==2.8.0
+durationpy==0.9
     # via kubernetes
-idna==3.3
+google-auth==2.37.0
+    # via kubernetes
+idna==3.10
     # via requests
-jinja2==3.1.2
+jinja2==3.1.5
     # via tutor
-kubernetes==24.2.0
+kubernetes==31.0.0
     # via tutor
-markupsafe==2.1.1
+markupsafe==3.0.2
     # via jinja2
-mypy==0.961
+mypy==1.14.1
     # via tutor
-mypy-extensions==0.4.3
+mypy-extensions==1.0.0
     # via mypy
-oauthlib==3.2.0
-    # via requests-oauthlib
-pyasn1==0.4.8
+oauthlib==3.2.2
+    # via
+    #   kubernetes
+    #   requests-oauthlib
+pyasn1==0.6.1
     # via
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.2.8
+pyasn1-modules==0.4.1
     # via google-auth
-pycryptodome==3.15.0
+pycryptodome==3.21.0
     # via tutor
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via kubernetes
-pyyaml==6.0
+pyyaml==6.0.2
     # via
     #   kubernetes
     #   tutor
-requests==2.28.0
+requests==2.32.3
     # via
     #   kubernetes
     #   requests-oauthlib
-requests-oauthlib==1.3.1
+requests-oauthlib==2.0.0
     # via kubernetes
-rsa==4.8
+rsa==4.9
     # via google-auth
-six==1.16.0
+six==1.17.0
     # via
-    #   google-auth
     #   kubernetes
     #   python-dateutil
-tomli==2.0.1
-    # via mypy
-tutor==14.0.1
+tutor==14.2.5
     # via -r requirements/base.in
-typing-extensions==4.2.0
+typing-extensions==4.12.2
     # via mypy
-urllib3==1.26.9
+urllib3==2.3.0
     # via
     #   kubernetes
     #   requests
-websocket-client==1.3.3
+websocket-client==1.8.0
     # via kubernetes
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

requirements/common_constraints.txt

@@ -11,15 +11,21 @@
 # Note: Changes to this file will automatically be used by other repos, referencing
 #  this file from Github directly. It does not require packaging in edx-lint.
 
-
 # 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
+# See https://github.com/openedx/edx-platform/issues/35126 for more info
 elasticsearch<7.14.0
 
-setuptools<60
-
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 django-simple-history==3.0.0
+
+# Cause: https://github.com/openedx/edx-lint/issues/458
+# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
+pip<24.3
+
+# Cause: https://github.com/openedx/edx-lint/issues/475
+# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
+urllib3<2.3.0