From 6068fa69842e23e158c7519350a8f5281e347ec9 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Tue, 7 Jan 2025 14:27:20 +0500 Subject: [PATCH 1/5] fix: replace pkg_resources --- docs/source/conf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 82b8fc0..b33a4bd 100644 --- a/docs/source/conf.py +++ b/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. From 4c0dc91a33e6ca32cc6ead56d76af44272688131 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Tue, 7 Jan 2025 14:41:45 +0500 Subject: [PATCH 2/5] fix: drop python 3.8 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/pypi-publish.yml | 6 +++--- README.md | 4 ++-- requirements/base.txt | 6 +++--- requirements/ci.txt | 6 +++--- requirements/constraints.txt | 3 +++ requirements/pip.in | 1 + requirements/pip.txt | 16 +++++++++------- requirements/pip_tools.txt | 19 +++++++++++++++---- requirements/test.txt | 6 +++--- setup.py | 1 - tincan/__init__.py | 2 +- 12 files changed, 46 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31187a3..1da2d2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,11 +16,11 @@ jobs: matrix: os: - ubuntu-20.04 - python-version: ['3.8', '3.11'] + python-version: ['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 }} diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 4be0ef9..7792bb5 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.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 diff --git a/README.md b/README.md index 714fbaa..db101b4 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,10 @@ For more information about the Tin Can API visit: -Requires Python 3.8 or later. +Requires Python 3.12 or later. ## Installation -TinCanPython requires [Python 3.8](https://www.python.org/downloads/) or later. +TinCanPython requires [Python 3.12](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): diff --git a/requirements/base.txt b/requirements/base.txt index 3cc5a37..3638107 100644 --- a/requirements/base.txt +++ b/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.12 +# by the following command: # # make upgrade # aniso8601==9.0.1 # via -r requirements/base.in -pytz==2020.5 +pytz==2024.2 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index 94d058c..2d4e306 100644 --- a/requirements/ci.txt +++ b/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.12 +# by the following command: # # make upgrade # aniso8601==9.0.1 # via -r requirements/test.txt -pytz==2020.5 +pytz==2024.2 # via -r requirements/test.txt diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 94595ab..8f8ed18 100644 --- a/requirements/constraints.txt +++ b/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 diff --git a/requirements/pip.in b/requirements/pip.in index 21ce8e9..b419ce6 100644 --- a/requirements/pip.in +++ b/requirements/pip.in @@ -1,3 +1,4 @@ +-c constraints.txt # Core dependencies for installing other packages pip diff --git a/requirements/pip.txt b/requirements/pip.txt index a773ac0..d2de822 100644 --- a/requirements/pip.txt +++ b/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.12 +# 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.7.0 # via -r requirements/pip.in -setuptools==69.1.1 - # via -r requirements/pip.in \ No newline at end of file diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 0a214b3..3971d0f 100644 --- a/requirements/pip_tools.txt +++ b/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.12 +# 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 diff --git a/requirements/test.txt b/requirements/test.txt index 87fe3a5..09981f7 100644 --- a/requirements/test.txt +++ b/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.12 +# by the following command: # # make upgrade # aniso8601==9.0.1 # via -r requirements/base.txt -pytz==2020.5 +pytz==2024.2 # via -r requirements/base.txt diff --git a/setup.py b/setup.py index 355d5a8..5bcf5e7 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,6 @@ def get_version(*file_paths): author_email='oscm@edx.org', classifiers=[ 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.12', ], maintainer_email='mailto:brian.miller@tincanapi.com', diff --git a/tincan/__init__.py b/tincan/__init__.py index ae1eca2..83778db 100644 --- a/tincan/__init__.py +++ b/tincan/__init__.py @@ -56,4 +56,4 @@ from .verb import Verb from .version import Version -__version__ = '1.1.0' +__version__ = '1.2.0' From 30e324f9034dd35378349b82a1654710c5f7ef87 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 13 Jan 2025 12:53:49 +0500 Subject: [PATCH 3/5] chore: bump version --- tincan/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tincan/__init__.py b/tincan/__init__.py index 83778db..00d9ca4 100644 --- a/tincan/__init__.py +++ b/tincan/__init__.py @@ -56,4 +56,4 @@ from .verb import Verb from .version import Version -__version__ = '1.2.0' +__version__ = '2.0.0' From f55c682651a3f67cea4911c0d5661b4f4aff7f5c Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Thu, 16 Jan 2025 11:38:24 +0500 Subject: [PATCH 4/5] fix: add python 3.11 to test matrix --- .github/workflows/ci.yml | 2 +- README.md | 4 ++-- setup.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25d02e1..2693fb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: matrix: os: - ubuntu-latest - python-version: ['3.12'] + python-version: ['3.11', '3.12'] steps: - uses: actions/checkout@v4 - name: setup python diff --git a/README.md b/README.md index db101b4..b5b0ac2 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,10 @@ For more information about the Tin Can API visit: -Requires Python 3.12 or later. +Requires Python 3.11 or later. ## Installation -TinCanPython requires [Python 3.12](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): diff --git a/setup.py b/setup.py index 5bcf5e7..b06eef4 100644 --- a/setup.py +++ b/setup.py @@ -57,6 +57,7 @@ def get_version(*file_paths): author_email='oscm@edx.org', classifiers=[ 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', ], maintainer_email='mailto:brian.miller@tincanapi.com', From 3ca904ea14d57ba2cf24f2bf058f873def722d8d Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 17 Jan 2025 14:19:06 -0500 Subject: [PATCH 5/5] build: Run `make upgrade` with Python 3.11 --- requirements/base.txt | 4 ++-- requirements/ci.txt | 4 ++-- requirements/pip.txt | 4 ++-- requirements/pip_tools.txt | 2 +- requirements/test.txt | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 3638107..50ac27d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# 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==2024.2 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index 2d4e306..cd2dce7 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# 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==2024.2 # via -r requirements/test.txt diff --git a/requirements/pip.txt b/requirements/pip.txt index d2de822..5d821ad 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -12,5 +12,5 @@ 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.7.0 +setuptools==75.8.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 3971d0f..63a2799 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/test.txt b/requirements/test.txt index 09981f7..3cc535d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# 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==2024.2 # via -r requirements/base.txt