Merge branch 'master' into powerdns-4.3.x-support

CONTRIBUTING.md

@@ -11,12 +11,13 @@ If you have questions, or you'd like to check with us before embarking on a majo
 This project uses the [GitHub Flow](https://guides.github.com/introduction/flow/). That means that the `master` branch is stable and new development is done in feature branches. Feature branches are merged into the `master` branch via a Pull Request.
 
 0. Fork and clone the repository
-0. Configure and install the dependencies: `script/bootstrap`
-0. Make sure the tests pass on your machine: `script/test`
+0. Configure and install the dependencies: `./script/bootstrap`
+0. Activate virtual environment: `source env/bin/activate`
+0. Make sure the tests pass on your machine: `./script/test`
 0. Create a new branch: `git checkout -b my-branch-name`
 0. Make your change, add tests, and make sure the tests still pass
 0. Make sure that `./script/lint` passes without any warnings
-0. Make sure that coverage is at :100:% `script/coverage` and open `htmlcov/index.html`
+0. Make sure that coverage is at :100:% `./script/coverage` and open `htmlcov/index.html`
    * You can open PRs for :eyes: & discussion prior to this
 0. Push to your fork and submit a pull request
 

requirements.txt

@@ -11,7 +11,7 @@ futures==3.2.0; python_version < '3.0'
 google-cloud-core==1.3.0
 google-cloud-dns==0.32.0
 ipaddress==1.0.23
-jmespath==0.9.5
+jmespath==0.10.0
 msrestazure==0.6.3
 natsort==6.2.1
 ns1-python==0.16.0

script/bootstrap

@@ -13,7 +13,7 @@ fi
 
 if [ ! -d "$VENV_NAME" ]; then
     if [ -z "$VENV_PYTHON" ]; then
-        VENV_PYTHON=$(command -v python)
+        VENV_PYTHON=$(command -v python3)
     fi
     virtualenv --python="$VENV_PYTHON" "$VENV_NAME"
 fi