From 17acc00aa01c01370edcc26a0d9b29c66501c395 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2020 16:39:03 +0000 Subject: [PATCH 1/3] Bump jmespath from 0.9.5 to 0.10.0 Bumps [jmespath](https://github.com/jmespath/jmespath.py) from 0.9.5 to 0.10.0. - [Release notes](https://github.com/jmespath/jmespath.py/releases) - [Changelog](https://github.com/jmespath/jmespath.py/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/jmespath/jmespath.py/compare/0.9.5...0.10.0) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d60be3d..ab6d9ef 100644 --- a/requirements.txt +++ b/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 From 331b638c059b2295fff97eb90bfaa409f18b5692 Mon Sep 17 00:00:00 2001 From: Lance Hudson Date: Thu, 11 Jun 2020 20:07:41 -0400 Subject: [PATCH 2/3] Update contributing directions --- CONTRIBUTING.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c3a8f48..ea891ac 100644 --- a/CONTRIBUTING.md +++ b/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 From ea5df74c3bade07cf7a90e6f69057ba4f111b50b Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Fri, 12 Jun 2020 07:52:44 -0700 Subject: [PATCH 3/3] If VENV_PYTHON is not specified default to python3 --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index b9ba803..b135122 100755 --- a/script/bootstrap +++ b/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