From 8744f0a4fb10307f239a87edc8476080631ab1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Lafage?= Date: Thu, 26 Oct 2023 12:03:21 +0200 Subject: [PATCH] Update pyDOE2 dependency to pyDOE3 (#471) --- README.md | 2 +- doc/requirements.txt | 2 +- requirements.txt | 2 +- setup.py | 2 +- smt/examples/multi_modal/run_genn_demo.py | 2 +- smt/sampling_methods/lhs.py | 4 ++-- smt/utils/kriging.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 745f06580..0bedf348f 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ To cite SMT legacy: M. A. Bouhlel and J. T. Hwang and N. Bartoli and R. Lafage a ``` # Required packages -SMT depends on the following modules: numpy, scipy, scikit-learn, pyDOE2 and Cython. +SMT depends on the following modules: numpy, scipy, scikit-learn, pyDOE3 and Cython. # Installation If you want to install the latest release diff --git a/doc/requirements.txt b/doc/requirements.txt index 91de9d982..0bf29edaa 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,7 +2,7 @@ Cython numpy scipy scikit-learn -pyDOE2 +pyDOE3 numpydoc matplotlib git+https://github.com/hwangjt/sphinx_auto_embed.git # for doc generation \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index d79da2ff6..cfd7b9813 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ Cython numpy scipy scikit-learn -pyDOE2 +pyDOE3 numba # JIT compiler matplotlib # used in examples and tests pytest # tests runner diff --git a/setup.py b/setup.py index 90f6a6828..af45e8812 100644 --- a/setup.py +++ b/setup.py @@ -105,7 +105,7 @@ ], install_requires=[ "scikit-learn", - "pyDOE2", + "pyDOE3", "scipy", ], extras_require={ diff --git a/smt/examples/multi_modal/run_genn_demo.py b/smt/examples/multi_modal/run_genn_demo.py index b915f09f7..9b9edf786 100644 --- a/smt/examples/multi_modal/run_genn_demo.py +++ b/smt/examples/multi_modal/run_genn_demo.py @@ -14,7 +14,7 @@ import numpy as np import matplotlib.pyplot as plt import matplotlib.gridspec as gridspec -from pyDOE2 import fullfact +from pyDOE3 import fullfact SEED = 101 diff --git a/smt/sampling_methods/lhs.py b/smt/sampling_methods/lhs.py index 7a3001ef8..b3262eec0 100644 --- a/smt/sampling_methods/lhs.py +++ b/smt/sampling_methods/lhs.py @@ -3,9 +3,9 @@ This package is distributed under New BSD license. -LHS sampling; uses the pyDOE2 package. +LHS sampling; uses the pyDOE3 package. """ -from pyDOE2 import lhs +from pyDOE3 import lhs from scipy.spatial.distance import pdist, cdist import numpy as np diff --git a/smt/utils/kriging.py b/smt/utils/kriging.py index 3a7137a12..a0560c62f 100644 --- a/smt/utils/kriging.py +++ b/smt/utils/kriging.py @@ -10,7 +10,7 @@ import os from sklearn.cross_decomposition import PLSRegression as pls -from pyDOE2 import bbdesign +from pyDOE3 import bbdesign from sklearn.metrics.pairwise import check_pairwise_arrays from smt.utils.design_space import BaseDesignSpace, CategoricalVariable