Merge pull request #38 from cylammarco/dev

Housekeeping

Author: cylammarco

.github/workflows/python-package.yml

@@ -49,6 +49,7 @@ jobs:
         flag-name: Unit Test
 
   upload_pypi:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     environment: pypi
     permissions:

.pre-commit-config.yaml

@@ -1,9 +1,9 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 25.1.0
     hooks:
     - id: black
-      language_version: python3.10
+      language_version: python3.11
       args: # arguments to configure black
         - --line-length=120
 

src/WDPhotTools/__init__.py

@@ -3,11 +3,11 @@
 
 """Initialise the import"""
 
-from pkg_resources import get_distribution, DistributionNotFound
+from importlib.metadata import version, PackageNotFoundError
 
 try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
+    __version__ = version(__name__)
+except PackageNotFoundError:
     pass  # package is not installed
 
 
@@ -34,3 +34,4 @@
 ]
 __credits__ = ["K W Yuen", "M Green", "W Li"]
 __status__ = "Production"
+

src/WDPhotTools/util.py

@@ -3,11 +3,10 @@
 
 """Some utility class/functions"""
 
-import glob
-import pkg_resources
-
 import numpy as np
 
+from importlib.resources import files
+
 
 def get_uncertainty_least_squares(res):
     """
@@ -42,7 +41,8 @@ def load_ms_lifetime_datatable(filename):
     """
 
     datatable = np.loadtxt(
-        glob.glob(pkg_resources.resource_filename("WDPhotTools", f"ms_lifetime/{filename}"))[0],
-        delimiter=",",
+        str(files("WDPhotTools").joinpath("ms_lifetime", filename)),
+        delimiter=","
     )
     return datatable
+