Merge pull request #30 from irtazaakram/depr-pkg_resources

Replace pkg_resources with importlib.resources

.github/workflows/ci.yml

@@ -16,11 +16,11 @@ jobs:
       matrix:
         os:
         - ubuntu-latest
-        python-version: ['3.8', '3.11']
+        python-version: ['3.11', '3.12']
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

.github/workflows/pypi-publish.yml

@@ -11,11 +11,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

README.md

@@ -10,10 +10,10 @@ For more information about the Tin Can API visit:
 
 <http://tincanapi.com/>
 
-Requires Python 3.8 or later.
+Requires Python 3.11 or later.
 
 ## Installation
-TinCanPython requires [Python 3.8](https://www.python.org/downloads/) or later.
+TinCanPython requires [Python 3.11](https://www.python.org/downloads/) or later.
 
 If you are installing from the Github repo, you will need to install `aniso8601` and `pytz` (use `sudo` as necessary):
 

docs/source/conf.py

@@ -13,7 +13,7 @@
 
 import sys
 import os
-import pkg_resources
+from importlib.metadata import version as get_version
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -64,9 +64,9 @@ def setup(app):
 # built documents.
 #
 # The short X.Y version.
-version = pkg_resources.require("tincan")[0].version
+version = get_version("tincan")
 # The full version, including alpha/beta/rc tags.
-release = pkg_resources.require("tincan")[0].version
+release = get_version("tincan")
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

requirements/base.txt

@@ -1,10 +1,10 @@
 #
-# This file is autogenerated by pip-compile
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    make upgrade
 #
-aniso8601==9.0.1
+aniso8601==10.0.0
     # via -r requirements/base.in
-pytz==2020.5
+pytz==2024.2
     # via -r requirements/base.in

requirements/ci.txt

@@ -1,10 +1,10 @@
 #
-# This file is autogenerated by pip-compile
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    make upgrade
 #
-aniso8601==9.0.1
+aniso8601==10.0.0
     # via -r requirements/test.txt
-pytz==2020.5
+pytz==2024.2
     # via -r requirements/test.txt

requirements/constraints.txt

@@ -7,3 +7,6 @@
 # link to other information that will help people in the future to remove the
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
+
+# Common constraints for edx repos
+-c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt

requirements/pip.in

@@ -1,3 +1,4 @@
+-c constraints.txt
 # Core dependencies for installing other packages
 
 pip

requirements/pip.txt

@@ -1,14 +1,16 @@
 #
-# 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:
 #
-#    pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in
+#    make upgrade
 #
-wheel==0.42.0
+wheel==0.45.1
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==24.0
+pip==24.2
+    # via
+    #   -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -r requirements/pip.in
+setuptools==75.8.0
     # via -r requirements/pip.in
-setuptools==69.1.1
-    # via -r requirements/pip.in

requirements/pip_tools.txt

@@ -1,13 +1,24 @@
 #
-# This file is autogenerated by pip-compile
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    make upgrade
 #
-click==8.1.7
+build==1.2.2.post1
     # via pip-tools
-pip-tools==7.4.0
+click==8.1.8
+    # via pip-tools
+packaging==24.2
+    # via build
+pip-tools==7.4.1
     # via -r requirements/pip_tools.in
+pyproject-hooks==1.2.0
+    # via
+    #   build
+    #   pip-tools
+wheel==0.45.1
+    # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
+# setuptools

requirements/test.txt

@@ -1,10 +1,10 @@
 #
-# This file is autogenerated by pip-compile
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    make upgrade
 #
-aniso8601==9.0.1
+aniso8601==10.0.0
     # via -r requirements/base.txt
-pytz==2020.5
+pytz==2024.2
     # via -r requirements/base.txt

setup.py

@@ -57,7 +57,7 @@ def get_version(*file_paths):
     author_email='[email protected]',
     classifiers=[
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
     ],
     maintainer_email='mailto:[email protected]',

tincan/__init__.py

@@ -56,4 +56,4 @@
 from .verb import Verb
 from .version import Version
 
-__version__ = '1.1.0'
+__version__ = '2.0.0'