From 88ce6f5721a583e49ea64edde241179197be6240 Mon Sep 17 00:00:00 2001
From: Michael Droettboom <mdboom@gmail.com>
Date: Wed, 27 Jul 2022 11:24:26 -0400
Subject: [PATCH] Allow for specifying local wheels and sdists as dependencies

---
 pyperformance/_pip.py                         |   2 +-
 pyperformance/tests/data/MANIFEST             |   4 ++++
 .../tests/data/bm_local_wheel/pyproject.toml  |   9 +++++++++
 .../data/bm_local_wheel/requirements.txt      |   1 +
 .../data/bm_local_wheel/run_benchmark.py      |  19 ++++++++++++++++++
 .../this_is-1.0.2-py2.py3-none-any.whl        | Bin 0 -> 3575 bytes
 pyperformance/tests/test_commands.py          |  13 ++++++++++++
 pyperformance/venv.py                         |   6 +++++-
 8 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 pyperformance/tests/data/MANIFEST
 create mode 100644 pyperformance/tests/data/bm_local_wheel/pyproject.toml
 create mode 100644 pyperformance/tests/data/bm_local_wheel/requirements.txt
 create mode 100644 pyperformance/tests/data/bm_local_wheel/run_benchmark.py
 create mode 100755 pyperformance/tests/data/bm_local_wheel/this_is-1.0.2-py2.py3-none-any.whl

diff --git a/pyperformance/_pip.py b/pyperformance/_pip.py
index 7fc07874..7eb10e04 100644
--- a/pyperformance/_pip.py
+++ b/pyperformance/_pip.py
@@ -150,7 +150,7 @@ def install_requirements(reqs, *extra,
     if upgrade:
         args.append('-U')  # --upgrade
     for reqs in [reqs, *extra]:
-        if os.path.exists(reqs):
+        if os.path.isfile(reqs) and reqs.endswith('.txt'):
             args.append('-r')  # --requirement
         args.append(reqs)
     return run_pip('install', *args, **kwargs)
diff --git a/pyperformance/tests/data/MANIFEST b/pyperformance/tests/data/MANIFEST
new file mode 100644
index 00000000..9b55de6f
--- /dev/null
+++ b/pyperformance/tests/data/MANIFEST
@@ -0,0 +1,4 @@
+[benchmarks]
+
+name	metafile
+local_wheel	<local>
diff --git a/pyperformance/tests/data/bm_local_wheel/pyproject.toml b/pyperformance/tests/data/bm_local_wheel/pyproject.toml
new file mode 100644
index 00000000..a3191642
--- /dev/null
+++ b/pyperformance/tests/data/bm_local_wheel/pyproject.toml
@@ -0,0 +1,9 @@
+[project]
+name = "pyperformance_bm_local_wheel"
+requires-python = ">=3.8"
+dependencies = ["pyperf"]
+urls = {repository = "https://github.com/python/pyperformance"}
+version = "1.0"
+
+[tool.pyperformance]
+name = "local_wheel"
diff --git a/pyperformance/tests/data/bm_local_wheel/requirements.txt b/pyperformance/tests/data/bm_local_wheel/requirements.txt
new file mode 100644
index 00000000..ac230871
--- /dev/null
+++ b/pyperformance/tests/data/bm_local_wheel/requirements.txt
@@ -0,0 +1 @@
+this_is-1.0.2-py2.py3-none-any.whl#egg=this_is
diff --git a/pyperformance/tests/data/bm_local_wheel/run_benchmark.py b/pyperformance/tests/data/bm_local_wheel/run_benchmark.py
new file mode 100644
index 00000000..cb560fd1
--- /dev/null
+++ b/pyperformance/tests/data/bm_local_wheel/run_benchmark.py
@@ -0,0 +1,19 @@
+"""
+A dummy benchmark that uses a local wheel
+"""
+
+import pyperf
+from this_is import en_us
+
+
+def bench():
+    return 1.0
+
+
+if __name__ == "__main__":
+    runner = pyperf.Runner()
+    runner.metadata['description'] = "A dummy benchmark that has a local wheel dependency"
+
+    args = runner.parse_args()
+    runner.bench_func('local_wheel', bench)
+
diff --git a/pyperformance/tests/data/bm_local_wheel/this_is-1.0.2-py2.py3-none-any.whl b/pyperformance/tests/data/bm_local_wheel/this_is-1.0.2-py2.py3-none-any.whl
new file mode 100755
index 0000000000000000000000000000000000000000..40279621898e66ae9280028c40bdb60f4bd54f9d
GIT binary patch
literal 3575
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
U&(ZvG{@hu2J`<+Pg+EsR0OiC$EdT%j

literal 0
HcmV?d00001

diff --git a/pyperformance/tests/test_commands.py b/pyperformance/tests/test_commands.py
index 4c7787c6..942b151c 100644
--- a/pyperformance/tests/test_commands.py
+++ b/pyperformance/tests/test_commands.py
@@ -161,6 +161,19 @@ def test_run_and_show(self):
         # XXX Capture and check the output.
         self.run_module('pyperf', 'slowest', filename)
 
+    def test_run_test_benchmarks(self):
+        # Run the benchmarks that exist only for testing
+        # in pyperformance/tests/data
+        filename = self.resolve_tmp('bench-test.json')
+
+        self.run_pyperformance(
+            'run',
+            '--manifest', os.path.join(tests.DATA_DIR, 'MANIFEST'),
+            '-b', 'all',
+            '-o', filename,
+            capture=None,
+        )
+
     ###################################
     # compile
 
diff --git a/pyperformance/venv.py b/pyperformance/venv.py
index fe686a9e..5a703024 100644
--- a/pyperformance/venv.py
+++ b/pyperformance/venv.py
@@ -44,7 +44,11 @@ def _add_from_file(self, filename):
         if not os.path.exists(filename):
             return
         for line in _utils.iter_clean_lines(filename):
-            self._add(line)
+            fullpath = os.path.join(os.path.dirname(filename), line.strip())
+            if os.path.isfile(fullpath):
+                self._add(fullpath)
+            else:
+                self._add(line)
 
     def _add(self, line):
         self.specs.append(line)