Updated dependency information for dateutil-2.1 support.

JNRowe · JNRowe · commit 55d92f326816 · 2012-05-23T05:52:55.000+01:00
This has become quite messy, to the point that I had a little look for
a hackable replacement.
diff --git a/doc/install.rst b/doc/install.rst
@@ -33,5 +33,6 @@ handling [#]_.  :pypi:`simplejson` is also required when using :mod:`github2`
 with Python 2.4 or 2.5.  If you install via :pypi:`pip` or :pypi:`easy_install
 <setuptools>` the dependencies should be installed automatically for you.
 
-.. [#] You must use :pypi:`python-dateutil` 1.x when working with Python 2.x,
-       the latest 2.x releases are for Python 3.x installations only.
+.. [#] You must use :pypi:`python-dateutil` 1.x when working with Python 2.5 or
+       earlier, the latest 2.x releases are for Python 2.6 and newer
+       installations only.
diff --git a/extra/requirements-py25.txt b/extra/requirements-py25.txt
@@ -1,2 +1,3 @@
--r requirements.txt
-simplejson>=2.0.9
+httplib2 >= 0.7.0
+python-dateutil < 2.0, >= 2.1
+simplejson >= 2.0.9
diff --git a/extra/requirements-py3.txt b/extra/requirements-py3.txt
diff --git a/extra/requirements.txt b/extra/requirements.txt
@@ -1,2 +1,2 @@
-httplib2>=0.7.0
-python-dateutil<2.0
+httplib2 >= 0.7.0
+python-dateutil < 2.0
diff --git a/setup.py b/setup.py
@@ -23,10 +23,14 @@
 if sys.version_info[:2] < (2, 6):
     install_requires.append('simplejson >= 2.0.9')
 
-if sys.version_info >= (3,):
-    install_requires.append('python-dateutil >= 2.0')
-else:
+# dateutil supports python 2.x in dateutil-1, python 3.x in dateutil-2.0 and
+# python 2.6+ in dateutil-2.1.  Exciting…
+if sys.version_info[:2] <= (2, 5):
     install_requires.append('python-dateutil < 2.0')
+elif sys.version_info < (3, ):
+    install_requires.append('python-dateutil < 2.0, >= 2.1')
+else:
+    install_requires.append('python-dateutil > 2.0')
 
 long_description = (codecs.open('README.rst', "r", "utf-8").read()
     + "\n" + codecs.open('NEWS.rst', "r", "utf-8").read())
