Permalink
Browse files

Updated dependency information for dateutil-2.1 support.

This has become quite messy, to the point that I had a little look for
a hackable replacement.
  • Loading branch information...
1 parent 63d0a7c commit 55d92f3268163c3bef902bdb06be706993dd33b5 @JNRowe JNRowe committed May 23, 2012
Showing with 15 additions and 11 deletions.
  1. +3 −2 doc/install.rst
  2. +3 −2 extra/requirements-py25.txt
  3. +0 −2 extra/requirements-py3.txt
  4. +2 −2 extra/requirements.txt
  5. +7 −3 setup.py
View
@@ -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.
@@ -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
@@ -1,2 +0,0 @@
-httplib2>=0.7.0
-python-dateutil>=2.0
View
@@ -1,2 +1,2 @@
-httplib2>=0.7.0
-python-dateutil<2.0
+httplib2 >= 0.7.0
+python-dateutil < 2.0
View
@@ -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())

0 comments on commit 55d92f3

Please sign in to comment.