Browse Source

Now depends on kombu >=2.2.0

Ask Solem 12 years ago
parent
commit
65fd2f0b6e
3 changed files with 2 additions and 8 deletions
  1. 1 1
      requirements/default.txt
  2. 1 1
      setup.cfg
  3. 0 6
      tox.ini

+ 1 - 1
requirements/default.txt

@@ -1,3 +1,3 @@
 billiard>=2.7.3.9
 python-dateutil>=1.5,<2.0
-kombu>=2.1.8,<3.0
+kombu>=2.2.0,<3.0

+ 1 - 1
setup.cfg

@@ -18,5 +18,5 @@ requires = uuid
            importlib
            billiard>=2.7.3.9
            python-dateutil >= 1.5
-           kombu >= 2.1.8
+           kombu >= 2.2.0
            ordereddict

+ 0 - 6
tox.ini

@@ -16,7 +16,6 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
            {envbindir}/pip install                              \
                 --download-cache={toxworkdir}/_download         \
                 -r{toxinidir}/requirements/test-py3k.txt
-           pip install -U https://github.com/celery/kombu/zipball/master
 
            {toxinidir}/contrib/release/py3k-run-tests {toxinidir}
 
@@ -30,7 +29,6 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
            {envbindir}/pip install                              \
                 --download-cache={toxworkdir}/_download         \
                 -r{toxinidir}/requirements/test-py3k.txt
-           pip install -U https://github.com/celery/kombu/zipball/master
 
            {toxinidir}/contrib/release/py3k-run-tests {toxinidir}
 
@@ -39,7 +37,6 @@ basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
 commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
-           pip install -U https://github.com/celery/kombu/zipball/master
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3 --cover3-xml              \
@@ -52,7 +49,6 @@ deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/py26.txt
        -r{toxinidir}/requirements/test.txt
 commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
-           pip install -U https://github.com/celery/kombu/zipball/master
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3 --cover3-xml              \
@@ -65,7 +61,6 @@ deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/py25.txt
        -r{toxinidir}/requirements/test.txt
 commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
-           pip install -U https://github.com/celery/kombu/zipball/master
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3 --cover3-xml              \
@@ -77,7 +72,6 @@ basepython = pypy
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test-pypy.txt
 commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
-           pip install -U https://github.com/celery/kombu/zipball/master
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3 --cover3-xml              \