From 89200c3eaf734cf9bf60b7a61aaa4603faceeb53 Mon Sep 17 00:00:00 2001
From: Simon Billinge <simon.billinge@gmail.com>
Date: Sun, 28 Jul 2024 11:28:49 -0400
Subject: [PATCH 1/2] getting tests to run, but there are none

---
 .github/workflows/main.yml |  4 ++--
 diffpy/srmise/version.py   | 14 ++------------
 setup.py                   |  6 +++---
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e139797..1063b03 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,8 +42,8 @@ jobs:
           conda config --set always_yes yes --set changeps1 no
           conda config --add channels conda-forge
           conda activate test
-          conda install --file requirements/run.txt
-          conda install --file requirements/test.txt
+          conda install matplotlib-base numpy scipy
+          conda install pytest
           pip install .
 
       - name: Validate diffpy.srmise
diff --git a/diffpy/srmise/version.py b/diffpy/srmise/version.py
index d0c6e1d..e012d66 100644
--- a/diffpy/srmise/version.py
+++ b/diffpy/srmise/version.py
@@ -13,18 +13,8 @@
 
 """Definition of __version__, __date__, __gitsha__.
 """
+from importlib.metadata import version
 
-from ConfigParser import SafeConfigParser
-from pkg_resources import resource_stream
-
-# obtain version information from the version.cfg file
-cp = SafeConfigParser()
-cp.readfp(resource_stream(__name__, "version.cfg"))
-
-__version__ = cp.get("DEFAULT", "version")
-__date__ = cp.get("DEFAULT", "date")
-__gitsha__ = cp.get("DEFAULT", "commit")
-
-del cp
+__version__ = version("diffpy.srmise")
 
 # End of file
diff --git a/setup.py b/setup.py
index e0e9b14..40ad81b 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def gitinfo():
 
 
 def getversioncfg():
-    from ConfigParser import SafeConfigParser
+#    from ConfigParser import SafeConfigParser
 
     cp = SafeConfigParser()
     cp.read(versioncfgfile)
@@ -53,12 +53,12 @@ def getversioncfg():
     return cp
 
 
-versiondata = getversioncfg()
+# versiondata = getversioncfg()
 
 # define distribution, but make this module importable
 setup_args = dict(
     name="diffpy.srmise",
-    version=versiondata.get("DEFAULT", "version"),
+    version="0.0.0",
     namespace_packages=["diffpy"],
     packages=find_packages(),
     include_package_data=True,

From abe9270b5d0c90625f91e928747286ca2a672bb7 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 28 Jul 2024 15:29:48 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit hooks

---
 devutils/prep.py                     | 2 --
 diffpy.srmise/requirements/build.txt | 2 +-
 setup.py                             | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/devutils/prep.py b/devutils/prep.py
index c63ce0f..b765f7d 100644
--- a/devutils/prep.py
+++ b/devutils/prep.py
@@ -111,5 +111,3 @@ def rm(directory, filerestr):
         print "==== Scrubbing Endlines ===="
         # All *.srmise and *.pwa files in examples directory.
         scrubeol("../doc/examples/output", r".*(\.srmise|\.pwa)")
-
-
diff --git a/diffpy.srmise/requirements/build.txt b/diffpy.srmise/requirements/build.txt
index f4c99c0..13317f4 100644
--- a/diffpy.srmise/requirements/build.txt
+++ b/diffpy.srmise/requirements/build.txt
@@ -2,4 +2,4 @@ python
 setuptools
 matplotlib
 numpy
-scipy
\ No newline at end of file
+scipy
diff --git a/setup.py b/setup.py
index 40ad81b..daae8c3 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def gitinfo():
 
 
 def getversioncfg():
-#    from ConfigParser import SafeConfigParser
+    #    from ConfigParser import SafeConfigParser
 
     cp = SafeConfigParser()
     cp.read(versioncfgfile)