Skip to content

Commit 4802a6b

Browse files
getting tests to run, but there are none (#14)
* getting tests to run, but there are none * [pre-commit.ci] auto fixes from pre-commit hooks --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 011fa4c commit 4802a6b

File tree

5 files changed

+8
-20
lines changed

5 files changed

+8
-20
lines changed

Diff for: .github/workflows/main.yml

+2-2
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

Diff for: devutils/prep.py

-2
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,3 @@ def rm(directory, filerestr):
111111
print "==== Scrubbing Endlines ===="
112112
# All *.srmise and *.pwa files in examples directory.
113113
scrubeol("../doc/examples/output", r".*(\.srmise|\.pwa)")
114-
115-

Diff for: diffpy.srmise/requirements/build.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ python
22
setuptools
33
matplotlib
44
numpy
5-
scipy
5+
scipy

Diff for: diffpy/srmise/version.py

+2-12
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

Diff for: setup.py

+3-3
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)