teuthology: stop pip and setuptools from fighting over deps that exist in the system...

Signed-off-by: Gregory Meno <gmeno@redhat.com>

diff --git a/bootstrap b/bootstrap
index c4cfcd0a6fe5acbb4bd0989e68c8df2c7c1d450e..cf481e56fb8ec68cf013f33faa598996419301fd 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -93,5 +93,3 @@ if [ -z "$NO_CLOBBER" ] || [ ! -e ./virtualenv ]; then
 fi
 
 ./virtualenv/bin/pip install -r requirements.txt
-
-./virtualenv/bin/python setup.py develop 

diff --git a/requirements.txt b/requirements.txt
index f109fc9a4315cde57b0b4ac131dbef3a088b4833..cd8c47d3d7e46ef695ddb5cc3b9c2d4dfc633d8d 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,27 +1,3 @@
-# 0.14 switches to libev, that means bootstrap needs to change too
-gevent == 0.13.6
-# 1.7.7 has AES-128-CBC support for SSH keys, that's needed
-MySQL-python == 1.2.3
-PyYAML
-argparse >= 1.2.1
-beanstalkc >= 0.2.0
-boto >= 2.0b4
-bunch >= 1.0.0
-configobj
-# Require a new-ish six - only for configobj
-six >= 1.5.0
-httplib2
-paramiko < 1.8
-pexpect
-requests >= 2.3.0
-raven
-web.py
-docopt
-psutil >= 2.1.0
-configparser
-pytest
-ansible==1.9.1
+--index-url https://pypi.python.org/simple/
 
-# Test Dependencies
-# nose >=1.0.0
-# fudge >=1.0.3
+-e .

diff --git a/setup.py b/setup.py
index 96867b72666d4a0de146c2c760ebb52e33f38c0f..2c8b5100306d1975e80560307ea00d91b50f5d3e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -5,16 +5,6 @@ module_file = open("teuthology/__init__.py").read()
 metadata = dict(re.findall(r"__([a-z]+)__\s*=\s*['\"]([^'\"]*)['\"]", module_file))
 long_description = open('README.rst').read()
 
-install_requires=[
-    'setuptools',
-    ]
-
-install_requires.extend(
-    [ln.strip() for ln in open('requirements.txt').readlines() if ln and '#'
-     not in ln]
-)
-
-
 setup(
     name='teuthology',
     version=metadata['version'],
@@ -41,7 +31,27 @@ setup(
         'Topic :: System :: Distributed Computing',
         'Topic :: System :: Filesystems',
     ],
-    install_requires=install_requires,
+    install_requires=['setuptools',
+                      'gevent == 0.13.6',  # 0.14 switches to libev, that means bootstrap needs to change too
+                      'MySQL-python == 1.2.3',
+                      'PyYAML',
+                      'argparse >= 1.2.1',
+                      'beanstalkc >= 0.2.0',
+                      'boto >= 2.0b4',
+                      'bunch >= 1.0.0',
+                      'configobj',
+                      'six >= 1.5.0',  # Require a new-ish six - only for configobj
+                      'httplib2',
+                      'paramiko < 1.8',
+                      'pexpect',
+                      'requests >= 2.3.0',
+                      'raven',
+                      'web.py',
+                      'docopt',
+                      'psutil >= 2.1.0',
+                      'configparser',
+                      'pytest',
+                      'ansible==1.9.1'],
     tests_require=['nose >=1.0.0', 'fudge >=1.0.3'],