Use PEP 440 direct references in requirements

This adds support for PEP 440 requirements instead of using the
pip-specific VCS format.
see: https://peps.python.org/pep-0440/#direct-references

This facilitates using newer tooling that does not support using the
legacy pip VCS format.

I adjusted the dist_utils.py functions to maintain the same functionality.
Note however that I plan to use pants to replace all the python packaging
bits, including dist_utils.py. So the dist_utils.py changes are a stop-gap
to keep things working until we get the rest of the pants changes in.

Author: cognifloyd

contrib/linux/requirements.txt

@@ -1,3 +1,3 @@
 # used by file watcher sensor
 pyinotify>=0.9.5,<=0.10
--e git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper
+logshipper@ git+https://github.com/StackStorm/logshipper.git@stackstorm_patched

contrib/runners/action_chain_runner/dist_utils.py

@@ -118,6 +118,12 @@ def _get_link(line):
 
                 link = line.replace("-e ", "").strip()
                 return link, req_name[0]
+            elif vcs_prefix in line and line.count("@") == 2:
+                # PEP 440 direct reference: <package name>@ <url>@version
+                req_name, link = line.split("@", 1)
+                req_name = req_name.strip()
+                link = f"{link.strip()}#egg={req_name}"
+                return link, req_name
 
         return None, None
 

contrib/runners/announcement_runner/dist_utils.py

@@ -118,6 +118,12 @@ def _get_link(line):
 
                 link = line.replace("-e ", "").strip()
                 return link, req_name[0]
+            elif vcs_prefix in line and line.count("@") == 2:
+                # PEP 440 direct reference: <package name>@ <url>@version
+                req_name, link = line.split("@", 1)
+                req_name = req_name.strip()
+                link = f"{link.strip()}#egg={req_name}"
+                return link, req_name
 
         return None, None
 

contrib/runners/http_runner/dist_utils.py

@@ -118,6 +118,12 @@ def _get_link(line):
 
                 link = line.replace("-e ", "").strip()
                 return link, req_name[0]
+            elif vcs_prefix in line and line.count("@") == 2:
+                # PEP 440 direct reference: <package name>@ <url>@version
+                req_name, link = line.split("@", 1)
+                req_name = req_name.strip()
+                link = f"{link.strip()}#egg={req_name}"
+                return link, req_name
 
         return None, None
 

contrib/runners/inquirer_runner/dist_utils.py

@@ -118,6 +118,12 @@ def _get_link(line):
 
                 link = line.replace("-e ", "").strip()
                 return link, req_name[0]
+            elif vcs_prefix in line and line.count("@") == 2:
+                # PEP 440 direct reference: <package name>@ <url>@version
+                req_name, link = line.split("@", 1)
+                req_name = req_name.strip()
+                link = f"{link.strip()}#egg={req_name}"
+                return link, req_name
 
         return None, None
 

contrib/runners/local_runner/dist_utils.py

@@ -118,6 +118,12 @@ def _get_link(line):
 
                 link = line.replace("-e ", "").strip()
                 return link, req_name[0]
+            elif vcs_prefix in line and line.count("@") == 2:
+                # PEP 440 direct reference: <package name>@ <url>@version
+                req_name, link = line.split("@", 1)
+                req_name = req_name.strip()
+                link = f"{link.strip()}#egg={req_name}"
+                return link, req_name
 
         return None, None
 

contrib/runners/noop_runner/dist_utils.py

@@ -118,6 +118,12 @@ def _get_link(line):
 
                 link = line.replace("-e ", "").strip()
                 return link, req_name[0]
+            elif vcs_prefix in line and line.count("@") == 2:
+                # PEP 440 direct reference: <package name>@ <url>@version
+                req_name, link = line.split("@", 1)
+                req_name = req_name.strip()
+                link = f"{link.strip()}#egg={req_name}"
+                return link, req_name
 
         return None, None
 

contrib/runners/orquesta_runner/dist_utils.py

@@ -118,6 +118,12 @@ def _get_link(line):
 
                 link = line.replace("-e ", "").strip()
                 return link, req_name[0]
+            elif vcs_prefix in line and line.count("@") == 2:
+                # PEP 440 direct reference: <package name>@ <url>@version
+                req_name, link = line.split("@", 1)
+                req_name = req_name.strip()
+                link = f"{link.strip()}#egg={req_name}"
+                return link, req_name
 
         return None, None
 

contrib/runners/orquesta_runner/in-requirements.txt

@@ -1 +1 @@
-git+https://github.com/StackStorm/[email protected]#egg=orquesta
+orquesta@ git+https://github.com/StackStorm/[email protected]

contrib/runners/orquesta_runner/requirements.txt

@@ -5,4 +5,4 @@
 # If you want to update depdencies for a single component, modify the
 # in-requirements.txt for that component and then run 'make requirements' to
 # update the component requirements.txt
-git+https://github.com/StackStorm/[email protected]#egg=orquesta
+orquesta@ git+https://github.com/StackStorm/[email protected]