Skip to content

Commit 89200c3

Browse files
committed
getting tests to run, but there are none
1 parent 011fa4c commit 89200c3

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
conda config --set always_yes yes --set changeps1 no
4343
conda config --add channels conda-forge
4444
conda activate test
45-
conda install --file requirements/run.txt
46-
conda install --file requirements/test.txt
45+
conda install matplotlib-base numpy scipy
46+
conda install pytest
4747
pip install .
4848
4949
- name: Validate diffpy.srmise

diffpy/srmise/version.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,8 @@
1313

1414
"""Definition of __version__, __date__, __gitsha__.
1515
"""
16+
from importlib.metadata import version
1617

17-
from ConfigParser import SafeConfigParser
18-
from pkg_resources import resource_stream
19-
20-
# obtain version information from the version.cfg file
21-
cp = SafeConfigParser()
22-
cp.readfp(resource_stream(__name__, "version.cfg"))
23-
24-
__version__ = cp.get("DEFAULT", "version")
25-
__date__ = cp.get("DEFAULT", "date")
26-
__gitsha__ = cp.get("DEFAULT", "commit")
27-
28-
del cp
18+
__version__ = version("diffpy.srmise")
2919

3020
# End of file

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def gitinfo():
3232

3333

3434
def getversioncfg():
35-
from ConfigParser import SafeConfigParser
35+
# from ConfigParser import SafeConfigParser
3636

3737
cp = SafeConfigParser()
3838
cp.read(versioncfgfile)
@@ -53,12 +53,12 @@ def getversioncfg():
5353
return cp
5454

5555

56-
versiondata = getversioncfg()
56+
# versiondata = getversioncfg()
5757

5858
# define distribution, but make this module importable
5959
setup_args = dict(
6060
name="diffpy.srmise",
61-
version=versiondata.get("DEFAULT", "version"),
61+
version="0.0.0",
6262
namespace_packages=["diffpy"],
6363
packages=find_packages(),
6464
include_package_data=True,

0 commit comments

Comments
 (0)