Skip to content

Commit a0a7ead

Browse files
committed
Address testDeriv issue
1 parent f41fd97 commit a0a7ead

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

GSASII/git_verinfo.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# -*- coding: utf-8 -*-
22
# git_verinfo.py - GSAS-II version info from git
33
# Do not edit, generated by '../GSASII/install/incr-mini-version.py' script
4-
# Created 2025-04-25 11:38:51.520928-05:00
4+
# Created 2025-04-25 12:08:55.967171-05:00
55

6-
git_version = '81f8d0dc594a128dd4998b116adae76657190a6c'
6+
git_version = 'f41fd979e3bd50c706a44b281b52a5ed3dcb0013'
77
git_tags = []
88
git_prevtaggedversion = 'dfc4cc57bfa3a65d8b086eac2dfcc470d4c95187'
99
git_prevtags = ['5806']
10-
git_versiontag = 'v5.3.2'
10+
git_versiontag = 'v5.3.3'

GSASII/testDeriv.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,18 @@
2222
import cProfile,pstats
2323
import wx
2424
import numpy as np
25-
from . import GSASIIpath
25+
# path hack for restart, when needed
26+
import importlib.util
27+
try:
28+
importlib.util.find_spec('GSASII.GSASIIGUI')
29+
except ModuleNotFoundError:
30+
print('GSAS-II not installed in Python; Hacking sys.path')
31+
sys.path.insert(0,os.path.dirname(os.path.dirname(__file__)))
32+
from GSASII import GSASIIpath
2633
GSASIIpath.SetBinaryPath()
27-
from . import GSASIIstrMath as G2stMth
28-
from . import GSASIItestplot as plot
29-
from . import GSASIImapvars as G2mv
34+
from GSASII import GSASIIstrMath as G2stMth
35+
from GSASII import GSASIItestplot as plot
36+
from GSASII import GSASIImapvars as G2mv
3037
try: # fails on doc build
3138
from . import pytexture as ptx
3239
ptx.pyqlmninit() #initialize fortran arrays for spherical harmonics

0 commit comments

Comments
 (0)