Merge pull request #3653 from SwissDataScienceCenter/release/v2.8.0

Author: Panaetius

.dockerignore

@@ -8,4 +8,5 @@
 !.git
 !.gitignore
 !Makefile
+!gunicorn.conf.py
 .git/config

.github/workflows/acceptance-tests.yml

@@ -26,12 +26,13 @@ jobs:
       renku-graph: ${{ steps.deploy-comment.outputs.renku-graph}}
       renku-notebooks: ${{ steps.deploy-comment.outputs.renku-notebooks}}
       renku-ui: ${{ steps.deploy-comment.outputs.renku-ui}}
+      renku-data-services: ${{ steps.deploy-comment.outputs.renku-data-services}}
       test-enabled: ${{ steps.deploy-comment.outputs.test-enabled}}
       extra-values: ${{ steps.deploy-comment.outputs.extra-values}}
       persist: ${{ steps.deploy-comment.outputs.persist}}
     steps:
       - id: deploy-comment
-        uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.4.5
+        uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.7.0
         with:
           string: /deploy
           pr_ref: ${{ github.event.number }}
@@ -43,7 +44,7 @@ jobs:
       name: renku-ci-rp-${{ github.event.number }}
     steps:
       - name: deploy-pr
-        uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.4.5
+        uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.7.0
         env:
           DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
@@ -52,7 +53,7 @@ jobs:
           RANCHER_PROJECT_ID: ${{ secrets.CI_RANCHER_PROJECT }}
           RENKU_RELEASE: renku-ci-rp-${{ github.event.number }}
           RENKU_VALUES_FILE: "${{ github.workspace }}/values.yaml"
-          RENKU_VALUES: ${{ secrets.CI_RENKU_VALUES }}
+          RENKU_VALUES: ${{ secrets.COMBINED_CHARTS_CI_RENKU_VALUES }}
           RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
           RENKUBOT_RANCHER_BEARER_TOKEN: ${{ secrets.RENKUBOT_RANCHER_BEARER_TOKEN }}
           RANCHER_DEV_API_ENDPOINT: ${{ secrets.RANCHER_DEV_API_ENDPOINT }}
@@ -66,6 +67,7 @@ jobs:
           renku_graph: "${{ needs.check-deploy.outputs.renku-graph }}"
           renku_notebooks: "${{ needs.check-deploy.outputs.renku-notebooks }}"
           renku_ui: "${{ needs.check-deploy.outputs.renku-ui }}"
+          renku_data_services: "${{ needs.check-deploy.outputs.renku-data-services }}"
           extra_values: "${{ needs.check-deploy.outputs.extra-values }}"
       - name: Check existing renkubot comment
         uses: peter-evans/find-comment@v2
@@ -88,7 +90,7 @@ jobs:
     if: ${{ github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true' }}
     needs: [check-deploy, deploy-pr]
     steps:
-      - uses: SwissDataScienceCenter/renku-actions/test-renku@v1.4.5
+      - uses: SwissDataScienceCenter/renku-actions/test-renku@v1.7.0
         with:
           kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
           renku-release: renku-ci-rp-${{ github.event.number }}
@@ -103,7 +105,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: renku teardown
-        uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.4.5
+        uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.7.0
         env:
           HELM_RELEASE_REGEX: "^renku-ci-rp-${{ github.event.number }}$"
           GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}

.github/workflows/test_deploy.yml

@@ -496,9 +496,7 @@ jobs:
           CLOUD_STORAGE_AZURE_KEY: ${{ secrets.CLOUD_STORAGE_AZURE_KEY }}
           CLOUD_STORAGE_S3_ACCESS_KEY_ID: ${{ secrets.CLOUD_STORAGE_S3_ACCESS_KEY_ID }}
           CLOUD_STORAGE_S3_SECRET_ACCESS_KEY: ${{ secrets.CLOUD_STORAGE_S3_SECRET_ACCESS_KEY }}
-        run: pytest -m "integration and not serial and not service" -v
-      - name: Start Redis
-        uses: supercharge/[email protected]
+        run: pytest -m "integration and not serial and not service and not redis" -v
       - name: Test with pytest (serial)
         env:
           POETRY_VIRTUALENVS_CREATE: false
@@ -589,19 +587,16 @@ jobs:
         run: |
           echo "GIT_USER=Renku Bot" >> $GITHUB_ENV
           echo "[email protected]" >> $GITHUB_ENV
-      - name: Push chart and images
-        uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.4.5
+      - name: Build and push images
+        uses: SwissDataScienceCenter/renku-actions/publish-chartpress-images@v1.7.0
         env:
-          CHART_NAME: renku-core
           GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
           DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
-      - name: Wait for chart to be available
-        run: sleep 120
       - name: Update component version
-        uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.4.5
+        uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.7.0
         env:
-          CHART_NAME: renku-core
+          COMPONENT_NAME: renku-core
           GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
 
   coveralls-final:

.gitignore

@@ -35,6 +35,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+.python-version
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

AUTHORS.rst

@@ -1,5 +1,5 @@
 ..
-    Copyright 2017-2023 - Swiss Data Science Center (SDSC)
+    Copyright Swiss Data Science Center (SDSC).
     A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
     Eidgenössische Technische Hochschule Zürich (ETHZ).
 

CHANGES.rst

@@ -1,5 +1,5 @@
 ..
-    Copyright 2017-2023 - Swiss Data Science Center (SDSC)
+    Copyright Swiss Data Science Center (SDSC).
     A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
     Eidgenössische Technische Hochschule Zürich (ETHZ).
 
@@ -18,6 +18,57 @@
 Changes
 =======
 
+`2.8.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v2.7.0...v2.8.0>`__ (2023-11-17)
+-------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+~~~~~~~~~
+
+-  **cli:** do not error unnecessarily on session stop
+   (`#3642 <https://github.com/SwissDataScienceCenter/renku-python/issues/3642>`__)
+   (`4726f66 <https://github.com/SwissDataScienceCenter/renku-python/commit/4726f660e33a6eb3706b20f661faa635fbe6356b>`__)
+-  **cli:** do not pass the force-build flag to docker
+   (`#3641 <https://github.com/SwissDataScienceCenter/renku-python/issues/3641>`__)
+   (`ff5e8f6 <https://github.com/SwissDataScienceCenter/renku-python/commit/ff5e8f63b94691a65dfe5e44438c4f819819f7ee>`__)
+-  **cli:** do not start a session when in detached HEAD state
+   (`#3636 <https://github.com/SwissDataScienceCenter/renku-python/issues/3636>`__)
+   (`80f70f5 <https://github.com/SwissDataScienceCenter/renku-python/commit/80f70f554ef552b67683ba2498959dbca4aa8200>`__)
+-  **core:** do not clone submodules in renku clone command
+   (`#3630 <https://github.com/SwissDataScienceCenter/renku-python/issues/3630>`__)
+   (`e9986e0 <https://github.com/SwissDataScienceCenter/renku-python/commit/e9986e0d4a882cdf1b84603c9f08010d7f949972>`__)
+-  don’t fail on exotic git diff types
+   (`#3632 <https://github.com/SwissDataScienceCenter/renku-python/issues/3632>`__)
+   (`160620c <https://github.com/SwissDataScienceCenter/renku-python/commit/160620c447f1ab7f6935ef63e3f92437c7537f98>`__)
+-  make usage of name and slug consistent
+   (`#3620 <https://github.com/SwissDataScienceCenter/renku-python/issues/3620>`__)
+   (`b31ade0 <https://github.com/SwissDataScienceCenter/renku-python/commit/b31ade02eed873e09e790a46d92caaf2379871ce>`__)
+-  **service:** set job timeouts correctly
+   (`#3651 <https://github.com/SwissDataScienceCenter/renku-python/issues/3651>`__)
+   (`db0f8cf <https://github.com/SwissDataScienceCenter/renku-python/commit/db0f8cf87d8f234e87aa48058eceaaf68283cedf>`__)
+-  warn user about old version of git when using mergetool
+   (`#3637 <https://github.com/SwissDataScienceCenter/renku-python/issues/3637>`__)
+   (`5df0ce1 <https://github.com/SwissDataScienceCenter/renku-python/commit/5df0ce17e2264412ad081909d08a80f4e6523ae9>`__)
+
+Features
+~~~~~~~~
+
+-  add prometheus metrics
+   (`#3640 <https://github.com/SwissDataScienceCenter/renku-python/issues/3640>`__)
+   (`d3eedb5 <https://github.com/SwissDataScienceCenter/renku-python/commit/d3eedb5e716cdc3299021f5e0c75d678c7c85da0>`__)
+-  **cli, service:** support for project image
+   (`#3623 <https://github.com/SwissDataScienceCenter/renku-python/issues/3623>`__)
+   (`db9f93b <https://github.com/SwissDataScienceCenter/renku-python/commit/db9f93b83e077e62b0196305a82b860fcc2cad6b>`__)
+-  **cli:** session pause and resume
+   (`#3633 <https://github.com/SwissDataScienceCenter/renku-python/issues/3633>`__)
+   (`f4b6480 <https://github.com/SwissDataScienceCenter/renku-python/commit/f4b648019cb0ef09e1591e34dbcdd56d2672f018>`__)
+-  **service:** accept commit SHA in read endpoints
+   (`#3608 <https://github.com/SwissDataScienceCenter/renku-python/issues/3608>`__)
+   (`01a0798 <https://github.com/SwissDataScienceCenter/renku-python/commit/01a0798562357167944aab828e5e6b7967775f8a>`__)
+-  **svc:** rename git_url to template_git_url and return git_url on all
+   endpoints
+   (`#3646 <https://github.com/SwissDataScienceCenter/renku-python/issues/3646>`__)
+   (`314786e <https://github.com/SwissDataScienceCenter/renku-python/commit/314786e8f685d2e202de801434bf1dceed9e17bf>`__)
+
 `2.7.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v2.6.2...v2.7.0>`__ (2023-09-27)
 -------------------------------------------------------------------------------------------------------
 

DEVELOPING.rst

@@ -261,7 +261,7 @@ number.
 - Once the release PR has been merged, publish the github release. This creates
   the tag on master that kicks off the publishing CI.
 - Keep an eye on CI, make sure that the `publish-pypi`, `build-images` and
-  `publish-chart` finish successfully.
+  `publish-chartpress-images` finish successfully.
   * If any of them don't finish successfully, ask for help.
 - Go to the `Renku` repository and approve/merge the automatically created PR
   there.

Dockerfile

@@ -15,7 +15,7 @@ RUN apt-get install --no-install-recommends -y build-essential && \
 # time the code changes
 # set the BUILD_CORE_SERVICE to non null to install additional service dependencies
 ARG BUILD_CORE_SERVICE
-COPY pyproject.toml poetry.lock README.rst CHANGES.rst Makefile /code/renku/
+COPY pyproject.toml poetry.lock README.rst CHANGES.rst Makefile gunicorn.conf.py /code/renku/
 COPY .git /code/renku/.git
 COPY renku /code/renku/renku
 WORKDIR /code/renku
@@ -46,6 +46,7 @@ RUN addgroup -gid 1000 shuhitsu && \
     if [ -n "${BUILD_CORE_SERVICE}" ]; then mkdir /svc && chown shuhitsu:shuhitsu /svc ; fi
 
 COPY --from=builder /code/renku /code/renku
+WORKDIR /code/renku
 ENV PATH="${PATH}:/code/renku/.venv/bin"
 
 # shuhitsu (執筆): The "secretary" of the renga, as it were, who is responsible for
@@ -55,5 +56,6 @@ USER shuhitsu
 ENV RENKU_SVC_NUM_WORKERS 4
 ENV RENKU_SVC_NUM_THREADS 8
 ENV RENKU_DISABLE_VERSION_CHECK=1
+ENV PROMETHEUS_MULTIPROC_DIR /tmp
 
 ENTRYPOINT ["tini", "-g", "--", "renku"]

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2019-2023 - Swiss Data Science Center
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2017-2023 - Swiss Data Science Center (SDSC)
-# A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
+# Copyright Swiss Data Science Center (SDSC). A partnership between
+# École Polytechnique Fédérale de Lausanne (EPFL) and
 # Eidgenössische Technische Hochschule Zürich (ETHZ).
 #
 # Licensed under the Apache License, Version 2.0 (the "License");