Merge pull request #3215 from SwissDataScienceCenter/release/v1.9.3

chore: release v1.9.3

Author: Panaetius

CHANGES.rst

@@ -18,6 +18,16 @@
 Changes
 =======
 
+`1.9.3 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.9.2...v1.9.3>`__ (2022-11-17)
+-------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+~~~~~~~~~
+
+-  **core:** fix git url regex matching taking too long
+   (`#3213 <https://github.com/SwissDataScienceCenter/renku-python/issues/3213>`__)
+   (`8245ce3 <https://github.com/SwissDataScienceCenter/renku-python/commit/8245ce3c7eb3170a0c544db875f4fc4918474b1d>`__)
+
 `1.9.2 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.9.1...v1.9.2>`__ (2022-11-15)
 -------------------------------------------------------------------------------------------------------
 

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.9.2
+version: 1.9.3

helm-chart/renku-core/values.yaml

@@ -97,7 +97,7 @@ versions:
     fullnameOverride: ""
     image:
       repository: renku/renku-core
-      tag: "v1.9.2"
+      tag: "v1.9.3"
       pullPolicy: IfNotPresent
   v8:
     name: v8

renku/domain_model/git.py

@@ -44,7 +44,7 @@
 
 _RE_PORT = r":(?P<port>\d+)"
 
-_RE_PATHNAME = r"(?P<path>(([\w\-\~\.]+)/)*?(((?P<owner>([\w\-\.]+/?)+)/)?(?P<name>[\w\-\.]+)(\.git)?)?)/*"
+_RE_PATHNAME = r"(?P<path>((\~[\w\-\.]+)/)*?(((?P<owner>[\w\-\./]+?)/)?(?P<name>[\w\-\.]+)(\.git)?)?)/*"
 
 _RE_PATHNAME_WITH_GITLAB = (
     r"(?P<path>((((gitlab/){0,1}|([\w\-\~\.]+/)*?)(?P<owner>([\w\-\.]+/)*[\w\-\.]+)/)?"

renku/version.py

@@ -24,7 +24,7 @@
 except ImportError:
     from importlib_metadata import distribution  # type: ignore
 
-__version__ = "1.9.2"
+__version__ = "1.9.3"
 __template_version__ = "0.3.1"
 __minimum_project_version__ = "1.7.0"
 

tests/core/models/test_git.py

@@ -18,6 +18,7 @@
 """Git regex tests."""
 
 import os
+import time
 
 import pytest
 
@@ -287,6 +288,15 @@
             "port": "1234",
             "env": "https://gitlab.example.com:1234/",
         },
+        {
+            "href": "https://gitlab.example.com/renku-test/test-2022-11-11-17-01-46.git",
+            "scheme": "https",
+            "hostname": "gitlab.example.com",
+            "name": "test-2022-11-11-17-01-46",
+            "path": "renku-test/test-2022-11-11-17-01-46.git",
+            "owner": "renku-test",
+            "env": "https://gitlab.example.com",
+        },
     ],
 )
 def test_valid_href(fields):
@@ -296,4 +306,8 @@ def test_valid_href(fields):
     if gitlab_env:
         os.environ["GITLAB_BASE_URL"] = gitlab_env
 
+    start = time.monotonic()
     assert GitURL(**fields) == GitURL.parse(fields["href"])
+    duration = time.monotonic() - start
+
+    assert duration < 1.0, "Something wrong with the GitUrl regexes, probably catastrophic backtracking"