Merge pull request #3043 from SwissDataScienceCenter/release/v1.6.0

chore: release v1.6.0
SwissDataScienceCenter · Jul 22, 2022 · 6251e93 · 6251e93
2 parents 50224e2 + 42f7a9f
commit 6251e93
Show file tree

Hide file tree

Showing 106 changed files with 5,393 additions and 3,353 deletions.
diff --git a/.github/workflows/test_deploy.yml b/.github/workflows/test_deploy.yml
@@ -309,6 +309,15 @@ jobs:
         run: |
           git config --global --add user.name "Renku Bot"
           git config --global --add user.email "[email protected]"
+      - name: Set coveralls path mapping
+        run: |
+          echo "
+
+          [tool.coverage.paths]
+          source = [
+              \"renku/\",
+              \"$(python -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')/renku/\"
+          ]" >> pyproject.toml
       - name: Test with pytest
         env:
           POETRY_VIRTUALENVS_CREATE: false
@@ -321,6 +330,7 @@ jobs:
           GITHUB_TOKEN: $COVERALLS_REPO_TOKEN
           RENKU_REQUESTS_TIMEOUT_SECONDS: 120
           COVERALLS_PARALLEL: true
+        if: always()
         run: coveralls --service=github-actions
         continue-on-error: true
 
@@ -367,6 +377,15 @@ jobs:
         run: |
           git config --global --add user.name "Renku Bot"
           git config --global --add user.email "[email protected]"
+      - name: Set coveralls path mapping
+        run: |
+          echo "
+
+          [tool.coverage.paths]
+          source = [
+              \"renku/\",
+              \"$(python -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')/renku/\"
+          ]" >> pyproject.toml
       - name: Test with pytest
         env:
           POETRY_VIRTUALENVS_CREATE: false
@@ -385,6 +404,7 @@ jobs:
           GITHUB_TOKEN: $COVERALLS_REPO_TOKEN
           RENKU_REQUESTS_TIMEOUT_SECONDS: 120
           COVERALLS_PARALLEL: true
+        if: always()
         run: coveralls --service=github-actions
         continue-on-error: true
 
@@ -431,6 +451,15 @@ jobs:
         run: |
           git config --global --add user.name "Renku Bot"
           git config --global --add user.email "[email protected]"
+      - name: Set coveralls path mapping
+        run: |
+          echo "
+
+          [tool.coverage.paths]
+          source = [
+              \"renku/\",
+              \"$(python -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')/renku/\"
+          ]" >> pyproject.toml
       - name: Test with pytest
         env:
           POETRY_VIRTUALENVS_CREATE: false
@@ -449,6 +478,7 @@ jobs:
           GITHUB_TOKEN: $COVERALLS_REPO_TOKEN
           RENKU_REQUESTS_TIMEOUT_SECONDS: 120
           COVERALLS_PARALLEL: true
+        if: always()
         run: coveralls --service=github-actions
         continue-on-error: true
 
@@ -495,6 +525,15 @@ jobs:
         run: |
           git config --global --add user.name "Renku Bot"
           git config --global --add user.email "[email protected]"
+      - name: Set coveralls path mapping
+        run: |
+          echo "
+
+          [tool.coverage.paths]
+          source = [
+              \"renku/\",
+              \"$(python -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')/renku/\"
+          ]" >> pyproject.toml
       - name: Test with pytest
         env:
           POETRY_VIRTUALENVS_CREATE: false
@@ -507,6 +546,7 @@ jobs:
           GITHUB_TOKEN: $COVERALLS_REPO_TOKEN
           RENKU_REQUESTS_TIMEOUT_SECONDS: 120
           COVERALLS_PARALLEL: true
+        if: always()
         run: coveralls --service=github-actions
         continue-on-error: true
 
@@ -714,6 +754,15 @@ jobs:
         with:
           path: cassettes
           key: ${{ env.NETWORK_CACHE_PREFIX }}-${{ needs.year-week.outputs.date }}-${{ hashFiles('tests') }}-${{ github.job }}
+      - name: Set coveralls path mapping
+        run: |
+          echo "
+
+          [tool.coverage.paths]
+          source = [
+              \"renku/\",
+              \"$(python -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')/renku/\"
+          ]" >> pyproject.toml
       - name: Test with pytest
         env:
           POETRY_VIRTUALENVS_CREATE: false
@@ -725,6 +774,8 @@ jobs:
           OLOS_ACCESS_TOKEN: ${{ secrets.OLOS_ACCESS_TOKEN }}
           RENKU_REQUESTS_TIMEOUT_SECONDS: 120
         run: pytest -m "integration and not service and not serial" -v --timeout=600 -n auto
+      - name: Start Redis
+        uses: supercharge/[email protected]
       - name: Test with pytest (serial)
         env:
           POETRY_VIRTUALENVS_CREATE: false
@@ -742,6 +793,7 @@ jobs:
           GITHUB_TOKEN: $COVERALLS_REPO_TOKEN
           RENKU_REQUESTS_TIMEOUT_SECONDS: 120
           COVERALLS_PARALLEL: true
+        if: always()
         run: coveralls --service=github-actions
         continue-on-error: true
 
@@ -793,6 +845,15 @@ jobs:
         with:
           path: cassettes
           key: ${{ env.NETWORK_CACHE_PREFIX }}-${{ needs.year-week.outputs.date }}-${{ hashFiles('tests') }}-${{ github.job }}
+      - name: Set coveralls path mapping
+        run: |
+          echo "
+
+          [tool.coverage.paths]
+          source = [
+              \"renku/\",
+              \"$(python -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')/renku/\"
+          ]" >> pyproject.toml
       - name: Test with pytest
         env:
           POETRY_VIRTUALENVS_CREATE: false
@@ -821,6 +882,7 @@ jobs:
           GITHUB_TOKEN: $COVERALLS_REPO_TOKEN
           RENKU_REQUESTS_TIMEOUT_SECONDS: 120
           COVERALLS_PARALLEL: true
+        if: always()
         run: coveralls --service=github-actions
         continue-on-error: true
 
@@ -863,6 +925,8 @@ jobs:
           OLOS_ACCESS_TOKEN: ${{ secrets.OLOS_ACCESS_TOKEN }}
           RENKU_REQUESTS_TIMEOUT_SECONDS: 120
         run: pytest -m "integration and not serial" -v
+      - name: Start Redis
+        uses: supercharge/[email protected]
       - name: Test with pytest(serial)
         env:
           POETRY_VIRTUALENVS_CREATE: false
@@ -1004,6 +1068,7 @@ jobs:
         test-linux-integration,
         test-linux-integration-service,
       ]
+    if: always()
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -1013,3 +1078,4 @@ jobs:
         with:
           github-token: ${{ secrets.github_token }}
           parallel-finished: true
+          base-path: renku/
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -18,6 +18,44 @@
 Changes
 =======
 
+`1.6.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.5.0...v1.6.0>`__ (2022-07-22)
+-------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+~~~~~~~~~
+
+-  **cli:** fix merge tool committing more than just .gitattributes
+   (`#3013 <https://github.com/SwissDataScienceCenter/renku-python/issues/3013>`__)
+   (`3905d78 <https://github.com/SwissDataScienceCenter/renku-python/commit/3905d78261d1064e8d3d108658f9699829bd1fc9>`__)
+-  **cli:** fix merge tool not working with OOBuckets
+   (`#3023 <https://github.com/SwissDataScienceCenter/renku-python/issues/3023>`__)
+   (`71f0d4a <https://github.com/SwissDataScienceCenter/renku-python/commit/71f0d4a2f11a7df3d38dbdaa1e4249361b064045>`__)
+-  **cli:** prevent deletion of plans that are still used in composite plans
+   (`#2993 <https://github.com/SwissDataScienceCenter/renku-python/issues/2993>`__)
+   (`f013bb6 <https://github.com/SwissDataScienceCenter/renku-python/commit/f013bb67539acb568a079b22f553122c12267e55>`__)
+-  **cli:** prevent removed plans from being used in workflow commands
+   (`#2998 <https://github.com/SwissDataScienceCenter/renku-python/issues/2998>`__)
+   (`493f4c5 <https://github.com/SwissDataScienceCenter/renku-python/commit/493f4c58d5766372739da14141ee0b090467f26d>`__)
+-  **core:** persist activity catalog in metadata
+   (`#2994 <https://github.com/SwissDataScienceCenter/renku-python/issues/2994>`__)
+   (`8ef503f <https://github.com/SwissDataScienceCenter/renku-python/commit/8ef503fbbcefbde8bb4a7a430688d63b19459660>`__)
+
+Features
+~~~~~~~~
+
+-  **api:** add RDFGraph to API
+   (`#3031 <https://github.com/SwissDataScienceCenter/renku-python/issues/3031>`__)
+   (`b8784d5 <https://github.com/SwissDataScienceCenter/renku-python/commit/b8784d5160691f3b6f7776d1ae0a874ea80c2041>`__)
+-  **cli:** inform users about ‘renku login’ in related errors
+   (`#3000 <https://github.com/SwissDataScienceCenter/renku-python/issues/3000>`__)
+   (`ec91b31 <https://github.com/SwissDataScienceCenter/renku-python/commit/ec91b319fbc2c1b9cb7b1e1b5c1d594b4447701f>`__)
+-  **cli:** add option to skip metadata update when executing workflows
+   (`#3025 <https://github.com/SwissDataScienceCenter/renku-python/issues/3025>`__)
+   (`c89aba7 <https://github.com/SwissDataScienceCenter/renku-python/commit/c89aba7081e71e34eefe4495bfe6498a0dcf900f>`__)
+-  **cli:** use existing remote image when starting sessions
+   (`#2991 <https://github.com/SwissDataScienceCenter/renku-python/issues/2991>`__)
+   (`b09805c <https://github.com/SwissDataScienceCenter/renku-python/commit/b09805c4c140493dc6b4d94cc988260201628dac>`__)
+
 
 `1.5.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.4.0...v1.5.0>`__ (2022-07-04)
 -------------------------------------------------------------------------------------------------------

diff --git a/conftest.py b/conftest.py
@@ -41,8 +41,10 @@
 GLOBAL_FIXTURE_LOCATIONS = [
     "tests.fixtures.common",
     "tests.fixtures.config",
+    "tests.fixtures.domain_models",
     "tests.fixtures.repository",
     "tests.fixtures.runners",
+    "tests.fixtures.session",
     "tests.fixtures.templates",
 ]
 

diff --git a/design/003-interactive-session/003-interactive-session.md b/design/003-interactive-session/003-interactive-session.md
@@ -133,6 +133,10 @@ The implementation of this interface in detail:
 ```python
 class ISessionProvider:
 
+    def get_name(self) -> str:
+        """Return session provider's name."""
+        pass
+
     def build_image(self, image_descriptor: Path, image_name: str, config: Optional[Dict[str, Any]]) -> Optional[str]:
         """Builds the container image.
         :param image_descriptor: Path to the container image descriptor file.
@@ -150,9 +154,9 @@ class ISessionProvider:
         """
         pass
 
-    def session_provider(self) -> Tuple["ISessionProvider", str]:
+    def session_provider(self) -> "ISessionProvider":
         """Supported session provider.
-        :returns: a tuple of ``self`` and engine type name.
+        :returns: a reference to ``self``.
         """
         pass
 

diff --git a/docs/_static/cheatsheet/cheatsheet.pdf b/docs/_static/cheatsheet/cheatsheet.pdf
diff --git a/docs/cheatsheet/conf.py b/docs/cheatsheet/conf.py
@@ -169,7 +169,7 @@
 napoleon_numpy_docstring = False
 
 # sphinx type references only work for types that documentation is generated for
-# Suppress warnungs for these types that are referenced but not documented themselves.
+# Suppress warnings for these types that are referenced but not documented themselves.
 nitpick_ignore = [
     ("py:class", "Path"),
     ("py:class", "OID_TYPE"),

diff --git a/docs/cheatsheet_hash b/docs/cheatsheet_hash
@@ -1,2 +1,2 @@
-62d4f12d9be4d80c0dfbdef2957fde9a  cheatsheet.tex
+e76e9f0f1bdb504ab7571c0d89815d99  cheatsheet.tex
 c70c179e07f04186ec05497564165f11  sdsc_cheatsheet.cls
diff --git a/docs/conf.py b/docs/conf.py
@@ -349,6 +349,8 @@
 nitpick_ignore = [
     ("py:class", "CommandResult"),
     ("py:class", "CommunicationCallback"),
+    ("py:class", "datetime"),
+    ("py:class", "DiGraph"),
     ("py:class", "DynamicProxy"),
     ("py:class", "IActivityGateway"),
     ("py:class", "IClientDispatcher"),

diff --git a/docs/how-to-guides/index.rst b/docs/how-to-guides/index.rst
@@ -13,3 +13,4 @@ aimed at active users of Renku CLI and target specific use-cases or common issue
    hpc
    implementing_a_provider
    shell-integration
+   tracking-workflows