requirements/extra-py3k replaces default-py3k to only add pytz as an addition

requirements/README.rst

@@ -10,9 +10,9 @@ Index
 
     Default requirements for Python 2.7+.
 
-* :file:`requirements/default-py3k.txt`
+* :file:`requirements/extra-py3k.txt`
 
-    Default requirements for Python 3.2+.
+    Extra requirements for Python 3.2+.
 
 * :file:`requirements/jython.txt`
 
@@ -46,6 +46,15 @@ Index
 Examples
 ========
 
+Installing requirements for running Python 3
+--------------------------------------------
+
+::
+
+    $ pip install -U -r requirements/default.txt
+    $ pip install -U -r requirements/extra-py3k.txt
+
+
 Running the tests
 -----------------
 

requirements/default-py3k.txt

@@ -1,4 +0,0 @@
-billiard>=2.7.3.13
-python-dateutil>=2.1
-kombu>=2.4.6,<3.0
-pytz

requirements/extra-py3k.txt

@@ -0,0 +1 @@
+pytz

setup.py

@@ -151,8 +151,9 @@ def reqs(f):
     return filter(None, [strip_comments(l) for l in open(
         os.path.join(os.getcwd(), 'requirements', f)).readlines()])
 
-install_requires = reqs('default-py3k.txt' if is_py3k else 'default.txt')
-
+install_requires = reqs('default.txt')
+if is_py3k:
+    install_requires.extend(reqs('extra-py3k.txt'))
 if is_jython:
     install_requires.extend(reqs('jython.txt'))
 

tox.ini

@@ -10,7 +10,8 @@ commands = nosetests
 recreate = True
 basepython = python3.2
 changedir = .tox
-deps = -r{toxinidir}/requirements/default-py3k.txt
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/extra-py3k.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/easy_install -U distribute
            {envbindir}/pip install                              \
@@ -24,7 +25,8 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
 recreate = True
 basepython = python3.3
 changedir = .tox
-deps = -r{toxinidir}/requirements/default-py3k.txt
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/extra-py3k.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/easy_install -U distribute
            {envbindir}/pip install                              \