diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index b18228205..2e1bf1a15 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - versions: [{python: "3.10", numpy: "1.22"}, {python: "3.11", numpy: "1.25"}, {python: "3.12", numpy: "2.1"}] + versions: [{python: "3.11", numpy: "1.25"}, {python: "3.12", numpy: "2.3"}] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index cdc90df91..4c219cebe 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -15,12 +15,12 @@ jobs: strategy: fail-fast: false matrix: - numpy_version: ["1.21.6", "1.25.2", "2.1.3"] + numpy_version: ["1.25.2", "2.3.5"] steps: - uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v3 with: - python-version: "3.10" + python-version: "3.11" channels: conda-forge,defaults channel-priority: strict activate-environment: pyos-build diff --git a/pyoptsparse/__init__.py b/pyoptsparse/__init__.py index 9025bc6b1..38f82deea 100644 --- a/pyoptsparse/__init__.py +++ b/pyoptsparse/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.15.0" +__version__ = "2.15.1" from .pyOpt_history import History from .pyOpt_variable import Variable diff --git a/pyoptsparse/pyOpt_constraint.py b/pyoptsparse/pyOpt_constraint.py index 7cb6bf3ec..55162cd73 100644 --- a/pyoptsparse/pyOpt_constraint.py +++ b/pyoptsparse/pyOpt_constraint.py @@ -240,7 +240,7 @@ def finalize(self, variables: OrderedDict, dvOffset, index: int): dvStart.append(dvOffset[dvGroup][0]) # This sort wrt using the keys in dvOffset - self.wrt = [x for (y, x) in sorted(zip(dvStart, self.wrt))] + self.wrt = [x for (y, x) in sorted(zip(dvStart, self.wrt, strict=False))] # Now we know which dvGroups this constraint will have a # derivative with respect to (i.e. what is in the wrt list) diff --git a/pyproject.toml b/pyproject.toml index 7405b2758..b3723001f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,12 +7,12 @@ name = "pyoptsparse" description = "Python package for formulating and solving nonlinear constrained optimization problems" readme = "README.md" license = {file = "LICENSE"} -requires-python = ">=3.9" +requires-python = ">=3.11" dependencies = [ "packaging", "sqlitedict>=1.6", - "numpy>=1.21", - "scipy>=1.7", + "numpy>=1.25", + "scipy>=1.11", "mdolab-baseclasses>=1.3.1" ] dynamic = ["version"] # version is dynamically populated from meson project