From c92c5f0d3c502187e3b496b1783a3f014b3557f7 Mon Sep 17 00:00:00 2001 From: Viktor Gal Date: Wed, 6 Oct 2021 08:58:21 +0200 Subject: [PATCH 1/2] chore: pin pyshacl to 0.17.0.post1 (#2388) port 0.16.2 hotfix changes to master --- CHANGES.rst | 8 ++++++++ helm-chart/renku-core/Chart.yaml | 2 +- setup.py | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 52bf290ab4..e2c2b3f4a7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -18,6 +18,14 @@ Changes ======= +`0.16.2 `__ (2021-10-05) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +~~~~~~~~~ + +- **core:** Pin pyshacl version to 0.17.0.post1 + `0.16.1 `__ (2021-09-13) ---------------------------------------------------------------------------------------------------------- diff --git a/helm-chart/renku-core/Chart.yaml b/helm-chart/renku-core/Chart.yaml index 9a531449eb..5b116907b1 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: 0.16.0 +version: 0.16.2 diff --git a/setup.py b/setup.py index 0b1265ca54..2e6ab8b5f5 100644 --- a/setup.py +++ b/setup.py @@ -182,7 +182,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", From 1009fd820ff4967b2810836474e89f5bc69c6bcf Mon Sep 17 00:00:00 2001 From: Viktor Gal Date: Thu, 7 Oct 2021 10:17:20 +0200 Subject: [PATCH 2/2] resolve the template folder path (#2390) on macOS the /tmp and /var are symlinks to /private/tmp and /private/var, which causes problems when resolving relative paths. --- renku/service/controllers/templates_read_manifest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/renku/service/controllers/templates_read_manifest.py b/renku/service/controllers/templates_read_manifest.py index 04ba3750f1..3dd477e9a7 100644 --- a/renku/service/controllers/templates_read_manifest.py +++ b/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)