Merge branch 'master' into 2131-workflow-visualize

CHANGES.rst

@@ -18,6 +18,14 @@
 Changes
 =======
 
+`0.16.2 <https://github.com/SwissDataScienceCenter/renku-python/compare/v0.16.1...v0.16.2>`__ (2021-10-05)
+----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+~~~~~~~~~
+
+-  **core:** Pin pyshacl version to 0.17.0.post1
+
 `0.16.1 <https://github.com/SwissDataScienceCenter/renku-python/compare/v0.16.0...v0.16.1>`__ (2021-09-13)
 ----------------------------------------------------------------------------------------------------------
 

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: 0.16.0
+version: 0.16.2

renku/service/controllers/templates_read_manifest.py

@@ -58,7 +58,9 @@ def template_manifest(self):
                 continue
 
             # NOTE: prevent path traversal attack
-            icon_path = template_folder / ((template_folder / template["icon"]).resolve().relative_to(template_folder))
+            icon_path = template_folder / (
+                (template_folder / template["icon"]).resolve().relative_to(template_folder.resolve())
+            )
 
             icon = Image.open(icon_path)
             icon.thumbnail(MAX_ICON_SIZE)

setup.py

@@ -186,7 +186,7 @@ def run(self):
     "pyjwt==2.1.0",
     "pyld==2.0.3",
     "pyOpenSSL>=19.0.0,<20.1.0",
-    "pyshacl>=0.17.0.post2,<0.18",
+    "pyshacl==0.17.0.post1",
     "python-dateutil>=2.6.1,<2.8.3",
     "python-editor==1.0.4",
     "PyYAML>=5.4,<=5.4.1",