Merge branch 'master' into master

arthurchadRG · Dec 14, 2017 · 3af6a63 · 3af6a63
2 parents e84aaba + 63c7478
commit 3af6a63
Show file tree

Hide file tree

Showing 321 changed files with 6,104 additions and 3,061 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,9 +1,9 @@
 [bumpversion]
-current_version = 4.0.2
+current_version = 4.1.0
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<releaselevel>[a-z]+)?
-serialize = 
+serialize =
 	{major}.{minor}.{patch}{releaselevel}
 	{major}.{minor}.{patch}
 
@@ -12,4 +12,3 @@ serialize =
 [bumpversion:file:docs/includes/introduction.txt]
 
 [bumpversion:file:README.rst]
-
diff --git a/.coveragerc b/.coveragerc
@@ -14,9 +14,6 @@ omit =
     *celery/task/base.py
     *celery/five.py
     *celery/contrib/sphinx.py
-    *celery/backends/couchdb.py
-    *celery/backends/couchbase.py
-    *celery/backends/riak.py
     *celery/concurrency/asynpool.py
     *celery/utils/debug.py
     *celery/contrib/testing/*

diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,9 @@ python:
   - '3.6'
 os:
     - linux
+stages:
+  - lint
+  - test
 env:
   global:
   - PYTHONUNBUFFERED=yes
@@ -20,40 +23,52 @@ env:
 matrix:
   include:
   - python: '3.5'
-    env: TOXENV=pypy-unit PYPY_VERSION="5.3"
+    env: TOXENV=pypy-unit PYPY_VERSION="pypy2.7-5.8.0"
   - python: '3.5'
-    env: TOXENV=pypy-integration-rabbitmq PYPY_VERSION="5.3"
+    env: TOXENV=pypy-integration-rabbitmq PYPY_VERSION="pypy2.7-5.8.0"
   - python: '3.5'
-    env: TOXENV=pypy-integration-redis PYPY_VERSION="5.3"
+    env: TOXENV=pypy-integration-redis PYPY_VERSION="pypy2.7-5.8.0"
   - python: '3.5'
-    env: TOXENV=pypy-integration-dynamodb PYPY_VERSION="5.3"
+    env: TOXENV=pypy-integration-dynamodb PYPY_VERSION="pypy2.7-5.8.0"
   - python: '3.5'
     env: TOXENV=flake8
+    stage: lint
   - python: '3.5'
     env: TOXENV=flakeplus
+    stage: lint
   - python: '3.5'
     env: TOXENV=apicheck
+    stage: lint
   - python: '3.5'
     env: TOXENV=configcheck
+    stage: lint
+  - python: '3.5'
+    env: TOXENV=bandit
+    stage: lint
   - python: '3.5'
     env: TOXENV=pydocstyle
+    stage: lint
+  - python: '3.5'
+    env: TOXENV=isort-check
+    stage: lint
 before_install:
     - if [[ -v MATRIX_TOXENV ]]; then export TOXENV=${TRAVIS_PYTHON_VERSION}-${MATRIX_TOXENV}; fi; env
     - |
-          if [ "$TOXENV" = "pypy" ]; then
+          if [[ "$TOXENV" =~ "pypy" ]]; then
             export PYENV_ROOT="$HOME/.pyenv"
             if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
               cd "$PYENV_ROOT" && git pull
             else
-              rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
+              rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/pyenv/pyenv.git "$PYENV_ROOT"
             fi
-            "$PYENV_ROOT/bin/pyenv" install "pypy-$PYPY_VERSION"
-            virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
-            source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
+            "$PYENV_ROOT/bin/pyenv" install "$PYPY_VERSION"
+            virtualenv --python="$PYENV_ROOT/versions/$PYPY_VERSION/bin/python" "$HOME/virtualenvs/$PYPY_VERSION"
+            source "$HOME/virtualenvs/$PYPY_VERSION/bin/activate"
+            which python
           fi
     - |
           if [[ "$TOXENV" == *dynamodb ]]; then
-              sudo apt-get update && apt-get install -y default-jre supervisor
+              sudo apt-get update && sudo apt-get install -y default-jre supervisor
               mkdir /opt/dynamodb-local
               cd /opt/dynamodb-local && curl --retry 5 --retry-delay 1 -L http://dynamodb-local.s3-website-us-west-2.amazonaws.com/dynamodb_local_latest.tar.gz | tar zx
               cd -
@@ -65,10 +80,17 @@ before_install:
               sleep 10
               curl localhost:8000
           fi
+    - |
+          wget -qO - https://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
+          sudo apt-add-repository -y 'deb http://packages.couchbase.com/ubuntu trusty trusty/main'
+          sudo apt-get update && sudo apt-get install -y libcouchbase-dev
 after_success:
-  - .tox/$TRAVIS_PYTHON_VERSION/bin/coverage xml
-  - .tox/$TRAVIS_PYTHON_VERSION/bin/codecov -e TOXENV
-install: travis_retry pip install -U tox
+  - |
+          if [[ -v MATRIX_TOXENV || "$TOXENV" =~ "pypy" ]]; then
+              .tox/$TOXENV/bin/coverage xml
+              .tox/$TOXENV/bin/codecov -e TOXENV
+          fi;
+install: travis_retry pip install -U tox | cat
 script: tox -v -- -v
 notifications:
   irc: