Merge pull request pytest-dev#56 from xoviat/common_setup

allow installation from source using pip
mgorny · May 23, 2017 · 586ab63 · 586ab63
2 parents 10a7b75 + 9847592
commit 586ab63
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 3 deletions.
diff --git a/common_setup.py b/common_setup.py
@@ -1,5 +1,6 @@
 # Common setup.py code shared between all the projects in this repository
 import sys
+import os
 import logging
 
 from setuptools.command.test import test as TestCommand
@@ -30,9 +31,10 @@ def run_tests(self):
 
 
 def common_setup(src_dir):
-    readme_file = 'README.md'
-    changelog_file = 'CHANGES.md'
-    version_file = 'VERSION'
+    this_dir = os.path.dirname(__file__)
+    readme_file = os.path.join(this_dir, 'README.md')
+    changelog_file = os.path.join(this_dir, 'CHANGES.md')
+    version_file = os.path.join(this_dir, 'VERSION')
 
     # Convert Markdown to RST for PyPI
     try:

diff --git a/pytest-devpi-server/setup.py b/pytest-devpi-server/setup.py
@@ -1,3 +1,7 @@
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup, find_packages
 from common_setup import common_setup
 

diff --git a/pytest-fixture-config/setup.py b/pytest-fixture-config/setup.py
@@ -1,3 +1,7 @@
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup
 from common_setup import common_setup
 

diff --git a/pytest-git/setup.py b/pytest-git/setup.py
@@ -1,4 +1,7 @@
+import sys
 import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup
 from common_setup import common_setup
 

diff --git a/pytest-listener/setup.py b/pytest-listener/setup.py
@@ -1,4 +1,7 @@
+import sys
 import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup, find_packages
 from common_setup import common_setup
 

diff --git a/pytest-profiling/setup.py b/pytest-profiling/setup.py
@@ -1,3 +1,7 @@
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup
 from common_setup import common_setup
 

diff --git a/pytest-pyramid-server/setup.py b/pytest-pyramid-server/setup.py
@@ -1,3 +1,7 @@
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup
 from common_setup import common_setup
 

diff --git a/pytest-qt-app/setup.py b/pytest-qt-app/setup.py
@@ -1,3 +1,7 @@
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup
 from common_setup import common_setup
 

diff --git a/pytest-server-fixtures/setup.py b/pytest-server-fixtures/setup.py
@@ -1,3 +1,7 @@
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup, find_packages
 from common_setup import common_setup
 

diff --git a/pytest-shutil/setup.py b/pytest-shutil/setup.py
@@ -1,3 +1,7 @@
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup, find_packages
 from common_setup import common_setup
 

diff --git a/pytest-svn/setup.py b/pytest-svn/setup.py
@@ -1,4 +1,7 @@
+import sys
 import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup
 from common_setup import common_setup
 

diff --git a/pytest-verbose-parametrize/setup.py b/pytest-verbose-parametrize/setup.py
@@ -1,3 +1,7 @@
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup
 from common_setup import common_setup
 

diff --git a/pytest-virtualenv/setup.py b/pytest-virtualenv/setup.py
@@ -1,3 +1,7 @@
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup
 from common_setup import common_setup
 

diff --git a/pytest-webdriver/setup.py b/pytest-webdriver/setup.py
@@ -1,3 +1,7 @@
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
 from setuptools import setup
 from common_setup import common_setup