Separate lock backend from celery backend

.gitignore

@@ -40,6 +40,7 @@ htmlcov/
 .coverage
 .coverage.*
 .cache
+.pytest_cache
 nosetests.xml
 coverage.xml
 *,cover
@@ -93,3 +94,4 @@ ENV/
 .idea/
 requirements*.txt
 .DS_Store
+tests/test_database.sqlite

.travis.yml

@@ -1,24 +1,27 @@
 # Configure.
 language: python
 python:
+  - 3.6
   - 3.4
-  - 3.3
   - pypy
   - 2.7
-  - 2.6
-services: [redis-server]
+services:
+  - redis-server
+  - rabbitmq
 sudo: false
 
 # Environment and matrix.
 env:
-  - BROKER: sqlite
-  - BROKER: mysql
-  - BROKER: postgres
-  - BROKER: redis
-  - BROKER: redis_sock,/tmp/redis.sock
+  - BROKER=sqlite RESULT=sqlite LOCK=sqlite
+  - BROKER=mysql RESULT=mysql LOCK=mysql
+  - BROKER=rabbit RESULT=redis LOCK=redis
+  - BROKER=rabbit RESULT=redis LOCK=filesystem
+  - BROKER=postgres RESULT=postgres LOCK=postgres
+  - BROKER=redis RESULT=redis LOCK=redis
+  - BROKER=redis_sock RESULT=redis_sock LOCK=redis_sock
 matrix:
   include:
-    - python: 3.4
+    - python: 3.6
       services: []
       env: TOX_ENV=lint
       before_script: []
@@ -27,12 +30,8 @@ matrix:
 # Run.
 install: pip install tox
 before_script:
-  - if [[ $BROKER == redis_sock* ]]; then echo -e "daemonize yes\nunixsocket /tmp/redis.sock\nport 0" |redis-server -; fi
-  - if [ $BROKER == mysql ]; then mysql -u root -e 'CREATE DATABASE flask_celery_helper_test;'; fi
-  - if [ $BROKER == mysql ]; then mysql -u root -e 'GRANT ALL PRIVILEGES ON flask_celery_helper_test.* TO "user"@"localhost" IDENTIFIED BY "pass";'; fi
-  - if [ $BROKER == postgres ]; then psql -U postgres -c 'CREATE DATABASE flask_celery_helper_test;'; fi
-  - if [ $BROKER == postgres ]; then psql -U postgres -c "CREATE USER user1 WITH PASSWORD 'pass';"; fi
-  - if [ $BROKER == postgres ]; then psql -U postgres -c 'GRANT ALL PRIVILEGES ON DATABASE flask_celery_helper_test TO user1;'; fi
+  - ./testdata/travis/setup.sh
+
 script: tox -e ${TOX_ENV:-py}
 after_success:
   - bash <(curl -s https://codecov.io/bash)
@@ -47,5 +46,5 @@ deploy:
       bKa8bxjRurUEHedjV9UG9fVZwVsWU981aWOxeEl+6kLkpJ2fE9UVeK7T1O+RzzhkWhHq2/YL\
       4BjBqzOLuBSAGnXZAnwH55Z6HY2g="
   on:
-    condition: $TRAVIS_PYTHON_VERSION = 3.4
+    condition: $TRAVIS_PYTHON_VERSION = 3.6
     tags: true

README.rst

@@ -8,8 +8,8 @@ I need an init_app() method to initialize Celery after I instantiate it.
 
 This extension also comes with a ``single_instance`` method.
 
-* Python 2.6, 2.7, PyPy, 3.3, and 3.4 supported on Linux and OS X.
-* Python 2.7, 3.3, and 3.4 supported on Windows (both 32 and 64 bit versions of Python).
+* Python 2.6, 2.7, PyPy, 3.3, 3.4 and 3.6 supported on Linux and OS X.
+* Python 2.7, 3.4 and 3.6 supported on Windows (both 32 and 64 bit versions of Python).
 
 .. image:: https://img.shields.io/appveyor/ci/Robpol86/Flask-Celery-Helper/master.svg?style=flat-square&label=AppVeyor%20CI
     :target: https://ci.appveyor.com/project/Robpol86/Flask-Celery-Helper
@@ -64,6 +64,7 @@ Basic Example
     app = Flask('example')
     app.config['CELERY_BROKER_URL'] = 'redis://localhost'
     app.config['CELERY_RESULT_BACKEND'] = 'redis://localhost'
+    app.config['CELERY_TASK_LOCK_BACKEND'] = 'redis://localhost'
     celery = Celery(app)
 
     @celery.task()
@@ -102,6 +103,7 @@ Factory Example
         app.config['CELERY_IMPORTS'] = ('tasks.add_together', )
         app.config['CELERY_BROKER_URL'] = 'redis://localhost'
         app.config['CELERY_RESULT_BACKEND'] = 'redis://localhost'
+        app.config['CELERY_TASK_LOCK_BACKEND'] = 'redis://localhost'
         celery.init_app(app)
         return app
 
@@ -137,6 +139,7 @@ Single Instance Example
     app.config['REDIS_URL'] = 'redis://localhost'
     app.config['CELERY_BROKER_URL'] = 'redis://localhost'
     app.config['CELERY_RESULT_BACKEND'] = 'redis://localhost'
+    app.config['CELERY_TASK_LOCK_BACKEND'] = 'redis://localhost'
     celery = Celery(app)
     Redis(app)
 

appveyor.yml

@@ -3,94 +3,212 @@ services:
   - mysql
   - postgresql
 
+cache:
+  - "%HOMEDRIVE%%HOMEPATH%\rabbitmq-server-3.7.6.exe"
+
 # Environment and matrix.
 environment:
   PATH: C:\%PYTHON%;C:\%PYTHON%\Scripts;C:\Program Files\MySQL\MySQL Server 5.7\bin;C:\Program Files\PostgreSQL\9.5\bin;%PATH%
   PGPASSWORD: Password12!
-  PYTHON: Python34
+  PYTHON: Python36
   matrix:
+    - TOX_ENV: lint
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: redis
+    - TOX_ENV: py34
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: redis
+    - TOX_ENV: py36
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: redis
+    - TOX_ENV: py27
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: redis
+    - TOX_ENV: py
+      PYTHON: Python34-x64
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: redis
+    - TOX_ENV: py
+      PYTHON: Python36-x64
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: redis
+    - TOX_ENV: py
+      PYTHON: Python27-x64
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: redis
+
+    - TOX_ENV: lint
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: filesystem
+    - TOX_ENV: py34
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: filesystem
+    - TOX_ENV: py36
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: filesystem
+    - TOX_ENV: py27
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: filesystem
+    - TOX_ENV: py
+      PYTHON: Python34-x64
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: filesystem
+    - TOX_ENV: py
+      PYTHON: Python36-x64
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: filesystem
+    - TOX_ENV: py
+      PYTHON: Python27-x64
+      BROKER: rabbit
+      RESULT: redis
+      LOCK: filesystem
+
+
     - TOX_ENV: lint
       BROKER: sqlite
+      RESULT: sqlite
+      LOCK: sqlite
     - TOX_ENV: py34
       BROKER: sqlite
-    - TOX_ENV: py33
+      RESULT: sqlite
+      LOCK: sqlite
+    - TOX_ENV: py36
       BROKER: sqlite
+      RESULT: sqlite
+      LOCK: sqlite
     - TOX_ENV: py27
       BROKER: sqlite
+      RESULT: sqlite
+      LOCK: sqlite
     - TOX_ENV: py
       PYTHON: Python34-x64
       BROKER: sqlite
+      RESULT: sqlite
+      LOCK: sqlite
     - TOX_ENV: py
-      PYTHON: Python33-x64
+      PYTHON: Python36-x64
       BROKER: sqlite
+      RESULT: sqlite
+      LOCK: sqlite
     - TOX_ENV: py
       PYTHON: Python27-x64
       BROKER: sqlite
+      RESULT: sqlite
+      LOCK: sqlite
 
     - TOX_ENV: lint
       BROKER: mysql
+      RESULT: mysql
+      LOCK: mysql
     - TOX_ENV: py34
       BROKER: mysql
-    - TOX_ENV: py33
+      RESULT: mysql
+      LOCK: mysql
+    - TOX_ENV: py36
       BROKER: mysql
+      RESULT: mysql
+      LOCK: mysql
     - TOX_ENV: py27
       BROKER: mysql
+      RESULT: mysql
+      LOCK: mysql
     - TOX_ENV: py
       PYTHON: Python34-x64
       BROKER: mysql
+      RESULT: mysql
+      LOCK: mysql
     - TOX_ENV: py
-      PYTHON: Python33-x64
+      PYTHON: Python36-x64
       BROKER: mysql
+      RESULT: mysql
+      LOCK: mysql
     - TOX_ENV: py
       PYTHON: Python27-x64
       BROKER: mysql
+      RESULT: mysql
+      LOCK: mysql
 
     - TOX_ENV: lint
       BROKER: postgres
+      RESULT: postgres
+      LOCK: postgres
     - TOX_ENV: py34
       BROKER: postgres
-    - TOX_ENV: py33
+      RESULT: postgres
+      LOCK: postgres
+    - TOX_ENV: py36
       BROKER: postgres
+      RESULT: postgres
+      LOCK: postgres
     - TOX_ENV: py27
       BROKER: postgres
+      RESULT: postgres
+      LOCK: postgres
     - TOX_ENV: py
       PYTHON: Python34-x64
       BROKER: postgres
+      RESULT: postgres
+      LOCK: postgres
     - TOX_ENV: py
-      PYTHON: Python33-x64
+      PYTHON: Python36-x64
       BROKER: postgres
+      RESULT: postgres
+      LOCK: postgres
     - TOX_ENV: py
       PYTHON: Python27-x64
       BROKER: postgres
+      RESULT: postgres
+      LOCK: postgres
 
     - TOX_ENV: lint
       BROKER: redis
+      RESULT: redis
+      LOCK: redis
     - TOX_ENV: py34
       BROKER: redis
-    - TOX_ENV: py33
+      RESULT: redis
+      LOCK: redis
+    - TOX_ENV: py36
       BROKER: redis
+      RESULT: redis
+      LOCK: redis
     - TOX_ENV: py27
       BROKER: redis
+      RESULT: redis
+      LOCK: redis
     - TOX_ENV: py
       PYTHON: Python34-x64
       BROKER: redis
+      RESULT: redis
+      LOCK: redis
     - TOX_ENV: py
-      PYTHON: Python33-x64
+      PYTHON: Python36-x64
       BROKER: redis
+      RESULT: redis
+      LOCK: redis
     - TOX_ENV: py
       PYTHON: Python27-x64
       BROKER: redis
+      RESULT: redis
+      LOCK: redis
 
 # Run.
 build_script: pip install tox
 after_build:
-  - IF %BROKER% EQU redis cinst redis-64
-  - IF %BROKER% EQU redis redis-server --service-install
-  - IF %BROKER% EQU redis redis-server --service-start
-  - IF %BROKER% EQU mysql mysql -u root -p"Password12!" -e "CREATE DATABASE flask_celery_helper_test;"
-  - IF %BROKER% EQU mysql mysql -u root -p"Password12!" -e "GRANT ALL PRIVILEGES ON flask_celery_helper_test.* TO 'user'@'localhost' IDENTIFIED BY 'pass';"
-  - IF %BROKER% EQU postgres psql -U postgres -c "CREATE DATABASE flask_celery_helper_test;"
-  - IF %BROKER% EQU postgres psql -U postgres -c "CREATE USER user1 WITH PASSWORD 'pass';"
-  - IF %BROKER% EQU postgres psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE flask_celery_helper_test TO user1;"
+  - ps: .\testdata\appveyor\setup.ps1
+
 test_script: tox -e %TOX_ENV%
 on_success: IF %TOX_ENV% NEQ lint pip install codecov & codecov