diff options
author | Bert JW Regeer <bertjw@regeer.org> | 2023-01-22 21:10:18 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-22 21:10:18 -0700 |
commit | 1b364016772a1a0a3e48a9847a035876bce1e75f (patch) | |
tree | 2614ea6b847dd6d1b8099da06582c37a1ccde8c2 | |
parent | 56e44fec0931ea6726a28fab96607f829854a219 (diff) | |
parent | 95a780cbdeebe31b197ce9cfba86a613c70d9b9f (diff) | |
download | waitress-1b364016772a1a0a3e48a9847a035876bce1e75f.tar.gz |
Merge pull request #398 from Pylons/replace-pkg_resources-importlib-metadata
Replace pkg_resources use with importlib.metadata
-rw-r--r-- | docs/conf.py | 8 | ||||
-rw-r--r-- | setup.cfg | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py index 392bde9..bb1b1f5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,11 @@ # sys.path.append(os.path.abspath('some/directory')) import datetime -import pkg_resources + +try: + from importlib.metadata import version as metadata_version +except ImportError: + from importlib_metadata import version as metadata_version import pylons_sphinx_themes # General configuration @@ -53,7 +57,7 @@ copyright = "2012-%s, Agendaless Consulting <chrism@plope.com>" % thisyear # other places throughout the built documents. # # The short X.Y version. -version = pkg_resources.get_distribution("waitress").version +version = metadata_version("waitress") # The full version, including alpha/beta/rc tags. release = version @@ -58,6 +58,7 @@ docs = Sphinx>=1.8.1 docutils pylons-sphinx-themes>=1.0.9 + importlib-metadata; python_version < "3.8" [tool:pytest] python_files = test_*.py |