From 42f7a9fb6568d7ed1203cc924ef8d1532278f7fa Mon Sep 17 00:00:00 2001
From: Ralf Grubenmann <ralf.grubenmann@sdsc.ethz.ch>
Date: Fri, 22 Jul 2022 10:02:55 +0200
Subject: [PATCH] chore: release v1.6.0

---
 CHANGES.rst                       | 38 +++++++++++++++++++++++++++++++
 helm-chart/renku-core/Chart.yaml  |  2 +-
 helm-chart/renku-core/values.yaml |  2 +-
 renku/version.py                  |  2 +-
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a5e93aac98..392911e213 100644
--- 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/helm-chart/renku-core/Chart.yaml b/helm-chart/renku-core/Chart.yaml
index 0da64336dd..aa876b613b 100644
--- a/helm-chart/renku-core/Chart.yaml
+++ b/helm-chart/renku-core/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: renku-core
 icon: https://avatars0.githubusercontent.com/u/53332360?s=400&u=a4311d22842343604ef61a8c8a1e5793209a67e9&v=4
-version: 1.5.0
+version: 1.6.0
diff --git a/helm-chart/renku-core/values.yaml b/helm-chart/renku-core/values.yaml
index 00817e5512..4ee11ba085 100644
--- a/helm-chart/renku-core/values.yaml
+++ b/helm-chart/renku-core/values.yaml
@@ -111,7 +111,7 @@ versions:
     fullnameOverride: ""
     image:
       repository: renku/renku-core
-      tag: "v1.5.0"
+      tag: "v1.6.0"
       pullPolicy: IfNotPresent
   v8:
     name: v8
diff --git a/renku/version.py b/renku/version.py
index 3676497cd1..d588e4908a 100644
--- a/renku/version.py
+++ b/renku/version.py
@@ -24,7 +24,7 @@
 except ImportError:
     from importlib_metadata import distribution  # type: ignore
 
-__version__ = "1.5.0"
+__version__ = "1.6.0"
 __template_version__ = "0.3.1"
 __minimum_project_version__ = "1.2.0"