From 666e3cd7daf96fb5e26abe0eeddc92adb50ceb7b Mon Sep 17 00:00:00 2001 From: Tasko Olevski Date: Wed, 27 Sep 2023 15:47:31 +0200 Subject: [PATCH 1/3] chore: update changelog for 2.7.0 release --- CHANGES.rst | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 6c7852ea65..0acd4de792 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -18,18 +18,30 @@ Changes ======= -`2.7.0 `__ (2023-08-09) +`2.7.0 `__ (2023-09-27) ------------------------------------------------------------------------------------------------------- Bug Fixes ~~~~~~~~~ +- **cli:** do not freeze/unfreeze plan view model + (`#3599 `__) + (`3c48cff `__) +- **cli:** ssh setup and key usage + (`#3615 `__) + (`3fa737a `__) +- **core:** setting non-existing config property to null + (`#3595 `__) + (`e0ff587 `__) +- **core:** skip fast cache migrations check for anonymous users + (`#3577 `__) + (`9ee3176 `__) +- **service:** normalize git url to avoid duplicate cache entries + (`#3606 `__) + (`19142c6 `__) - **cli:** adapt to changes in KG api for importing datasets (`#3549 `__) (`020434a `__) -- **cli:** fix overwriting dataset tags - (`#3497 `__) - (`17a49ae `__) - **service:** add branch to service cache path (`#3562 `__) (`3800a38 `__) From 0f34fa13f3c8355d3d12b4a7e44fde814c12b2ba Mon Sep 17 00:00:00 2001 From: Tasko Olevski Date: Wed, 27 Sep 2023 15:48:06 +0200 Subject: [PATCH 2/3] chore: bump renku template version in CLI --- renku/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renku/version.py b/renku/version.py index 13f88cc515..4a3f1379ac 100644 --- a/renku/version.py +++ b/renku/version.py @@ -24,7 +24,7 @@ from importlib_metadata import distribution, version # type: ignore __version__ = cast(str, version("renku")) -__template_version__ = "0.5.0" +__template_version__ = "0.7.1" __minimum_project_version__ = "2.4.0" From 74ccfb714908c75747355d3ed27051b409c202b3 Mon Sep 17 00:00:00 2001 From: Tasko Olevski Date: Thu, 28 Sep 2023 13:23:51 +0200 Subject: [PATCH 3/3] chore(tests): fix template name check (#3626) --- .github/actions/install-linux/action.yml | 4 ++-- .github/actions/install-macos/action.yml | 2 +- tests/cli/test_template.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/install-linux/action.yml b/.github/actions/install-linux/action.yml index 7af4706912..0f5d857cf8 100644 --- a/.github/actions/install-linux/action.yml +++ b/.github/actions/install-linux/action.yml @@ -32,7 +32,7 @@ runs: renku/templates key: ${{ env.DEPENDENCY_CACHE_PREFIX }}-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('poetry.lock') }}-${{ hashFiles('Makefile') }} env: - DEPENDENCY_CACHE_PREFIX: "v1" + DEPENDENCY_CACHE_PREFIX: "20230929" - name: Install dependencies if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/') env: @@ -65,7 +65,7 @@ runs: path: cassettes key: ${{ env.NETWORK_CACHE_PREFIX }}-${{ steps.year-week.outputs.date }}-${{ hashFiles('poetry.lock') }}-${{ github.job }} env: - NETWORK_CACHE_PREFIX: "v1" + NETWORK_CACHE_PREFIX: "20230929" - name: Set coveralls path mapping shell: bash run: | diff --git a/.github/actions/install-macos/action.yml b/.github/actions/install-macos/action.yml index d5d952d96e..ac96da4e04 100644 --- a/.github/actions/install-macos/action.yml +++ b/.github/actions/install-macos/action.yml @@ -46,4 +46,4 @@ runs: path: cassettes key: ${{ env.NETWORK_CACHE_PREFIX }}-${{ steps.year-week.outputs.date }}-${{ hashFiles('poetry.lock') }}-${{ github.job }} env: - NETWORK_CACHE_PREFIX: "v1" + NETWORK_CACHE_PREFIX: "20230929" diff --git a/tests/cli/test_template.py b/tests/cli/test_template.py index a38348683a..8030c7bb6a 100644 --- a/tests/cli/test_template.py +++ b/tests/cli/test_template.py @@ -91,7 +91,7 @@ def test_template_show(isolated_runner): result = isolated_runner.invoke(cli, command + ["R-minimal"]) assert 0 == result.exit_code, format_result_exception(result) - assert re.search("^Name: Basic R (.*) Project$", result.output, re.MULTILINE) is not None + assert re.search("^Name: R (.*) Project$", result.output, re.MULTILINE) is not None finally: sys.argv = argv @@ -101,7 +101,7 @@ def test_template_show_no_id(runner, project): result = runner.invoke(cli, ["template", "show"]) assert 0 == result.exit_code, format_result_exception(result) - assert re.search("^Name: Basic Python (.*) Project$", result.output, re.MULTILINE) is not None + assert re.search("^Name: Python (.*) Project$", result.output, re.MULTILINE) is not None def test_template_show_no_id_outside_project(isolated_runner):