From 514a7827858c5066c8a70e16ea4f618c1b79948d Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <MichielCottaar@protonmail.com>
Date: Mon, 16 Dec 2024 12:47:50 +0000
Subject: [PATCH 1/4] Add uv to CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a8be3a..3d1c575 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 ## [Unreleased]
+### Changed
+- Use [`uv`](https://docs.astral.sh/uv/) for project management (i.e., manage dependencies, testing, building, and publishing).
 ### Fixed
 - Support file-tree to have multiple templates with the same key as long as that key is not used in the pipeline
 ## [v1.1.1]
-- 
GitLab


From c35f36047d7f611f85e9a984ca3f190d7cf280c2 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <MichielCottaar@protonmail.com>
Date: Mon, 16 Dec 2024 12:48:40 +0000
Subject: [PATCH 2/4] Bump to v1.1.2

---
 CHANGELOG.md   | 6 ++++--
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d1c575..cae53f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 ## [Unreleased]
+## [v1.1.2]
 ### Changed
 - Use [`uv`](https://docs.astral.sh/uv/) for project management (i.e., manage dependencies, testing, building, and publishing).
 ### Fixed
@@ -27,8 +28,9 @@
 ### Fixed
 - Improved support for [linked placeholder values](https://open.win.ox.ac.uk/pages/fsl/file-tree/tutorial.html#linked-placholder-values). Previously, these would sometimes lead to crashes, when multiple conflicting jobs were created.
 
-[Unreleased]: https://git.fmrib.ox.ac.uk/fsl/fsl-pipe/-/compare/v1.1.1...main
-[v1.1.1]: https://git.fmrib.ox.ac.uk/fsl/fsl-pipe/-/compare/v1.1.1...v1.1.1
+[Unreleased]: https://git.fmrib.ox.ac.uk/fsl/fsl-pipe/-/compare/v1.1.2...main
+[v1.1.2]: https://git.fmrib.ox.ac.uk/fsl/fsl-pipe/-/compare/v1.1.1...v1.1.2
+[v1.1.1]: https://git.fmrib.ox.ac.uk/fsl/fsl-pipe/-/compare/v1.1.0...v1.1.1
 [v1.1.0]: https://git.fmrib.ox.ac.uk/fsl/fsl-pipe/-/compare/v1.0.3...v1.1.0
 [v1.0.3]: https://git.fmrib.ox.ac.uk/fsl/fsl-pipe/-/compare/v1.0.2...v1.0.3
 [v1.0.2]: https://git.fmrib.ox.ac.uk/fsl/fsl-pipe/-/compare/v1.0.1...v1.0.2
diff --git a/pyproject.toml b/pyproject.toml
index f21d544..a9eab66 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "fsl-pipe"
-version = "1.1.1"
+version = "1.1.2"
 description = "Declarative pipelines based on Filetrees"
 readme = "README.md"
 requires-python = ">=3.10"
-- 
GitLab


From a501f16f910479528e35bfa1ffccbf2d708b0bb2 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <MichielCottaar@protonmail.com>
Date: Mon, 16 Dec 2024 13:37:59 +0000
Subject: [PATCH 3/4] Fix console import

---
 src/fsl_pipe/job.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsl_pipe/job.py b/src/fsl_pipe/job.py
index 0c703ce..e96d1d5 100644
--- a/src/fsl_pipe/job.py
+++ b/src/fsl_pipe/job.py
@@ -208,7 +208,7 @@ class JobList:
         """Produce tree reports with the relevant input/output templates."""
         from rich import color, tree
         if console is None:
-            from rich import Console
+            from rich.console import Console
             console = Console()
 
         if len(self.jobs) == 0:
-- 
GitLab


From 9fe91b3e55c269c9ed4300ff9014102789bfb3a3 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <MichielCottaar@protonmail.com>
Date: Mon, 16 Dec 2024 13:39:00 +0000
Subject: [PATCH 4/4] Push version 1.1.3

---
 CHANGELOG.md   | 3 +++
 pyproject.toml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cae53f8..adf7808 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 ## [Unreleased]
+## [v1.1.3]
+### Fixed
+- Fixed breaking import of console when printing rich output
 ## [v1.1.2]
 ### Changed
 - Use [`uv`](https://docs.astral.sh/uv/) for project management (i.e., manage dependencies, testing, building, and publishing).
diff --git a/pyproject.toml b/pyproject.toml
index a9eab66..db0a6f6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "fsl-pipe"
-version = "1.1.2"
+version = "1.1.3"
 description = "Declarative pipelines based on Filetrees"
 readme = "README.md"
 requires-python = ">=3.10"
-- 
GitLab