From b2d86bfb24695bfe56f9dfb39bc5783b9cf0745e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 07:59:53 +0200 Subject: [PATCH 1/5] [pre-commit.ci] pre-commit autoupdate (#363) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v3.15.2 → v3.16.0](https://github.com/asottile/pyupgrade/compare/v3.15.2...v3.16.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 78fe5d220..5c1218087 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: hooks: - id: black-jupyter - repo: https://github.com/asottile/pyupgrade - rev: v3.15.2 + rev: v3.16.0 hooks: - id: pyupgrade args: [--py310-plus] From 719c5e00ae60dad52af66398845f96b1154f4938 Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Mon, 29 Jul 2024 03:54:06 +0100 Subject: [PATCH 2/5] Update .readthedocs.yaml: Use latest Ubuntu and Python versions (#365) Use latest Ubuntu and Python versions for Readthedocs. These are faster and throw more detailed errors if anything goes wrong. --- .readthedocs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index c075d3e99..0e1c32781 100644 --- 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: From 903483682d1dea15829af2e9d1af405f7538ec6b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:18:47 +0100 Subject: [PATCH 3/5] [pre-commit.ci] pre-commit autoupdate (#367) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v3.16.0 → v3.17.0](https://github.com/asottile/pyupgrade/compare/v3.16.0...v3.17.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5c1218087..a09c9a253 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: hooks: - id: black-jupyter - repo: https://github.com/asottile/pyupgrade - rev: v3.16.0 + rev: v3.17.0 hooks: - id: pyupgrade args: [--py310-plus] From 561fda7a8bbb48126430f73a6f97eb1c21de2cef Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 08:44:06 +0200 Subject: [PATCH 4/5] [pre-commit.ci] pre-commit autoupdate (#368) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 24.4.2 → 24.8.0](https://github.com/psf/black/compare/24.4.2...24.8.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a09c9a253..132516cae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ 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 From 59cad4731b187496be4aa8542ac245dc466cc303 Mon Sep 17 00:00:00 2001 From: David Hadka Date: Mon, 9 Sep 2024 14:01:49 -0600 Subject: [PATCH 5/5] Use PlatypusConfig.default_variator (#369) Version `1.3.0` moved `default_variator` from a standalone method to part of `PlatypusConfig`. Thus, this updates the method reference and puts a minimum version on the dependency. --- ema_workbench/em_framework/outputspace_exploration.py | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ema_workbench/em_framework/outputspace_exploration.py b/ema_workbench/em_framework/outputspace_exploration.py index a27b5cc77..d2230c554 100644 --- 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 index baa4c0350..98c2231b2 100644 --- 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",