Skip to content

Commit 539900b

Browse files
authored
Merge pull request #11 from dfm/master
More flexible george version checking
2 parents e04da9b + 93334d1 commit 539900b

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

everest/gp.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,17 @@
1616
from scipy.signal import savgol_filter
1717
import numpy as np
1818
np.random.seed(48151623)
19-
from distutils.version import StrictVersion
19+
from distutils.version import LooseVersion, StrictVersion
2020
import george
2121
from george.kernels import Matern32Kernel, ExpSine2Kernel
22-
if StrictVersion(george.__version__) <= StrictVersion("0.2.1"):
22+
try:
23+
george_version = StrictVersion(george.__version__)
24+
except ValueError:
25+
george_version = LooseVersion(george.__version__)
26+
comp_version = LooseVersion("0.3.0")
27+
else:
28+
comp_version = StrictVersion("0.3.0")
29+
if george_version < comp_version:
2330
from george.kernels import WhiteKernel
2431
OLDGEORGE = True
2532
else:

0 commit comments

Comments
 (0)