add conditional imports for jenkins et al

fix setup.py package identification
refactor defaults for test servers

Author: jmatthews

pytest-fixture-config/setup.py

@@ -74,7 +74,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        py_modules=['pytest_fixture_config'],
     )
 
 if __name__ == '__main__':

pytest-listener/setup.py

@@ -80,7 +80,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        packages=find_packages(exclude='tests'),
         entry_points=entry_points,
     )
 

pytest-profiling/setup.py

@@ -83,7 +83,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        py_modules=['pytest_profiling'],
         entry_points=entry_points,
     )
 

pytest-pyramid-server/setup.py

@@ -84,7 +84,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        py_modules=['pytest_pyramid_server'],
         entry_points=entry_points,
     )
 

pytest-qt-app/setup.py

@@ -83,7 +83,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        py_modules=['pytest_qt_app'],
         entry_points=entry_points,
     )
 

pytest-server-fixtures/pytest_server_fixtures/__init__.py

@@ -9,17 +9,29 @@ class FixtureConfig(Config):
                  'rethink_executable', 'httpd_executable', 'httpd_modules', 'fixture_hostname',
                  'xvfb_executable')
 
+# Default values for system resource locations - patch this to change defaults
+DEFAULT_SERVER_FIXTURES_HOSTNAME = socket.gethostname()
+DEFAULT_SERVER_FIXTURES_JAVA = "java"
+DEFAULT_SERVER_FIXTURES_JENKINS_URL = 'http://acmejenkins.example.com'
+DEFAULT_SERVER_FIXTURES_JENKINS_WAR = '/usr/share/jenkins/jenkins.war'
+DEFAULT_SERVER_FIXTURES_MONGO_BIN = '/usr/bin'
+DEFAULT_SERVER_FIXTURES_REDIS = "/usr/sbin/redis-server"
+DEFAULT_SERVER_FIXTURES_RETHINK = "/usr/bin/rethinkdb"
+DEFAULT_SERVER_FIXTURES_HTTPD = "/usr/sbin/apache2"
+DEFAULT_SERVER_FIXTURES_HTTPD_MODULES = "/usr/lib/apache2/modules"
+DEFAULT_SERVER_FIXTURES_XVFB = "/usr/bin/Xvfb"
+
 # Global config for finding system resources.
 CONFIG = FixtureConfig(
     # Not using localhost here in case we are being used in a cluster-type job
-    fixture_hostname=os.getenv('SERVER_FIXTURES_HOSTNAME', socket.gethostname()),
-    java_executable=os.getenv('SERVER_FIXTURES_JAVA', "java"),
-    jenkins_url=os.getenv('SERVER_FIXTURES_JENKINS_URL', 'http://acmejenkins.example.com'),
-    jenkins_war=os.getenv('SERVER_FIXTURES_JENKINS_WAR', '/usr/share/jenkins/jenkins.war'),
-    mongo_bin=os.getenv('SERVER_FIXTURES_MONGO_BIN', '/usr/bin'),
-    redis_executable=os.getenv('SERVER_FIXTURES_REDIS', "/usr/sbin/redis-server"),
-    rethink_executable=os.getenv('SERVER_FIXTURES_RETHINK', "/usr/bin/rethinkdb"),
-    httpd_executable=os.getenv('SERVER_FIXTURES_HTTPD', "/usr/sbin/apache2"),
-    httpd_modules=os.getenv('SERVER_FIXTURES_HTTPD_MODULES', "/usr/lib/apache2/modules"),
-    xvfb_executable=os.getenv('SERVER_FIXTURES_XVFB', "/usr/bin/Xvfb"),
+    fixture_hostname=os.getenv('SERVER_FIXTURES_HOSTNAME', DEFAULT_SERVER_FIXTURES_HOSTNAME),
+    java_executable=os.getenv('SERVER_FIXTURES_JAVA', DEFAULT_SERVER_FIXTURES_JAVA),
+    jenkins_url=os.getenv('SERVER_FIXTURES_JENKINS_URL', DEFAULT_SERVER_FIXTURES_JENKINS_URL),
+    jenkins_war=os.getenv('SERVER_FIXTURES_JENKINS_WAR', DEFAULT_SERVER_FIXTURES_JENKINS_WAR),
+    mongo_bin=os.getenv('SERVER_FIXTURES_MONGO_BIN', DEFAULT_SERVER_FIXTURES_MONGO_BIN),
+    redis_executable=os.getenv('SERVER_FIXTURES_REDIS', DEFAULT_SERVER_FIXTURES_REDIS),
+    rethink_executable=os.getenv('SERVER_FIXTURES_RETHINK', DEFAULT_SERVER_FIXTURES_RETHINK),
+    httpd_executable=os.getenv('SERVER_FIXTURES_HTTPD', DEFAULT_SERVER_FIXTURES_HTTPD),
+    httpd_modules=os.getenv('SERVER_FIXTURES_HTTPD_MODULES', DEFAULT_SERVER_FIXTURES_HTTPD_MODULES),
+    xvfb_executable=os.getenv('SERVER_FIXTURES_XVFB', DEFAULT_SERVER_FIXTURES_XVFB),
 )

pytest-server-fixtures/pytest_server_fixtures/jenkins.py

@@ -8,7 +8,11 @@
 import os.path
 import shutil
 
-import jenkins
+try:
+    import jenkins
+except ImportError:
+    pass
+
 import pytest
 
 from pytest_server_fixtures import CONFIG

pytest-server-fixtures/pytest_server_fixtures/mongo.py

@@ -4,8 +4,12 @@
 import subprocess
 
 import pytest
-import pymongo
-from pymongo.errors import AutoReconnect, ConnectionFailure
+
+try:
+    import pymongo
+    from pymongo.errors import AutoReconnect, ConnectionFailure
+except ImportError:
+    pass
 
 from pytest_server_fixtures import CONFIG
 from pytest_fixture_config import requires_config

pytest-server-fixtures/pytest_server_fixtures/redis.py

@@ -8,7 +8,10 @@
 import socket
 
 import pytest
-import redis
+try:
+    import redis
+except ImportError:
+    pass
 
 from pytest_server_fixtures import CONFIG
 from pytest_fixture_config import requires_config

pytest-server-fixtures/pytest_server_fixtures/rethink.py

@@ -4,7 +4,11 @@
 import time
 
 import pytest
-import rethinkdb
+
+try:
+    import rethinkdb
+except ImportError:
+    pass
 
 from pytest_server_fixtures import CONFIG
 from pytest_fixture_config import requires_config

pytest-server-fixtures/setup.py

@@ -97,7 +97,7 @@ def main():
         extras_require=extras_require,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        packages=find_packages(exclude='tests'),
         entry_points=entry_points,
     )
 

pytest-shutil/setup.py

@@ -85,7 +85,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        packages=find_packages(exclude='tests'),
         entry_points=entry_points,
     )
 

pytest-svn/setup.py

@@ -81,7 +81,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        py_modules=['pytest_svn'],
         entry_points=entry_points,
     )
 

pytest-verbose-parametrize/setup.py

@@ -83,7 +83,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        py_modules=['pytest_verbose_parametrize'],
         entry_points=entry_points,
     )
 

pytest-virtualenv/pytest_virtualenv.py

@@ -16,23 +16,26 @@
 class FixtureConfig(Config):
     __slots__ = ('virtualenv_executable')
 
+# Default values for system resource locations - patch this to change defaults
+DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE = (cmdline.which('virtualenv') + ['virtualenv'])[0]
+
 CONFIG = FixtureConfig(
-    virtualenv_executable=os.getenv('VIRTUALENV_FIXTURE_EXECUTABLE', 'virtualenv'),
+    virtualenv_executable=os.getenv('VIRTUALENV_FIXTURE_EXECUTABLE', DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE),
 )
 
 
 @yield_requires_config(CONFIG, ['virtualenv_executable'])
 @yield_fixture(scope='function')
 def virtualenv():
     """ Function-scoped virtualenv in a temporary workspace.
-    
+
         Methods
         -------
         run()                : run a command using this virtualenv's shell environment
         run_with_coverage()  : run a command in this virtualenv, collecting coverage
         install_package()    : install a package in this virtualenv
         installed_packages() : return a dict of installed packages
-        
+
         Attributes
         ----------
         virtualenv (`path.path`)    : Path to this virtualenv's base directory

pytest-virtualenv/setup.py

@@ -54,7 +54,8 @@ def main():
         if pytest_args:
             sys.argv = sys.argv[:-len(pytest_args)]
 
-    install_requires = ['pytest-shutil',
+    install_requires = ['pytest-fixture-config',
+                        'pytest-shutil',
                         'pytest',
                         ]
 
@@ -82,7 +83,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        py_modules=['pytest_virtualenv'],
         entry_points=entry_points,
     )
 

pytest-webdriver/setup.py

@@ -83,7 +83,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        packages=find_packages(),
+        py_modules=['pytest_webdriver'],
         entry_points=entry_points,
     )