From cf54a3d6291688b79e5c2b1dbf858a40c3207cf1 Mon Sep 17 00:00:00 2001 From: Chris Blanton Date: Wed, 4 Jun 2025 15:58:50 -0400 Subject: [PATCH 1/3] #457 fre analysis install to prefix analysis name with 'freanalysis_' when pip installing --- fre/analysis/subtools.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fre/analysis/subtools.py b/fre/analysis/subtools.py index ebc69ec8e..1cea2ee30 100644 --- a/fre/analysis/subtools.py +++ b/fre/analysis/subtools.py @@ -13,7 +13,7 @@ def install_analysis_package(url, name=None, library_directory=None): Args: url: URL to the github repository for the analysis package. - name: String name of the analysis-script package. + name: String name of the analysis-script package (not prefixed with 'freanalysis_') library_directory: Directory to install the package in. """ # Clean up the url if necessary. @@ -40,11 +40,11 @@ def install_analysis_package(url, name=None, library_directory=None): env.create_env() env.install_package(str(tmp_path / "scripts" / "core" / "analysis_scripts")) env.install_package(str(tmp_path / "scripts" / "core" / "figure_tools")) - env.install_package(str(tmp_path / "scripts" / "user-analysis-scripts" / name)) + env.install_package(str(tmp_path / "scripts" / "user-analysis-scripts" / "freanalysis_" + name)) else: run(["pip", "install", str(tmp_path / "scripts" / "core" / "figure_tools")], check=True) - run(["pip", "install", str(tmp_path / "scripts" / "user-analysis-scripts" / name)], + run(["pip", "install", str(tmp_path / "scripts" / "user-analysis-scripts" / "freanalysis_" + name)], check=True) else: if library_directory: From 783d75c8391a9bb18e57b55d855d00602489970b Mon Sep 17 00:00:00 2001 From: Chris Blanton Date: Fri, 6 Jun 2025 10:55:18 -0400 Subject: [PATCH 2/3] #457 include mdtf schema updates --- fre/gfdl_msd_schemas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fre/gfdl_msd_schemas b/fre/gfdl_msd_schemas index a9667baf1..f09cacfb3 160000 --- a/fre/gfdl_msd_schemas +++ b/fre/gfdl_msd_schemas @@ -1 +1 @@ -Subproject commit a9667baf1b677b31c2fae62b0b738d1e5fcb2d2a +Subproject commit f09cacfb367ec9232ab2c1f0dc40505691e94419 From 6a9c304da79b71373f423d207c28e45fa0d5737f Mon Sep 17 00:00:00 2001 From: Chris Blanton Date: Fri, 6 Jun 2025 11:43:06 -0400 Subject: [PATCH 3/3] #457 need parenthesis for string concatenation order of operations --- fre/analysis/subtools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fre/analysis/subtools.py b/fre/analysis/subtools.py index 1cea2ee30..eb0ad76f9 100644 --- a/fre/analysis/subtools.py +++ b/fre/analysis/subtools.py @@ -40,11 +40,11 @@ def install_analysis_package(url, name=None, library_directory=None): env.create_env() env.install_package(str(tmp_path / "scripts" / "core" / "analysis_scripts")) env.install_package(str(tmp_path / "scripts" / "core" / "figure_tools")) - env.install_package(str(tmp_path / "scripts" / "user-analysis-scripts" / "freanalysis_" + name)) + env.install_package(str(tmp_path / "scripts" / "user-analysis-scripts" / ("freanalysis_" + name))) else: run(["pip", "install", str(tmp_path / "scripts" / "core" / "figure_tools")], check=True) - run(["pip", "install", str(tmp_path / "scripts" / "user-analysis-scripts" / "freanalysis_" + name)], + run(["pip", "install", str(tmp_path / "scripts" / "user-analysis-scripts" / ("freanalysis_" + name))], check=True) else: if library_directory: