Use PEP 440 style requirements (#5673)

* 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.

* logshipper is Linux only

Adding `platform_system=="Linux"` makes some development on MacOS X possible.
It at least makes it possible to build a virtualenv.

* standardize spacing on req markers

* make fixate-requirements work with pip-19.3.1 and PEP 440

This is not needed during `make wheelhouse` in st2-packages.
But, rpmbuild runs fixate-requirements again when running build_os_package.sh
in a new rpmbuild venv that does not have pip-20 yet.
So, this makes that corner case in our circleci workflow work like.

* add changelog entry

Author: cognifloyd

CHANGELOG.rst

@@ -79,6 +79,11 @@ Changed
 
   Contributed by @LiamRiddell
 
+* Use PEP 440 direct reference requirements instead of legacy PIP VCS requirements. Now, our ``*.requirements.txt`` files use
+  ``package-name@ git+https://url@version ; markers`` instead of ``git+https://url@version#egg=package-name ; markers``. #5673
+
+  Contributed by @cognifloyd
+
 Removed
 ~~~~~~~
 

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
+pyinotify>=0.9.5,<=0.10 ; platform_system=="Linux"
+logshipper@ git+https://github.com/StackStorm/logshipper.git@stackstorm_patched ; platform_system=="Linux"

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]