Now depends on Kombu 4 from PyPI

marcusmchale · Oct 31, 2016 · 9fbd208 · 9fbd208
1 parent d854e07
commit 9fbd208
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 11 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -463,6 +463,8 @@ install the development requirements first:
 
     $ pip install -U -r requirements/dev.txt
 
+THIS REQUIREMENT FILE MAY NOT BE PRESENT, SKIP IF NOT FOUND.
+
 Both the stable and the development version have testing related
 dependencies, so install these next:
 

diff --git a/README.rst b/README.rst
@@ -315,6 +315,13 @@ Transports and Backends
 :``celery[consul]``:
     for using the Consul.io Key/Value store as a message transport or result backend (*experimental*).
 
+:``celery[django]``
+    specifies the lowest version possible for Django support.
+
+    You should probably not use this in your requirements, it's here
+    for informational purposes only.
+
+
 .. _celery-installing-from-source:
 
 Downloading and installing from source

diff --git a/appveyor.yml b/appveyor.yml
@@ -37,7 +37,6 @@ init:
 install:
   - "powershell extra\\appveyor\\install.ps1"
   - "%PYTHON%/Scripts/pip.exe install -U setuptools"
-  - "%PYTHON%/Scripts/pip.exe install -r requirements/dev.txt"
 
 build: off
 

diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -463,6 +463,8 @@ install the development requirements first:
 
     $ pip install -U -r requirements/dev.txt
 
+THIS REQUIREMENT FILE MAY NOT BE PRESENT, SKIP IF NOT FOUND.
+
 Both the stable and the development version have testing related
 dependencies, so install these next:
 

diff --git a/requirements/README.rst b/requirements/README.rst
@@ -46,7 +46,7 @@ Index
 * :file:`requirements/dev.txt`
 
     Requirement file installing the current dev branch of Celery and
-    dependencies.
+    dependencies (will not be present in stable branches).
 
 Examples
 ========

diff --git a/requirements/default.txt b/requirements/default.txt
@@ -1,3 +1,3 @@
 pytz>dev
 billiard>=3.5.0.1,<3.6.0
-kombu>dev
+kombu>=4.0,<5.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1,4 +1,3 @@
 sphinx_celery>=1.3
 typing
 -r extras/sqlalchemy.txt
--r dev.txt
diff --git a/requirements/test-ci-base.txt b/requirements/test-ci-base.txt
@@ -3,4 +3,3 @@ codecov
 -r extras/redis.txt
 -r extras/sqlalchemy.txt
 -r extras/pymemcache.txt
--r dev.txt
diff --git a/tox.ini b/tox.ini
@@ -26,7 +26,6 @@ deps=
 sitepackages = False
 recreate = False
 commands =
-    pip install -U -r{toxinidir}/requirements/dev.txt
     unit: py.test -xv
     integration: py.test -xsv t/integration
 setenv =
@@ -48,24 +47,20 @@ basepython =
 
 [testenv:cov]
 commands =
-    pip install -U -r{toxinidir}/requirements/dev.txt
     py.test -xv --cov=celery --cov-report=xml
     coverage xml
     codecov -e TOXENV --token=bb6ecc30-6d40-4f57-942e-406f5f579198 --required
 
 [testenv:apicheck]
 commands =
-    pip install -U -r{toxinidir}/requirements/dev.txt
     sphinx-build -b apicheck -d {envtmpdir}/doctrees docs docs/_build/apicheck
 
 [testenv:configcheck]
 commands =
-    pip install -U -r{toxinidir}/requirements/dev.txt
     sphinx-build -b configcheck -d {envtmpdir}/doctrees docs docs/_build/configcheck
 
 [testenv:linkcheck]
 commands =
-    pip install -U -r{toxinidir}/requirements/dev.txt
     sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees docs docs/_build/linkcheck
 
 [testenv:flake8]