Merge branch 'feature/invoke-0.13' into develop

Author: felliott

.travis.yml

@@ -16,7 +16,7 @@ install:
   - travis_retry pip install --upgrade pip
   - travis_retry pip install setuptools==30.4.0
   - travis_retry pip install wheel==0.26.0
-  - travis_retry pip install invoke==0.11.1
+  - travis_retry pip install invoke==0.13.0
   - travis_retry invoke wheelhouse --develop
   - travis_retry invoke install --develop
 

CONTRIBUTING.rst

@@ -45,7 +45,7 @@ Configure development environment and Install the development dependencies.
     $ pip install virtualenv
     $ pip install virtualenvwrapper
     $ mkvirtualenv --python=`which python3` mfr
-    $ pip install invoke==0.11.1
+    $ pip install invoke==0.13.0
 
 
 Lastly, install mfr in development mode. ::

README.md

@@ -41,7 +41,7 @@ pip install virtualenv
 pip install virtualenvwrapper
 mkvirtualenv --python=`which python3.5` mfr
 pip install setuptools==30.4.0
-pip install invoke==0.11.1
+pip install invoke==0.13.0
 invoke install
 invoke server
 ```
@@ -90,6 +90,8 @@ invoke test
 
 - The error `def create_default_context(purpose=ssl.Purpose.SERVER_AUTH, *, cafile=None, capath=None, cadata=None): SyntaxError: invalid syntax` can be fixed by restarting your virtual environment. The problem should not reoccur.
 
+- `invoke $command` results in `'$command' did not receive all required positional arguments!`: this error message occurs when trying to run MFR v0.19.0+ with `invoke<0.13.0`.  Run `pip install invoke==0.13.0`, then retry your command.
+
 ### Create your own module
 
 Interested in adding support for a new provider or file format? Check out the CONTRIBUTING.rst docs.

docs/install.rst

@@ -16,13 +16,13 @@ Or download one of the following:
 
 Make sure that you have installed pspp, are using python3.5, and have installed invoke for your current python3 version.
 
-Install the version of invoke found in the requirements.txt file. Currently 0.11.1
+Install the version of invoke found in the requirements.txt file. Currently 0.13.0
 
 Install ``invoke``:
 
 .. code-block:: bash
 
-    pip install invoke==0.11.1
+    pip install invoke==0.13.0
 
 Install requirements:
 

requirements.txt

@@ -2,7 +2,7 @@ aiohttp==0.18.4
 chardet==2.3.0
 furl==0.4.2
 humanfriendly==2.1
-invoke==0.11.1
+invoke==0.13.0
 mako==1.0.1
 raven==5.27.0
 setuptools==30.4.0

tasks.py

@@ -1,11 +1,11 @@
 import os
 
-from invoke import task, run
+from invoke import task
 
 WHEELHOUSE_PATH = os.environ.get('WHEELHOUSE')
 
 
-def monkey_patch():
+def monkey_patch(ctx):
     # Force an older cacert.pem from certifi v2015.4.28, prevents an ssl failure w/ identity.api.rackspacecloud.com.
     #
     # SubjectAltNameWarning: Certificate for identity.api.rackspacecloud.com has no `subjectAltName`, falling
@@ -25,40 +25,40 @@ def create_default_context(purpose=ssl.Purpose.SERVER_AUTH, *, cafile=None, capa
 
 
 @task
-def wheelhouse(develop=False):
+def wheelhouse(ctx, develop=False):
     req_file = 'dev-requirements.txt' if develop else 'requirements.txt'
     cmd = 'pip wheel --find-links={} -r {} --wheel-dir={}'.format(WHEELHOUSE_PATH, req_file, WHEELHOUSE_PATH)
-    run(cmd, pty=True)
+    ctx.run(cmd, pty=True)
 
 
 @task
-def install(develop=False):
-    run('python setup.py develop')
+def install(ctx, develop=False):
+    ctx.run('python setup.py develop')
     req_file = 'dev-requirements.txt' if develop else 'requirements.txt'
     cmd = 'pip install --upgrade -r {}'.format(req_file)
 
     if WHEELHOUSE_PATH:
         cmd += ' --no-index --find-links={}'.format(WHEELHOUSE_PATH)
-    run(cmd, pty=True)
+    ctx.run(cmd, pty=True)
 
 
 @task
-def flake():
-    run('flake8 .', pty=True)
+def flake(ctx):
+    ctx.run('flake8 .', pty=True)
 
 
 @task
-def test(verbose=False):
-    flake()
+def test(ctx, verbose=False):
+    flake(ctx)
     cmd = 'py.test --cov-report term-missing --cov mfr tests'
     if verbose:
         cmd += ' -v'
-    run(cmd, pty=True)
+    ctx.run(cmd, pty=True)
 
 
 @task
-def server():
-    monkey_patch()
+def server(ctx):
+    monkey_patch(ctx)
 
     if os.environ.get('REMOTE_DEBUG', None):
         import pydevd