Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

getting tests to run, but there are none #14

Merged
merged 2 commits into from
Jul 28, 2024
Merged

getting tests to run, but there are none #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89200c3
getting tests to run, but there are none
sbillinge Jul 28, 2024
abe9270
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading