drop requirements.txt

binux · binux · commit 3abe6191d3f4 · 2015-06-03T17:08:07.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -16,10 +16,7 @@ before_install:
     - echo "START=yes" | sudo tee -a /etc/default/beanstalkd > /dev/null
     - sudo service beanstalkd start
 install:
-    - pip install --allow-all-external -r requirements.txt
-    - pip install coveralls httpbin pyproxy>=0.1.6
-    - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then travis_retry pip install beanstalkc; fi
-    - pip install -e .
+    - pip install --allow-all-external -e .[all,test]
 script:
     - coverage run setup.py test
 after_success:
diff --git a/pyspider/message_queue/rabbitmq.py b/pyspider/message_queue/rabbitmq.py
@@ -24,18 +24,25 @@
 def catch_error(func):
     """Catch errors of rabbitmq then reconnect"""
     import amqp
-    import pika.exceptions
+    try:
+        import pika.exceptions
+        connect_exceptions = (
+            pika.exceptions.ConnectionClosed,
+            pika.exceptions.AMQPConnectionError,
+        )
+    except ImportError:
+        connect_exceptions = ()
+
+    connect_exceptions += (
+        select.error,
+        socket.error,
+        amqp.ConnectionError
+    )
 
     def wrap(self, *args, **kwargs):
         try:
             return func(self, *args, **kwargs)
-        except (
-                select.error,
-                socket.error,
-                pika.exceptions.ConnectionClosed,
-                pika.exceptions.AMQPConnectionError,
-                amqp.ConnectionError
-        ) as e:
+        except connect_exceptions as e:
             logging.error('RabbitMQ error: %r, reconnect.', e)
             self.reconnect()
             return func(self, *args, **kwargs)
diff --git a/setup.py b/setup.py
@@ -5,6 +5,8 @@
 #         http://binux.me
 # Created on 2014-11-24 22:27:45
 
+
+import sys
 from setuptools import setup, find_packages
 from codecs import open
 from os import path
@@ -13,8 +15,43 @@
 with open(path.join(here, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
-
 import pyspider
+
+install_requires = [
+    'Flask>=0.10',
+    'Jinja2>=2.7',
+    'chardet>=2.2',
+    'cssselect>=0.9',
+    'lxml',
+    'pycurl',
+    'pyquery',
+    'requests>=2.2',
+    'tornado>=3.2',
+    'Flask-Login>=0.2.11',
+    'u-msgpack-python>=1.6',
+    'click>=3.3',
+    'six',
+]
+if sys.version_info < (3, 0):
+    install_requires.extend([
+        'wsgidav',
+    ])
+
+extras_require_all = [
+    'mysql-connector-python>=1.2.2',
+    'amqp>=1.3.0',
+    'pymongo>=2.7.2,<3.0',
+    'SQLAlchemy>=0.9.7',
+    'redis',
+    'kombu',
+]
+if sys.version_info < (3, 0):
+    extras_require_all.extend([
+        'pika>=0.9.14',
+        'beanstalkc',
+    ])
+
+
 setup(
     name='pyspider',
     version=pyspider.__version__,
@@ -53,33 +90,16 @@
 
     packages=find_packages(exclude=['data', 'tests*']),
 
-    install_requires=[
-        'Flask>=0.10',
-        'Jinja2>=2.7',
-        'chardet>=2.2',
-        'cssselect>=0.9',
-        'lxml',
-        'pycurl',
-        'pyquery',
-        'requests>=2.2',
-        'tornado>=3.2',
-        'Flask-Login>=0.2.11',
-        'u-msgpack-python>=1.6',
-        'click>=3.3',
-        'six',
-    ],
+    install_requires=install_requires,
 
     extras_require={
-        'all': [
-            'mysql-connector-python>=1.2.2',
-            'pika>=0.9.14',
-            'amqp>=1.3.0',
-            'pymongo>=2.7.2,<3.0',
+        'all': extras_require_all,
+        'test': [
             'unittest2>=0.5.1',
-            'SQLAlchemy>=0.9.7',
-            'redis',
-            'kombu',
-        ],
+            'coverage',
+            'httpbin',
+            'pyproxy>=0.1.6',
+        ]
     },
 
     package_data={
diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,7 @@
 [tox]
 envlist = py26,py27,py33,py34
 [testenv]
-deps =
-    -rrequirements.txt
-    coverage
-    httpbin
-    pyproxy>=0.1.6
-    py{26,27}: beanstalkc
-install_command = pip install --allow-all-external {opts} {packages}
+install_command = pip install --allow-all-external {opts} -e .[all,test] {packages}
 commands =
     coverage erase
     coverage run setup.py test []
