fix: find-links options in requirements.txt (#3810)

jina-ai · Oct 28, 2021 · 451cb17 · 451cb17
1 parent ae1833c
commit 451cb17
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/jina/hubble/helper.py b/jina/hubble/helper.py
@@ -351,11 +351,21 @@ def install_requirements(
     import pkg_resources
 
     with requirements_file.open() as requirements:
-        install_reqs = [
-            str(req)
-            for req in pkg_resources.parse_requirements(requirements)
-            if req.project_name not in excludes or len(req.extras) > 0
-        ]
+        install_options = []
+        install_reqs = []
+        for req in requirements:
+            req = req.strip()
+            if (not req) or req.startswith('#'):
+                continue
+            elif req.startswith('-'):
+                install_options.extend(req.split(' '))
+            else:
+                for req_spec in pkg_resources.parse_requirements(req):
+                    if (
+                        req_spec.project_name not in excludes
+                        or len(req_spec.extras) > 0
+                    ):
+                        install_reqs.append(req)
 
     if len(install_reqs) == 0:
         return
@@ -373,4 +383,5 @@ def install_requirements(
             f'--default-timeout={timeout}',
         ]
         + install_reqs
+        + install_options
     )
diff --git a/tests/unit/hubble/dummy_executor/requirements.txt b/tests/unit/hubble/dummy_executor/requirements.txt
@@ -1 +1,2 @@
+-f https://download.pytorch.org/whl/torch_stable.html
 pytest
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		-f https://download.pytorch.org/whl/torch_stable.html
		pytest