Skip to content

Commit adb29df

Browse files
committed
pixi: add code to update git_version & fix version handling, config_example import
1 parent 929d696 commit adb29df

File tree

4 files changed

+95
-10
lines changed

4 files changed

+95
-10
lines changed

GSASII/GSASIIGUI.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111

1212
from . import GSASIIpath
1313

14-
__version__ = '2.0.0'
14+
__version__ = '5.0.0'
1515
try:
1616
from . import git_verinfo
17-
__version__ = git_verinfo.git_tags[0]
18-
if not __version__: __version__ = git_verinfo.git_prevtags[0]
17+
if len(git_verinfo.git_tags):
18+
__version__ = git_verinfo.git_tags[0]
19+
elif len(git_verinfo.git_prevtags):
20+
__version__ = git_verinfo.git_prevtags[0]
1921
except ImportError:
2022
pass
2123

GSASII/GSASIIpath.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def GetBinaryPrefix(pyver=None):
143143
linux_64_p3.9_n1.21).
144144
145145
Note that any change made here is also needed in GetBinaryDir in
146-
fsource/SConstruct
146+
fsource/SConstruct or GSASII-buildtools/compile/nameTar.py
147147
'''
148148
if sys.platform == "win32":
149149
prefix = 'win'
@@ -1174,7 +1174,7 @@ def LoadConfig(printInfo=True):
11741174
print(f'N.B. Configuration file {cfgfile} does not exist')
11751175
return
11761176
try:
1177-
import config_example
1177+
from . import config_example
11781178
except ImportError as err:
11791179
print("Error importing config_example.py file\n",err)
11801180
return

0 commit comments

Comments
 (0)