From 7971f7fc98224117f74db2c16b913948eb84bd42 Mon Sep 17 00:00:00 2001 From: Henrik Kjedsberg Date: Tue, 12 Mar 2024 14:53:30 +0100 Subject: [PATCH] Restrict python<=3.10 --- environment-test.yml | 2 +- environment.yml | 2 +- .../automatedPreprocessing/automated_preprocessing.py | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/environment-test.yml b/environment-test.yml index 214d94d5..684ff225 100644 --- a/environment-test.yml +++ b/environment-test.yml @@ -8,7 +8,7 @@ dependencies: - morphman - paramiko - pip - - python >=3.8 + - python <=3.10 - git - pip: - scipy diff --git a/environment.yml b/environment.yml index 0c97cb9b..fa5f5168 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,7 @@ dependencies: - morphman - paramiko - pip - - python >=3.8 + - python <=3.10 - git - pip: - scipy diff --git a/src/vampy/automatedPreprocessing/automated_preprocessing.py b/src/vampy/automatedPreprocessing/automated_preprocessing.py index 8c76e4fc..87f04a66 100644 --- a/src/vampy/automatedPreprocessing/automated_preprocessing.py +++ b/src/vampy/automatedPreprocessing/automated_preprocessing.py @@ -1,15 +1,17 @@ import argparse -import numpy as np import sys -from morphman import get_uncapped_surface, write_polydata, get_parameters, vtk_clean_polydata, \ +from os import remove, path + +import numpy as np +from morphman import get_uncapped_surface, write_polydata, read_polydata, get_parameters, vtk_clean_polydata, \ vtk_triangulate_surface, write_parameters, vmtk_cap_polydata, compute_centerlines, get_centerline_tolerance, \ get_vtk_point_locator, extract_single_line, vtk_merge_polydata, get_point_data_array, smooth_voronoi_diagram, \ create_new_surface, compute_centers, vmtk_smooth_surface, str2bool, vmtk_compute_voronoi_diagram, \ prepare_output_surface, vmtk_compute_geometric_features -from os import remove, path + # Local imports from vampy.automatedPreprocessing.moving_common import get_point_map, project_displacement, save_displacement -from vampy.automatedPreprocessing.preprocessing_common import read_polydata, get_centers_for_meshing, \ +from vampy.automatedPreprocessing.preprocessing_common import get_centers_for_meshing, \ dist_sphere_diam, dist_sphere_curvature, dist_sphere_constant, get_regions_to_refine, add_flow_extension, \ write_mesh, mesh_alternative, generate_mesh, find_boundaries, compute_flow_rate, setup_model_network, \ radiusArrayName, scale_surface, get_furtest_surface_point, check_if_closed_surface, remesh_surface