Merge branch 'master' into valid_identifiers

quaquel · Sep 10, 2024 · b95f250 · b95f250
2 parents bfccdaf + 59cad47
commit b95f250
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,11 +4,11 @@ ci:
 
 repos:
 -   repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
       - id: black-jupyter
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.2
+    rev: v3.17.0
     hooks:
     -   id: pyupgrade
         args: [--py310-plus]

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -7,9 +7,9 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-22.04
+  os: ubuntu-lts-latest
   tools:
-    python: "3"
+    python: latest
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

diff --git a/ema_workbench/em_framework/outputspace_exploration.py b/ema_workbench/em_framework/outputspace_exploration.py
@@ -27,7 +27,6 @@
     RandomGenerator,
     Dominance,
     AbstractGeneticAlgorithm,
-    default_variator,
     AdaptiveTimeContinuation,
     GAOperator,
     SBX,
@@ -38,6 +37,7 @@
     PCX,
     UNDX,
     Multimethod,
+    PlatypusConfig,
 )
 
 
@@ -186,7 +186,7 @@ def initialize(self):
             self.archive += self.population
 
         if self.variator is None:
-            self.variator = default_variator(self.problem)
+            self.variator = PlatypusConfig.default_variator(self.problem)
 
     def iterate(self):
         offspring = []

diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ dependencies = [
     "pandas",
     "scikit-learn",
     "salib>=1.4.6",
-    "platypus-opt",
+    "platypus-opt>=1.3.0",
     "matplotlib",
     "statsmodels",
     "seaborn",