[RELEASE] - Release version 2.0.2 - Python3 required

Author: amuraru

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.0
+current_version = 2.0.2
 commit = True
 tag = True
 tag_name = {new_version}

.travis.yml

@@ -25,7 +25,15 @@ script:
 # Killing background sleep loop
 - kill %1
 
+before_deploy:
+  - git add requirements.txt
 deploy:
+  - provider: pypi
+    user: adobe
+    password:
+      secure: lRjP7ej0IeJilu8JedGfKS9an9JZNGLYG6ODdMbfJODblvEWzImjBkHXUeVAJ7YVmppT2kv5f2zGfrO2JiFUVevnlvlbRU0owQf2kCRIeDmafqqHk9WwdsWuOHDbRZ5zE+hkP7dQh3XG4OM3f9//9CI0gk19AkZs5d76aFrDgjkIAMMV7aMw2gz7blkHU/n7ZKRdcLzsdFOFrSS507kiI1x3NTGgzCU+1jYqds6JLLVJMXCVlSlxQV9SkP3HcvE+JIVQ9UfsuwwoFFFAOm/tEYmJAMIeOhIbCNcXYRdwRHByoEuG3OHIChLKfPpf+c47G1oReFPtSmZVbYHdkr3gPoKU05X0zbNY8lN/biuYq6ykp0nB6+swst3kG/l4HRx5WaCtPDB6TefTzFtIvwETuAKdFq6UoB1sSgu3GAK2hucFPsKYLEXPct2i8O3GAtgUrT5VSPgx9oEk9fNqhonP2kC95yEiBeRdZ7ZdqWdFKApQccBmrncp/vRVPDKAlGWiVg22yPYbbxgW/f7qX2vvCqc9BUJFsgv4FfInHWhfWA6pX6slNIEj/92g8ecBGBDPGTojIAZ2GpU6DFzlGMhNQWQm7XJaq/s/E6ZaUfi9JkT3MmEX5YZ+01yh2ovQR1wq/ZyxdUkQS1DBvrk8sIV8ZUFurpNV8uILUtLr8eJUyUs=
+    on:
+      tags: true
   - provider: releases
     api_key: "$GITHUB_API_KEY"
     skip_cleanup: true
@@ -37,9 +45,4 @@ deploy:
     script: bash build_scripts/docker_push.sh
     on:
       tags: true
-  - provider: pypi
-    user: adobe
-    password:
-      secure: lRjP7ej0IeJilu8JedGfKS9an9JZNGLYG6ODdMbfJODblvEWzImjBkHXUeVAJ7YVmppT2kv5f2zGfrO2JiFUVevnlvlbRU0owQf2kCRIeDmafqqHk9WwdsWuOHDbRZ5zE+hkP7dQh3XG4OM3f9//9CI0gk19AkZs5d76aFrDgjkIAMMV7aMw2gz7blkHU/n7ZKRdcLzsdFOFrSS507kiI1x3NTGgzCU+1jYqds6JLLVJMXCVlSlxQV9SkP3HcvE+JIVQ9UfsuwwoFFFAOm/tEYmJAMIeOhIbCNcXYRdwRHByoEuG3OHIChLKfPpf+c47G1oReFPtSmZVbYHdkr3gPoKU05X0zbNY8lN/biuYq6ykp0nB6+swst3kG/l4HRx5WaCtPDB6TefTzFtIvwETuAKdFq6UoB1sSgu3GAK2hucFPsKYLEXPct2i8O3GAtgUrT5VSPgx9oEk9fNqhonP2kC95yEiBeRdZ7ZdqWdFKApQccBmrncp/vRVPDKAlGWiVg22yPYbbxgW/f7qX2vvCqc9BUJFsgv4FfInHWhfWA6pX6slNIEj/92g8ecBGBDPGTojIAZ2GpU6DFzlGMhNQWQm7XJaq/s/E6ZaUfi9JkT3MmEX5YZ+01yh2ovQR1wq/ZyxdUkQS1DBvrk8sIV8ZUFurpNV8uILUtLr8eJUyUs=
-    on:
-      tags: true
+  

README.md

@@ -1,15 +1,19 @@
 # Ops CLI
 [![Build Status](https://www.travis-ci.com/adobe/ops-cli.svg?token=8uHqfhgsxdvJ93qWAxhn&branch=master)](https://www.travis-ci.com/adobe/ops-cli) [![Docker pull](https://img.shields.io/docker/pulls/adobe/ops-cli)](https://hub.docker.com/r/adobe/ops-cli) [![](https://images.microbadger.com/badges/version/adobe/ops-cli.svg)](https://microbadger.com/images/adobe/ops-cli "Get your own version badge on microbadger.com") [![License](https://img.shields.io/github/license/adobe/ops-cli)](https://github.com/adobe/ops-cli/blob/master/LICENSE)
 
+**From version 2.0 onward, `ops-cli` requires Python3.  
+If you're still using Python2, use `ops-cli` version <2.0**
+
 **ops-cli** is a python wrapper for [Terraform](https://www.terraform.io/), [Ansible](https://www.ansible.com/) and SSH for cloud automation. 
 
 We use multiple tools to manage our infrastructure at Adobe. The purpose of `ops-cli` is to gather the common cluster configurations in a single place and, based on these, interact with the above mentioned tools. In this way, we can avoid duplication and can quickly spin up new clusters (either production or development ones). All we need to do is customize the cluster configuration file ([example here](https://github.com/adobe/ops-cli/blob/master/examples/aws-kubernetes/clusters/my-kubernetes-cluster.yaml)).
 
 `ops-cli` integrates with the Azure and AWS cli, in order to provide inventory, ssh, sync, tunnel and the possibility to run ansible playbooks on a fleet of EC2 instances.
 It can be used to add a layer of templating (using jinja2) on top of Terraform files. This is useful for removing duplicated code when it comes to spinning up infrastructure across multiple environments (stage/sandbox/prod) and across teams. Useful for both AWS and [Kubernetes deployments](https://github.com/adobe/ops-cli/tree/master/examples/aws-kubernetes).
 
-Table of Contents
-=================
+# Table of Contents
+
+<!--ts-->
    * [How it works?](#how-it-works)
    * [Use cases](#use-cases)
       * [Manage AWS EC2 instances](#manage-aws-ec2-instances)
@@ -21,13 +25,11 @@ Table of Contents
          * [Virtualenv](#virtualenv)
          * [Ops tool installation](#ops-tool-installation)
             * [Python 3](#python-3)
-            * [Python 2](#python-2)
          * [Terraform](#terraform-1)
       * [Using docker image](#using-docker-image)
-            * [Optional: install ops in development mode](#optional-install-ops-in-development-mode)
       * [Configuring](#configuring)
          * [AWS](#aws)
-      * [Azure](#azure)
+         * [Azure](#azure)
       * [Examples](#examples)
       * [Usage help](#usage-help)
       * [More help](#more-help)
@@ -50,10 +52,16 @@ Table of Contents
          * [Amazon Secrets Manager (SSM)](#amazon-secrets-manager-ssm)
       * [Using jinja2 filters in playbooks and terraform templates](#using-jinja2-filters-in-playbooks-and-terraform-templates)
       * [SKMS](#skms)
-      * [Development](#development)
-         * [Running tests](#running-tests)
-      * [Troubleshooting](#troubleshooting)
-      
+   * [Development](#development)
+      * [Install ops in development mode](#install-ops-in-development-mode)
+      * [Running tests](#running-tests)
+   * [Troubleshooting](#troubleshooting)
+   * [License](#license)
+
+<!-- Added by: amuraru, at: Tue Nov 12 10:23:17 EET 2019 -->
+
+<!--te-->
+
 # How it works?
 
 You define a cluster configuration, using a yaml file. The yaml file contains different kind of sections, one for each plugin. For instance, you could have a section for Terraform files, a section for AWS instructions, Kubernetes Helm charts and so forth.
@@ -142,29 +150,10 @@ workon ops
 # uninstall previous `ops` version (if you have it)
 pip uninstall ops --yes
 
-# install ops-cli v2.0.0 stable release
+# install ops-cli v2.0.2 stable release
 pip install --upgrade ops-cli
 ```
 
-#### Python 2
-```sh
-# Make sure pip is up to date
-curl https://bootstrap.pypa.io/2.6/get-pip.py | python2
-
-# Install virtualenv
-pip2 install -U virtualenv
-
-# create virtualenv
-virtualenv ops
-source ops/bin/activate
-
-# uninstall previous `ops` version (if you have it)
-pip uninstall ops --yes
-
-# install ops-cli v2.0.0 stable release
-pip2 install --upgrade ops-cli
-```
-
 
 ### Terraform
 Optionally, install terraform to be able to access terraform plugin. See https://www.terraform.io/intro/getting-started/install.html
@@ -177,7 +166,7 @@ You can try out `ops-cli`, by using docker. The docker image has all required pr
 
 To start out a container, running the latest `ops-cli` docker image run:
 ```sh
-docker run -it adobe/ops-cli:2.0.0 bash
+docker run -it adobe/ops-cli:2.0.2 bash
 ```
 
 After the container has started, you can start using `ops-cli`:
@@ -199,24 +188,16 @@ ops clusters/my-kubernetes-cluster.yaml terraform --path-name aws-eks plan
 # in order to setup aws-kubernetes follow the steps from https://github.com/adobe/ops-cli/blob/master/examples/aws-kubernetes/README.md
 ```
 
-#### Optional: install `ops` in development mode
-
-```
-git clone https://github.com/adobe/ops-cli.git
-cd ops
-# Install openssl
-brew install openssl libyaml
-env LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/include" python setup.py develop
-```
 
 ## Configuring
+
 ### AWS
 If you plan to use ops with AWS, you must configure credentials for each account
 ```shell
 $ aws configure --profile aws_account_name
 ```
 
-## Azure
+### Azure
 TBD
 
 ## Examples
@@ -460,15 +441,15 @@ In case you want to use the OSX Keychain to store your password and reuse across
 
 1. Open `Keychain Access` app on OSX
   1. Create a new keychain (`File -> New Keychain`), let's say `aam`
-  1. Select the `aam` keychain and add a new password entry in this (`File -> New Password Item`):
+  2. Select the `aam` keychain and add a new password entry in this (`File -> New Password Item`):
     - Name: `idm`
     - Kind: `application password`
     - Account: `your_ldap_account` (e.g. `johnsmith`)
     - Where: `idm`
 
-1. Create `$HOME/bin` dir - this is where the scripts below are saved
+2. Create `$HOME/bin` dir - this is where the scripts below are saved
 
-1. Create `~/bin/askpass` script and update the ldap account there:
+3. Create `~/bin/askpass` script and update the ldap account there:
 
   ```bash
   cat > ~/bin/askpass  <<"EOF"
@@ -700,13 +681,23 @@ username: <username>
 password: <password>
 ```
 
-## Development
+# Development
+
+## Install `ops` in development mode
+
+```
+git clone https://github.com/adobe/ops-cli.git
+cd ops
+# Install openssl
+brew install openssl libyaml
+env LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/include" python setup.py develop
+```
 
-### Running tests
+## Running tests
 
 - on your machine: `py.test tests`
 
-## Troubleshooting
+# Troubleshooting
 
 - Permission issues when installing: you should install the tool in a python virtualenv
 
@@ -726,5 +717,5 @@ Either install the tool in a virtualenv or:
     brew link openssl --force
 ```
 
-## License
+# License
 [Apache License 2.0](/LICENSE)

RELEASE.md

@@ -1,7 +1,7 @@
 # Release
 
 1. Install: `pip install bump2version`
-2. Bump version: `bump2version minor`
+2. Bump version: `bump2version patch`
 3. Push the release commit: `git push --follow-tags`
 4. Wait for Travis to build at https://www.travis-ci.com/adobe/ops-cli:
   * This will publish a release to https://github.com/adobe/ops-cli/releases

build_scripts/Dockerfile

@@ -41,6 +41,8 @@ RUN adduser ops -Du 2342 -h /home/ops \
     # Install ops python package
     && pip --no-cache-dir install --upgrade /dist/ops-*.tar.gz \
     && rm -rf /dist \
+    # Dry-run
+    && ops --verbose -h \
     && apk del --purge build \
     && wget -q https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl -O /usr/local/bin/kubectl \
     && chmod +x /usr/local/bin/kubectl \

build_scripts/docker_push.sh

@@ -2,5 +2,5 @@
 set -e
 
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-docker tag ops adobe/ops-cli:2.0.0
-docker push adobe/ops-cli:2.0.0
+docker tag ops adobe/ops-cli:2.0.2
+docker push adobe/ops-cli:2.0.2

build_scripts/freeze_requirements.sh

@@ -7,3 +7,4 @@ pip install pipenv
 rm -rf Pipfile* deps
 pipenv lock --clear --three --requirements 1>deps
 grep '==' deps | sed "s/;\\sextra.*//" > requirements.txt
+rm -rf Pipfile* deps

setup.py

@@ -23,12 +23,12 @@
 _requires = [r for r in open(os.path.sep.join((_mydir, 'requirements.txt')), "r").read().split('\n') if len(r) > 1]
 setup(
     name='ops-cli',
-    version='2.0.0',
+    version='2.0.2',
     description='Ops - wrapper for Terraform, Ansible, and SSH for cloud automation',
     long_description=_readme + '\n\n',
     long_description_content_type='text/markdown',
     url='https://github.com/adobe/ops-cli',
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    python_requires='>=3.5',
     author='Adobe',
     author_email='[email protected]',
     license='Apache2',
@@ -38,10 +38,7 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',