Skip to content
This repository was archived by the owner on Dec 3, 2025. It is now read-only.

Commit a3250f3

Browse files
authored
Merge pull request #30 from irtazaakram/depr-pkg_resources
Replace pkg_resources with importlib.resources
2 parents bdf4501 + 3ca904e commit a3250f3

File tree

13 files changed

+53
-36
lines changed

13 files changed

+53
-36
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
matrix:
1717
os:
1818
- ubuntu-latest
19-
python-version: ['3.8', '3.11']
19+
python-version: ['3.11', '3.12']
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222
- name: setup python
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626

.github/workflows/pypi-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111

1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v4
1515
- name: setup python
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v5
1717
with:
18-
python-version: 3.8
18+
python-version: 3.12
1919

2020
- name: Install pip
2121
run: pip install -r requirements/pip.txt

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ For more information about the Tin Can API visit:
1010

1111
<http://tincanapi.com/>
1212

13-
Requires Python 3.8 or later.
13+
Requires Python 3.11 or later.
1414

1515
## Installation
16-
TinCanPython requires [Python 3.8](https://www.python.org/downloads/) or later.
16+
TinCanPython requires [Python 3.11](https://www.python.org/downloads/) or later.
1717

1818
If you are installing from the Github repo, you will need to install `aniso8601` and `pytz` (use `sudo` as necessary):
1919

docs/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import sys
1515
import os
16-
import pkg_resources
16+
from importlib.metadata import version as get_version
1717

1818
# If extensions (or modules to document with autodoc) are in another directory,
1919
# add these directories to sys.path here. If the directory is relative to the
@@ -64,9 +64,9 @@ def setup(app):
6464
# built documents.
6565
#
6666
# The short X.Y version.
67-
version = pkg_resources.require("tincan")[0].version
67+
version = get_version("tincan")
6868
# The full version, including alpha/beta/rc tags.
69-
release = pkg_resources.require("tincan")[0].version
69+
release = get_version("tincan")
7070

7171
# The language for content autogenerated by Sphinx. Refer to documentation
7272
# for a list of supported languages.

requirements/base.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
2-
# This file is autogenerated by pip-compile
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
44
#
55
# make upgrade
66
#
7-
aniso8601==9.0.1
7+
aniso8601==10.0.0
88
# via -r requirements/base.in
9-
pytz==2020.5
9+
pytz==2024.2
1010
# via -r requirements/base.in

requirements/ci.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
2-
# This file is autogenerated by pip-compile
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
44
#
55
# make upgrade
66
#
7-
aniso8601==9.0.1
7+
aniso8601==10.0.0
88
# via -r requirements/test.txt
9-
pytz==2020.5
9+
pytz==2024.2
1010
# via -r requirements/test.txt

requirements/constraints.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
# link to other information that will help people in the future to remove the
88
# pin when possible. Writing an issue against the offending project and
99
# linking to it here is good.
10+
11+
# Common constraints for edx repos
12+
-c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt

requirements/pip.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-c constraints.txt
12
# Core dependencies for installing other packages
23

34
pip

requirements/pip.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.8
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in
5+
# make upgrade
66
#
7-
wheel==0.42.0
7+
wheel==0.45.1
88
# via -r requirements/pip.in
99

1010
# The following packages are considered to be unsafe in a requirements file:
11-
pip==24.0
11+
pip==24.2
12+
# via
13+
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
14+
# -r requirements/pip.in
15+
setuptools==75.8.0
1216
# via -r requirements/pip.in
13-
setuptools==69.1.1
14-
# via -r requirements/pip.in

requirements/pip_tools.txt

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
#
2-
# This file is autogenerated by pip-compile
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
44
#
55
# make upgrade
66
#
7-
click==8.1.7
7+
build==1.2.2.post1
88
# via pip-tools
9-
pip-tools==7.4.0
9+
click==8.1.8
10+
# via pip-tools
11+
packaging==24.2
12+
# via build
13+
pip-tools==7.4.1
1014
# via -r requirements/pip_tools.in
15+
pyproject-hooks==1.2.0
16+
# via
17+
# build
18+
# pip-tools
19+
wheel==0.45.1
20+
# via pip-tools
1121

1222
# The following packages are considered to be unsafe in a requirements file:
1323
# pip
24+
# setuptools

0 commit comments

Comments
 (0)