diff --git a/.ci/build_wheel.py b/.ci/build_wheel.py index 79801ad4f4..c3d43099ee 100644 --- a/.ci/build_wheel.py +++ b/.ci/build_wheel.py @@ -2,7 +2,6 @@ # Input can be one of ["any", "win", "manylinux1", "manylinux_2_17"] import argparse -import pathlib import subprocess import os import sys @@ -14,18 +13,20 @@ "any": "any", "win": "win_amd64", "manylinux1": "manylinux1_x86_64", - "manylinux_2_17": "manylinux_2_17_x86_64" + "manylinux_2_17": "manylinux_2_17_x86_64", } argParser = argparse.ArgumentParser() argParser.add_argument("-p", "--platform", help="platform") -argParser.add_argument("-w", "--wheelhouse", help="platform", action='store_true') +argParser.add_argument("-w", "--wheelhouse", help="platform", action="store_true") args = argParser.parse_args() if args.platform not in supported_platforms: - raise ValueError(f"Platform {args.platform} is not supported. " - f"Supported platforms are: {list(supported_platforms.keys())}") + raise ValueError( + f"Platform {args.platform} is not supported. " + f"Supported platforms are: {list(supported_platforms.keys())}" + ) else: requested_platform = supported_platforms[args.platform] print(requested_platform) @@ -35,7 +36,7 @@ # win: move .so binaries out before building # lin: move .dll binaries out before building with tempfile.TemporaryDirectory() as tmpdirname: - print('Created temporary directory: ', tmpdirname) + print("Created temporary directory: ", tmpdirname) # Create the temporary build-opts.cfg build_opts_path = os.path.join(tmpdirname, "build-opts.cfg") @@ -45,8 +46,7 @@ # Move the binaries gatebin_folder_path = os.path.join( - os.path.curdir, - os.path.join("src", "ansys", "dpf", "gatebin") + os.path.curdir, os.path.join("src", "ansys", "dpf", "gatebin") ) binaries_to_move = [] moved = [] diff --git a/.ci/update_dpf_dependencies.py b/.ci/update_dpf_dependencies.py index 389048074a..4061098cc8 100644 --- a/.ci/update_dpf_dependencies.py +++ b/.ci/update_dpf_dependencies.py @@ -37,18 +37,17 @@ destination = os.path.join(core_path, "src") print(f"into {destination}") latest_wheel = max(glob.glob(dist_path), key=os.path.getctime) - with zipfile.ZipFile(latest_wheel, 'r') as wheel: + with zipfile.ZipFile(latest_wheel, "r") as wheel: for file in wheel.namelist(): # print(file) - if file.startswith('ansys/'): + if file.startswith("ansys/"): wheel.extract( file, path=destination, ) print("Done updating ansys-grpc-dpf") else: - print(f"{grpc_path_key} environment variable is not defined. " - "Cannot update ansys-grpc-dpf.") + print(f"{grpc_path_key} environment variable is not defined. " "Cannot update ansys-grpc-dpf.") if gate_path is not None: # Update ansys-dpf-gate @@ -78,5 +77,7 @@ ) print(f"Done updating ansys-dpf-gatebin for {platform.system()}") else: - print(f"{gate_path_key} environment variable is not defined. " - "Cannot update ansys-dpf-gate or ansys-dpf-gatebin.") + print( + f"{gate_path_key} environment variable is not defined. " + "Cannot update ansys-dpf-gate or ansys-dpf-gatebin." + ) diff --git a/requirements/requirements_build.txt b/requirements/requirements_build.txt index 21e56d2ef8..63da447f7d 100644 --- a/requirements/requirements_build.txt +++ b/requirements/requirements_build.txt @@ -1,4 +1,4 @@ black==23.9.1 +build==1.0.3 chevron==0.14.0 wheel==0.41.0 -build==1.0.3 diff --git a/requirements/requirements_install.txt b/requirements/requirements_install.txt index 9f5235a938..08ad7b3dae 100644 --- a/requirements/requirements_install.txt +++ b/requirements/requirements_install.txt @@ -2,4 +2,4 @@ importlib-metadata==6.8.0 numpy==1.25.2 packaging==23.1 psutil==5.9.5 -tqdm==4.66.1 \ No newline at end of file +tqdm==4.66.1 diff --git a/src/ansys/dpf/core/_version.py b/src/ansys/dpf/core/_version.py index 7fa5c4074f..16cfd24ddb 100644 --- a/src/ansys/dpf/core/_version.py +++ b/src/ansys/dpf/core/_version.py @@ -28,8 +28,8 @@ def __getitem__(self, item): if len(item) == 3: return self.legacy_version_map[item] else: - split = item.split('.') - return split[0]+'R'+split[1] + split = item.split(".") + return split[0] + "R" + split[1] server_to_ansys_version = ServerToAnsysVersion() diff --git a/src/ansys/dpf/core/examples/downloads.py b/src/ansys/dpf/core/examples/downloads.py index c361907369..f6c91c2d40 100644 --- a/src/ansys/dpf/core/examples/downloads.py +++ b/src/ansys/dpf/core/examples/downloads.py @@ -1559,7 +1559,7 @@ def download_cfx_heating_coil( should_upload, server, return_local_path, - ) + ), } diff --git a/src/ansys/dpf/core/field.py b/src/ansys/dpf/core/field.py index 3ca076a9ad..bedc946a40 100644 --- a/src/ansys/dpf/core/field.py +++ b/src/ansys/dpf/core/field.py @@ -241,7 +241,7 @@ def as_local_field(self): """ # noqa: E501 # Do not copy data if using InProcess server - if self._server.client is not None: + if self._server.client is not None: return _LocalField(self) else: return self diff --git a/src/ansys/dpf/core/server_types.py b/src/ansys/dpf/core/server_types.py index 013dcb3272..fc100c0c70 100644 --- a/src/ansys/dpf/core/server_types.py +++ b/src/ansys/dpf/core/server_types.py @@ -20,11 +20,7 @@ import ansys.dpf.core as core from ansys.dpf.core.check_version import server_meet_version from ansys.dpf.core import errors, server_factory -from ansys.dpf.core._version import ( - min_server_version, - server_to_ansys_version, - __version__ -) +from ansys.dpf.core._version import min_server_version, server_to_ansys_version, __version__ from ansys.dpf.core import server_context from ansys.dpf.gate import load_api, data_processing_grpcapi @@ -339,10 +335,12 @@ def check_ansys_grpc_dpf_version(server, timeout): ) LOG.debug("Established connection to DPF gRPC") if version.parse(server.version) < version.parse(min_server_version): - raise ValueError(f"Error connecting to DPF LegacyGrpcServer with version {server.version} " - f"(ANSYS {server_to_ansys_version[server.version]}): " - f"ansys-dpf-core {__version__} does not support DPF servers below " - f"{min_server_version} ({server_to_ansys_version[min_server_version]}).") + raise ValueError( + f"Error connecting to DPF LegacyGrpcServer with version {server.version} " + f"(ANSYS {server_to_ansys_version[server.version]}): " + f"ansys-dpf-core {__version__} does not support DPF servers below " + f"{min_server_version} ({server_to_ansys_version[min_server_version]})." + ) class GhostServer: diff --git a/tests/test_checkversion.py b/tests/test_checkversion.py index 5141152581..0afb793f7c 100644 --- a/tests/test_checkversion.py +++ b/tests/test_checkversion.py @@ -101,5 +101,6 @@ def test_find_outdated_ansys_version(): def test_version(): from ansys.dpf.core._version import server_to_ansys_version + assert server_to_ansys_version["1.0"] == "2021R1" assert server_to_ansys_version["2099.9"] == "2099R9" diff --git a/tests/test_field.py b/tests/test_field.py index a6d426a3b6..52dc3c1200 100644 --- a/tests/test_field.py +++ b/tests/test_field.py @@ -545,12 +545,16 @@ def test_set_support_mesh(simple_bar): def test_local_field_append(server_type_remote_process): num_entities = 400 - field_to_local = dpf.core.fields_factory.create_3d_vector_field(num_entities, server=server_type_remote_process) + field_to_local = dpf.core.fields_factory.create_3d_vector_field( + num_entities, server=server_type_remote_process + ) with field_to_local.as_local_field() as f: for i in range(1, num_entities + 1): f.append([0.1 * i, 0.2 * i, 0.3 * i], i) assert f._is_set is True - field = dpf.core.fields_factory.create_3d_vector_field(num_entities, server=server_type_remote_process) + field = dpf.core.fields_factory.create_3d_vector_field( + num_entities, server=server_type_remote_process + ) for i in range(1, num_entities + 1): field.append([0.1 * i, 0.2 * i, 0.3 * i], i) @@ -567,7 +571,9 @@ def test_local_elemental_nodal_field_append(server_type_remote_process): with field_to_local.as_local_field() as f: for i in range(1, num_entities + 1): f.append([[0.1 * i, 0.2 * i, 0.3 * i], [0.1 * i, 0.2 * i, 0.3 * i]], i) - field = dpf.core.fields_factory.create_3d_vector_field(num_entities, server=server_type_remote_process) + field = dpf.core.fields_factory.create_3d_vector_field( + num_entities, server=server_type_remote_process + ) for i in range(1, num_entities + 1): field.append([[0.1 * i, 0.2 * i, 0.3 * i], [0.1 * i, 0.2 * i, 0.3 * i]], i) @@ -590,12 +596,16 @@ def test_local_elemental_nodal_field_append(server_type_remote_process): def test_local_array_field_append(server_type_remote_process): num_entities = 400 - field_to_local = dpf.core.fields_factory.create_3d_vector_field(num_entities, server=server_type_remote_process) + field_to_local = dpf.core.fields_factory.create_3d_vector_field( + num_entities, server=server_type_remote_process + ) with field_to_local.as_local_field() as f: for i in range(1, num_entities + 1): f.append(np.array([0.1 * i, 0.2 * i, 0.3 * i]), i) assert f._is_set is True - field = dpf.core.fields_factory.create_3d_vector_field(num_entities, server=server_type_remote_process) + field = dpf.core.fields_factory.create_3d_vector_field( + num_entities, server=server_type_remote_process + ) for i in range(1, num_entities + 1): field.append(np.array([0.1 * i, 0.2 * i, 0.3 * i]), i) @@ -612,7 +622,9 @@ def test_local_elemental_nodal_array_field_append(server_type_remote_process): with field_to_local.as_local_field() as f: for i in range(1, num_entities + 1): f.append(np.array([[0.1 * i, 0.2 * i, 0.3 * i], [0.1 * i, 0.2 * i, 0.3 * i]]), i) - field = dpf.core.fields_factory.create_3d_vector_field(num_entities, server=server_type_remote_process) + field = dpf.core.fields_factory.create_3d_vector_field( + num_entities, server=server_type_remote_process + ) for i in range(1, num_entities + 1): field.append(np.array([[0.1 * i, 0.2 * i, 0.3 * i], [0.1 * i, 0.2 * i, 0.3 * i]]), i) @@ -691,7 +703,9 @@ def test_auto_delete_field_local(server_type_remote_process): num_entities, location=dpf.core.locations.elemental_nodal, server=server_type_remote_process ) field_to_local.append([3.0, 4.0, 5.0], 1) - fc = dpf.core.fields_container_factory.over_time_freq_fields_container([field_to_local], server=server_type_remote_process) + fc = dpf.core.fields_container_factory.over_time_freq_fields_container( + [field_to_local], server=server_type_remote_process + ) field_to_local = None with fc[0].as_local_field() as f: assert np.allclose(f.get_entity_data(0), [3.0, 4.0, 5.0]) @@ -1275,9 +1289,10 @@ def test_dot_operator_field(): assert np.allclose(out.scoping.ids, [1, 2]) assert np.allclose(out.data, -field.data) + def test_field_no_inprocess_localfield(server_in_process, allkindofcomplexity): model = dpf.core.Model(allkindofcomplexity, server=server_in_process) field = model.results.stress().outputs.fields_container()[0] with field.as_local_field() as local_field: - assert field == local_field \ No newline at end of file + assert field == local_field diff --git a/tests/test_server.py b/tests/test_server.py index 8c9cd51069..16705dab06 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -306,7 +306,6 @@ def version(self): print(MockServer(remote_server).version) with pytest.raises( - ValueError, - match="Error connecting to DPF LegacyGrpcServer with version 1.0" + ValueError, match="Error connecting to DPF LegacyGrpcServer with version 1.0" ): dpf.core.server_types.check_ansys_grpc_dpf_version(MockServer(remote_server), timeout=2.0)