Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
if: ${{ !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') }}
strategy:
matrix:
python-version: [ "3.9", "3.10", "3.12" ]
python-version: [ "3.9", "3.10", "3.13" ]
os: [ ubuntu-20.04, windows-latest, macos-latest ] # on 2024-04-24, serious problems on ubuntu-latest (MPI installation)
# Exceptions:
# - Python 3.8 and 3.9 is on macos-13 but not macos-latest (macos-14-arm64)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/watchman_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [ "3.12" ]
python-version: [ "3.13" ]
os: [ ubuntu-latest, windows-latest, macos-latest ]

steps:
Expand Down
274 changes: 134 additions & 140 deletions docs/requirements.txt

Large diffs are not rendered by default.

1,087 changes: 661 additions & 426 deletions poetry.lock

Large diffs are not rendered by default.

18 changes: 13 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering :: Physics"
]

Expand All @@ -45,14 +46,21 @@ classifiers = [
# of poetry.lock file will modify docs/requirements.txt and make
# the commit fail because "files were modified by this hook". In that case,
# doing again the commit including changes in docs/requirements.txt will succeed.
python = ">=3.9, <3.13"
python = "^3.9"

numpy = ">=1.23.2, <3"
scipy = "^1.11.2"
numpy = [
{ version = ">=1.23.2, <3", python = "<3.13" },
{ version = "^2.1", python = "^3.13" }
]
scipy = [
{ version = "^1.11.2", python = "<3.13" },
{ version = "^1.14.1", python = "^3.13" }
]
pandas = [
{ version = ">=1.3.4, <3", python = "<3.11" },
{ version = ">=1.5.3, <3", python = "~3.11" },
{ version = "^2.1.1", python = "^3.12" },
{ version = "^2.1.1", python = "~3.12" },
{ version = "^2.2.3", python = "^3.13" },
]
openmdao = "^3.27"
ipopo = [
Expand Down Expand Up @@ -108,7 +116,7 @@ mpi4py = ["mpi4py"] # Old way, kept for backward compatibility
[tool.poetry.group.dev.dependencies]
fast-oad-cs25 = ">=0.7.1"

matplotlib = "^3.9.0"
matplotlib = "^3.9.2"

[tool.poetry.group.test.dependencies]
pytest = "^8.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,3 +231,23 @@ def get_input_definition(self) -> Optional[Variable]:

def __str__(self):
return str(self.value)

def __eq__(self, other: "InputDefinition") -> bool:
return np.all(
[
self.parameter_name == other.parameter_name,
self.input_value == other.input_value,
self.input_unit == other.input_unit,
# default_value can be NaN, and this is why we need our own implementation
# of __eq__
np.array_equal(self.default_value, other.default_value, equal_nan=True),
self.is_relative == other.is_relative,
self.part_identifier == other.part_identifier,
self.output_unit == other.output_unit,
self.shape == other.shape,
self.shape_by_conn == other.shape_by_conn,
self.prefix == other.prefix,
self._variable_name == other._variable_name,
self._use_opposite == other._use_opposite,
]
)
2 changes: 1 addition & 1 deletion tests/integration_tests/oad_process/test_oad_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def test_api_optim(cleanup):
_check_weight_performance_loop(problem)

# Design Variable
assert_allclose(problem["data:geometry:wing:aspect_ratio"], 14.56, atol=2e-2)
assert_allclose(problem["data:geometry:wing:aspect_ratio"], 14.56, atol=5e-2)

# Constraint
assert_allclose(problem["data:geometry:wing:span"], 44.9, atol=1e-1)
Expand Down