Merge branch 'develop' into feat-combined-helm-charts

SwissDataScienceCenter · Sep 28, 2023 · 61cda99 · 61cda99
2 parents 0b70dcf + 74ccfb7
commit 61cda99
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git 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
@@ -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/CHANGES.rst b/CHANGES.rst
@@ -18,18 +18,30 @@
 Changes
 =======
 
-`2.7.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v2.6.2...v2.7.0>`__ (2023-08-09)
+`2.7.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v2.6.2...v2.7.0>`__ (2023-09-27)
 -------------------------------------------------------------------------------------------------------
 
 Bug Fixes
 ~~~~~~~~~
 
+-  **cli:** do not freeze/unfreeze plan view model
+   (`#3599 <https://github.com/SwissDataScienceCenter/renku-python/issues/3599>`__)
+   (`3c48cff <https://github.com/SwissDataScienceCenter/renku-python/commit/3c48cffe116db5c246beca2003c2f282fc38b465>`__)
+-  **cli:** ssh setup and key usage
+   (`#3615 <https://github.com/SwissDataScienceCenter/renku-python/issues/3615>`__)
+   (`3fa737a <https://github.com/SwissDataScienceCenter/renku-python/commit/3fa737ab6cd6126047098957ff2e5f179e939339>`__)
+-  **core:** setting non-existing config property to null
+   (`#3595 <https://github.com/SwissDataScienceCenter/renku-python/issues/3595>`__)
+   (`e0ff587 <https://github.com/SwissDataScienceCenter/renku-python/commit/e0ff587f507d049eeeb873e8488ba8bb10ac1a15>`__)
+-  **core:** skip fast cache migrations check for anonymous users
+   (`#3577 <https://github.com/SwissDataScienceCenter/renku-python/issues/3577>`__)
+   (`9ee3176 <https://github.com/SwissDataScienceCenter/renku-python/commit/9ee3176ce379dd80d2955e858f5e11e1fb32b464>`__)
+-  **service:** normalize git url to avoid duplicate cache entries
+   (`#3606 <https://github.com/SwissDataScienceCenter/renku-python/issues/3606>`__)
+   (`19142c6 <https://github.com/SwissDataScienceCenter/renku-python/commit/19142c6f58713cb9990b71f9ed738990987c3e16>`__)
 -  **cli:** adapt to changes in KG api for importing datasets
    (`#3549 <https://github.com/SwissDataScienceCenter/renku-python/issues/3549>`__)
    (`020434a <https://github.com/SwissDataScienceCenter/renku-python/commit/020434a7dd6449755644a2e9ca849b8821900f72>`__)
--  **cli:** fix overwriting dataset tags
-   (`#3497 <https://github.com/SwissDataScienceCenter/renku-python/issues/3497>`__)
-   (`17a49ae <https://github.com/SwissDataScienceCenter/renku-python/commit/17a49aebc7207901986c38fd30afc58baf40be1f>`__)
 -  **service:** add branch to service cache path
    (`#3562 <https://github.com/SwissDataScienceCenter/renku-python/issues/3562>`__)
    (`3800a38 <https://github.com/SwissDataScienceCenter/renku-python/commit/3800a3823515763c207b1b15f348df3b0cdd9831>`__)

diff --git 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"
 
 

diff --git 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):