Merge pull request #292 from jacebrowning/use-importlib

Use importlib for package metadata
jacebrowning · Nov 9, 2022 · c029ca3 · c029ca3
2 parents 65c70db + be05149
commit c029ca3
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.3.1 (2022-11-09)
+
+- Replaced deprecated `pkg_resources` with `importlib` for package metadata.
+
 # 3.3 (2022-08-20)
 
 - **BREAKING**: Dropped support for Python 3.7.

diff --git a/gitman/__init__.py b/gitman/__init__.py
@@ -1,12 +1,14 @@
-"""Package for Gitman."""
-
-from pkg_resources import DistributionNotFound, get_distribution
+from importlib.metadata import PackageNotFoundError, version
 
 from .commands import delete as uninstall
 from .commands import display as list
 from .commands import init, install, lock, update
 
 try:
-    __version__ = get_distribution("gitman").version
-except DistributionNotFound:
-    __version__ = "???"
+    __version__ = version("gitman")
+except PackageNotFoundError:
+    __version__ = "(local)"
+
+
+del PackageNotFoundError
+del version
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "gitman"
-version = "3.3"
+version = "3.3.1"
 description = "A language-agnostic dependency manager using Git."
 
 license = "MIT"
@@ -45,7 +45,7 @@ python = "^3.8"
 
 datafiles = "^2.0"
 minilog = "^2.1"
-universal-startfile = "*"
+universal-startfile = "~0.2"
 
 [tool.poetry.dev-dependencies]
 
@@ -63,13 +63,13 @@ types-setuptools = "*"
 # Testing
 pytest = "^6"
 pytest-cov = "*"
-pytest-describe = "^1.0"
-pytest-expecter = "^2.1"
+pytest-describe = "^2.0"
+pytest-expecter = "^3.0"
 pytest-random = "*"
 freezegun = "*"
 
 # Reports
-coveragespace = "^5.0"
+coveragespace = "^6.0"
 
 # Documentation
 mkdocs = "^1.2.3"