PKG #267 apply PyPA changes, similar to gemviz

.coveragerc

@@ -3,6 +3,6 @@ source=hkl
 
 [report]
 omit=
-    # ignore _version.py and versioneer.py
+    # ignore _version.py
     .*version.*
     *_version.py

.flake8

@@ -4,7 +4,6 @@ exclude =
     __pycache__,
     build,
     dist,
-    versioneer.py,
     docs/source,
     hkl/_version.py,
     dev_*

.github/workflows/upload_pypi.yml

@@ -9,11 +9,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@master
-    - name: Set up Python
-      uses: actions/setup-python@v1
-      # with:
-      #   python-version: 3.9
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
 
+    - name: Install OS packages
+      run: >-
+        sudo apt update
+        && sudo apt install -y libgirepository1.0-dev
+    
     - name: Install pypa/build
       run: >-
         python -m
@@ -40,16 +44,6 @@ jobs:
       run: >-
         twine check dist/*
 
-    # NOTE: "Secrets" page, not "Environments"
-    # NOTE: testpypi upload with versioneer only works on new tags.
-    # - name: Publish distribution 📦 to Test PyPI
-    #   uses: pypa/gh-action-pypi-publish@master
-    #   with:
-    #     user: __token__
-    #     password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-    #     repository_url: https://test.pypi.org/legacy/
-    #     verbose: true
-
     # TODO: restrict to tags on main branch only?
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.ref, 'refs/tags')

MANIFEST.in

@@ -7,7 +7,6 @@ include hkl/_version.py
 include pyproject.toml
 include pytest.ini
 include requirements.txt
-include versioneer.py
 
 recursive-include docs *.rst conf.py Makefile make.bat
 recursive-include Makefile README.md *.ipynb resources/*

RELEASE_NOTES.rst

@@ -16,6 +16,11 @@ v1.1 (expected 2024)
 
 User-requested changes
 
+Maintenance
+-----------
+
+* Update packaging to latest PyPA recommendations.
+
 v1.0.4 (released 2023-10-06)
 ======================================
 

hkl/__init__.py

@@ -12,10 +12,16 @@
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
-from ._version import get_versions  # noqa: F402, E402
+try:
+    from setuptools_scm import get_version
 
-__version__ = get_versions()["version"]
-del get_versions
+    __version__ = get_version(root="..", relative_to=__file__)
+    del get_version
+except (LookupError, ModuleNotFoundError):
+    from importlib.metadata import version
+
+    __version__ = version("pkgdemo")
+    del version
 
 # gobject-introspection, to access libhkl
 import gi