Merge pull request #495 from pepkit/master_1.7.1_point_release

pin pipestat>=0.8.0,<0.9.0
pepkit · May 28, 2024 · 67514e4 · 67514e4
2 parents 8ba8aac + 64070a6
commit 67514e4
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,6 +2,11 @@
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format.
 
+## [1.7.1] -- 2024-05-28
+
+### Fixed
+- pin pipestat version to be between pipestat>=0.8.0,<0.9.0  https://github.com/pepkit/looper/issues/494
+
 ## [1.7.0] -- 2024-01-26
 
 ### Added

diff --git a/docs_jupyter/debug_divvy.ipynb b/docs_jupyter/debug_divvy.ipynb
@@ -27,6 +27,7 @@
    ],
    "source": [
     "import divvy\n",
+    "\n",
     "divvy.setup_divvy_logger(\"DEBUG\", devmode=True)"
    ]
   }

diff --git a/docs_jupyter/tutorial_divvy.ipynb b/docs_jupyter/tutorial_divvy.ipynb
@@ -22,7 +22,8 @@
    "outputs": [],
    "source": [
     "import divvy\n",
-    "dcc = divvy.ComputingConfiguration()\n"
+    "\n",
+    "dcc = divvy.ComputingConfiguration()"
    ]
   },
   {
@@ -116,7 +117,9 @@
     }
    ],
    "source": [
-    "dcc.write_script(\"test_local.sub\", {\"code\": \"run-this-command\", \"logfile\": \"logfile.txt\"})"
+    "dcc.write_script(\n",
+    "    \"test_local.sub\", {\"code\": \"run-this-command\", \"logfile\": \"logfile.txt\"}\n",
+    ")"
    ]
   },
   {
@@ -276,7 +279,7 @@
     }
    ],
    "source": [
-    "s = dcc.write_script(\"test_script.sub\", {\"code\":\"yellow\"})"
+    "s = dcc.write_script(\"test_script.sub\", {\"code\": \"yellow\"})"
    ]
   },
   {
@@ -341,7 +344,9 @@
     }
    ],
    "source": [
-    "s = dcc.write_script(\"test_script.sub\", [{\"code\":\"red\"}, {\"code\": \"yellow\", \"time\": \"now\"}])"
+    "s = dcc.write_script(\n",
+    "    \"test_script.sub\", [{\"code\": \"red\"}, {\"code\": \"yellow\", \"time\": \"now\"}]\n",
+    ")"
    ]
   },
   {

diff --git a/looper/_version.py b/looper/_version.py
@@ -1 +1 @@
-__version__ = "1.7.0"
+__version__ = "1.7.1"
diff --git a/requirements/requirements-all.txt b/requirements/requirements-all.txt
@@ -6,7 +6,7 @@ logmuse>=0.2.0
 pandas>=2.0.2
 pephubclient>=0.1.2
 peppy>=0.40.0
-pipestat>=0.8.0
+pipestat>=0.8.0,<0.9.0
 pyyaml>=3.12
 rich>=9.10.0
 ubiquerg>=0.5.2

diff --git a/tests/smoketests/test_run.py b/tests/smoketests/test_run.py
@@ -123,9 +123,9 @@ def test_looper_single_pipeline(self, prep_temp_pep):
             pifaces = config_data[SAMPLE_MODS_KEY][CONSTANT_KEY][
                 PIPELINE_INTERFACES_KEY
             ]
-            config_data[SAMPLE_MODS_KEY][CONSTANT_KEY][
-                PIPELINE_INTERFACES_KEY
-            ] = pifaces[1]
+            config_data[SAMPLE_MODS_KEY][CONSTANT_KEY][PIPELINE_INTERFACES_KEY] = (
+                pifaces[1]
+            )
 
         x = test_args_expansion(tp, "run")
         try:
@@ -140,9 +140,9 @@ def test_looper_var_templates(self, prep_temp_pep):
             pifaces = config_data[SAMPLE_MODS_KEY][CONSTANT_KEY][
                 PIPELINE_INTERFACES_KEY
             ]
-            config_data[SAMPLE_MODS_KEY][CONSTANT_KEY][
-                PIPELINE_INTERFACES_KEY
-            ] = pifaces[1]
+            config_data[SAMPLE_MODS_KEY][CONSTANT_KEY][PIPELINE_INTERFACES_KEY] = (
+                pifaces[1]
+            )
         x = test_args_expansion(tp, "run")
         try:
             # Test that {looper.piface_dir} is correctly rendered to a path which will show up in the final .sub file
@@ -211,9 +211,9 @@ def test_looper_pipeline_invalid(self, prep_temp_pep):
             pifaces = config_data[SAMPLE_MODS_KEY][CONSTANT_KEY][
                 PIPELINE_INTERFACES_KEY
             ]
-            config_data[SAMPLE_MODS_KEY][CONSTANT_KEY][
-                PIPELINE_INTERFACES_KEY
-            ] = pifaces[1]
+            config_data[SAMPLE_MODS_KEY][CONSTANT_KEY][PIPELINE_INTERFACES_KEY] = (
+                pifaces[1]
+            )
         piface_path = os.path.join(os.path.dirname(tp), pifaces[1])
         with mod_yaml_data(piface_path) as piface_data:
             del piface_data["pipeline_name"]