Merge branch 'main' into loaddata_headers

Author: Sparks29032

.travis.yml

@@ -1,7 +1,7 @@
-.. image:: https://travis-ci.org/diffpy/diffpy.utils.svg?branch=master
-   :target: https://travis-ci.org/diffpy/diffpy.utils
+.. image:: https://github.com/diffpy/diffpy.utils/actions/workflows/main.yml/badge.svg
+   :target: https://github.com/diffpy/diffpy.utils/actions/workflows/main.yml
 
-.. image:: https://codecov.io/gh/diffpy/diffpy.utils/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/diffpy/diffpy.utils/branch/main/graph/badge.svg
   :target: https://codecov.io/gh/diffpy/diffpy.utils
 
 

README.rst

@@ -1,3 +1,3 @@
 [pytest]
 testpaths= src/diffpy/utils/tests
-python_files = test*.py
+python_files = test_*.py

pytest.ini

@@ -37,14 +37,15 @@ def testsuite(pattern=''):
     import re
     from os.path import dirname
     from itertools import chain
-    from pkg_resources import resource_filename
+    from importlib.resources import files, as_file
     loader = unittest.defaultTestLoader
-    thisdir = resource_filename(__name__, '')
-    depth = __name__.count('.') + 1
-    topdir = thisdir
-    for i in range(depth):
-        topdir = dirname(topdir)
-    suite_all = loader.discover(thisdir, top_level_dir=topdir)
+    ref = files(__package__)
+    with as_file(ref) as thisdir:
+        depth = __name__.count('.') + 1
+        topdir = thisdir
+        for i in range(depth):
+            topdir = dirname(topdir)
+        suite_all = loader.discover(str(thisdir), top_level_dir=topdir)
     # always filter the suite by pattern to test-cover the selection code.
     suite = unittest.TestSuite()
     rx = re.compile(pattern)

src/diffpy/utils/tests/__init__.py

@@ -19,8 +19,9 @@
 # helper functions
 
 def datafile(filename):
-    from pkg_resources import resource_filename
-    rv = resource_filename(__name__, "testdata/" + filename)
-    return rv
+    from importlib.resources import files, as_file
+    ref = files(__package__) / ("testdata/" + filename)
+    with as_file(ref) as rv:
+        return rv
 
 # End of file

src/diffpy/utils/tests/testhelpers.py

@@ -26,21 +26,24 @@
 
 import os.path
 
-from pkg_resources import resource_filename
+from importlib.resources import files, as_file
 
 
 # obtain version information from the version.cfg file
 cp = dict(version='', date='', commit='', timestamp='0')
-fcfg = resource_filename(__name__, 'version.cfg')
-if not os.path.isfile(fcfg):    # pragma: no cover
-    from warnings import warn
-    warn('Package metadata not found, execute "./setup.py egg_info".')
-    fcfg = os.devnull
-with open(fcfg) as fp:
-    kwords = [[w.strip() for w in line.split(' = ', 1)]
-              for line in fp if line[:1].isalpha() and ' = ' in line]
-assert all(w[0] in cp for w in kwords), "received unrecognized keyword"
-cp.update(kwords)
+if __package__ is not None:
+    ref = files(__package__) / 'version.cfg'
+    with as_file(ref) as fcfg:
+        if not os.path.isfile(fcfg):    # pragma: no cover
+            from warnings import warn
+            warn('Package metadata not found, execute "./setup.py egg_info".')
+            fcfg = os.devnull
+        with open(fcfg) as fp:
+            kwords = [[w.strip() for w in line.split(' = ', 1)]
+                      for line in fp if line[:1].isalpha() and ' = ' in line]
+        assert all(w[0] in cp for w in kwords), "received unrecognized keyword"
+        cp.update(kwords)
+    del kwords
 
 __version__ = cp['version']
 __date__ = cp['date']
@@ -50,6 +53,6 @@
 # TODO remove deprecated __gitsha__ in version 3.1.
 __gitsha__ = __git_commit__
 
-del cp, fcfg, fp, kwords
+del cp
 
 # End of file