File tree 5 files changed +8
-20
lines changed
diffpy.srmise/requirements
5 files changed +8
-20
lines changed Original file line number Diff line number Diff line change 42
42
conda config --set always_yes yes --set changeps1 no
43
43
conda config --add channels conda-forge
44
44
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
47
47
pip install .
48
48
49
49
- name : Validate diffpy.srmise
Original file line number Diff line number Diff line change @@ -111,5 +111,3 @@ def rm(directory, filerestr):
111
111
print "==== Scrubbing Endlines ===="
112
112
# All *.srmise and *.pwa files in examples directory.
113
113
scrubeol ("../doc/examples/output" , r".*(\.srmise|\.pwa)" )
114
-
115
-
Original file line number Diff line number Diff line change 2
2
setuptools
3
3
matplotlib
4
4
numpy
5
- scipy
5
+ scipy
Original file line number Diff line number Diff line change 13
13
14
14
"""Definition of __version__, __date__, __gitsha__.
15
15
"""
16
+ from importlib .metadata import version
16
17
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" )
29
19
30
20
# End of file
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ def gitinfo():
32
32
33
33
34
34
def getversioncfg ():
35
- from ConfigParser import SafeConfigParser
35
+ # from ConfigParser import SafeConfigParser
36
36
37
37
cp = SafeConfigParser ()
38
38
cp .read (versioncfgfile )
@@ -53,12 +53,12 @@ def getversioncfg():
53
53
return cp
54
54
55
55
56
- versiondata = getversioncfg ()
56
+ # versiondata = getversioncfg()
57
57
58
58
# define distribution, but make this module importable
59
59
setup_args = dict (
60
60
name = "diffpy.srmise" ,
61
- version = versiondata . get ( "DEFAULT" , "version" ) ,
61
+ version = "0.0.0" ,
62
62
namespace_packages = ["diffpy" ],
63
63
packages = find_packages (),
64
64
include_package_data = True ,
You can’t perform that action at this time.
0 commit comments