Merge branch 'master' into 2.3-release

quaquel · Oct 28, 2022 · ee1d53a · ee1d53a
2 parents 2d51c7d + 6deab9c
commit ee1d53a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,6 +20,8 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: ["3.10"]
         include:
+          - os: ubuntu-latest
+            python-version: "3.11"
           - os: ubuntu-latest
             python-version: "3.9"
           - os: ubuntu-latest

diff --git a/ema_workbench/em_framework/salib_samplers.py b/ema_workbench/em_framework/salib_samplers.py
@@ -11,12 +11,12 @@
 from .samplers import DefaultDesigns
 
 try:
-    from SALib.sample import saltelli
+    from SALib.sample import sobol
     from SALib.sample import morris
     from SALib.sample import fast_sampler
 except ImportError:
     warnings.warn("SALib samplers not available", ImportWarning)
-    saltelli = morris = fast_sampler = None
+    sobol = morris = fast_sampler = None
 
 # Created on 12 Jan 2017
 #
@@ -134,7 +134,7 @@ def __init__(self, second_order=True):
         super().__init__()
 
     def sample(self, problem, size):
-        return saltelli.sample(problem, size, calc_second_order=self.second_order)
+        return sobol.sample(problem, size, calc_second_order=self.second_order)
 
 
 class MorrisSampler(SALibSampler):

diff --git a/pyproject.toml b/pyproject.toml
@@ -20,10 +20,11 @@ dependencies = [
     "numpy",
     "pandas",
     "scikit-learn",
-    "salib",
+    "salib>=1.4.6",
     "platypus-opt",
     "matplotlib",
-    "statsmodels",
+    "statsmodels; python_version < '3.11'",
+    "statsmodels @ git+https://github.com/statsmodels/statsmodels.git ; python_version >= '3.11'",
     "seaborn",
     "tqdm",
 ]