Handle projects where the envelope is also the package (#159)

conbench · Sep 8, 2021 · 5eaf854 · 5eaf854
1 parent ccbeaf5
commit 5eaf854
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/conbench/util.py b/conbench/util.py
@@ -70,6 +70,19 @@ def _print_error(self, msg, red=False):
 
 def places_to_look():
     current_dir = os.getcwd()
+
+    # Handle projects where the envelope is also the package
+    # (has both a setup.py and an __init__.py).
+    #
+    #   project
+    #   ├── __init__.py
+    #   ├── benchmarks
+    #   │   ├── __init__.py
+    #   │   └── benchmark_project.py
+    #   ├── requirements.txt
+    #   └── setup.py
+    sys.path.append(os.path.join(current_dir, ".."))
+
     benchmarks_dir = os.path.join(current_dir, "benchmarks")
     if os.path.exists(benchmarks_dir):
         return [current_dir, benchmarks_dir]

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setuptools.setup(
     name="conbench",
-    version="1.17.0",
+    version="1.18.0",
     description="Continuous Benchmarking (CB) Framework",
     long_description=long_description,
     long_description_content_type="text/markdown",