Skip to content

Commit

Permalink
getting tests to run, but there are none (#14)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
sbillinge and pre-commit-ci[bot] authored Jul 28, 2024
1 parent 011fa4c commit 4802a6b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions devutils/prep.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)")


2 changes: 1 addition & 1 deletion diffpy.srmise/requirements/build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ python
setuptools
matplotlib
numpy
scipy
scipy
14 changes: 2 additions & 12 deletions diffpy/srmise/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def gitinfo():


def getversioncfg():
from ConfigParser import SafeConfigParser
# from ConfigParser import SafeConfigParser

cp = SafeConfigParser()
cp.read(versioncfgfile)
Expand All @@ -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,
Expand Down

0 comments on commit 4802a6b

Please sign in to comment.