From 82ffe8a13f41f9a27fcfa2acae0b34ec9b7e6ab7 Mon Sep 17 00:00:00 2001 From: Aki Ariga Date: Fri, 19 Apr 2024 23:26:45 -0700 Subject: [PATCH 1/2] Support Python 3.12 --- .github/workflows/pythonapp.yml | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index fd8fec2..2064ff7 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -6,7 +6,7 @@ jobs: build: strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: diff --git a/pyproject.toml b/pyproject.toml index ec91513..bc08916 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] requires-python = ">=3.8" dependencies = [ From 354c4a44ff08603654b8723c5afdb23b6a690e64 Mon Sep 17 00:00:00 2001 From: Aki Ariga Date: Fri, 19 Apr 2024 23:34:55 -0700 Subject: [PATCH 2/2] Use importlib instead --- pyproject.toml | 2 +- tdworkflow/__init__.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index bc08916..831f430 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"] +requires = ["setuptools>=64", "setuptools_scm>=8"] build-backend = "setuptools.build_meta" [project] diff --git a/tdworkflow/__init__.py b/tdworkflow/__init__.py index 8f7a5cf..691abca 100644 --- a/tdworkflow/__init__.py +++ b/tdworkflow/__init__.py @@ -1,6 +1,5 @@ import logging - -import pkg_resources +from importlib.metadata import PackageNotFoundError, version from . import ( attempt, @@ -15,8 +14,8 @@ ) try: - __version__ = pkg_resources.get_distribution(__name__).version -except pkg_resources.DistributionNotFound: + __version__ = version("tdworkflow") +except PackageNotFoundError: # package is not installed pass