Merge branch 'master' of github.com:googlecloudplatform/google-cloud-python into dlp

Author: landrito

.circleci/config.yml

@@ -3,14 +3,13 @@ version: 2
 jobs:
   build:
     docker:
-      - image: googleapis/nox:0.11.2
+      - image: googleapis/nox:0.17.0
     steps:
       - checkout
       - run:
           name: Decrypt credentials
           command: |
             if [ -n "$GOOGLE_APPLICATION_CREDENTIALS" ]; then
-              apt-get update && apt-get install -y openssl
               openssl aes-256-cbc -d -a -k "$GOOGLE_CREDENTIALS_PASSPHRASE" \
                   -in /var/code/gcp/test_utils/credentials.json.enc \
                   -out "$GOOGLE_APPLICATION_CREDENTIALS"

.gitignore

@@ -28,6 +28,7 @@ pip-log.txt
 .nox
 .tox
 .cache
+htmlcov
 
 # Translations
 *.mo
@@ -55,7 +56,8 @@ coverage.xml
 system_tests/local_test_setup
 
 # Make sure a generated file isn't accidentally committed.
-scripts/pylintrc_reduced
+pylintrc
+pylintrc.test
 
 # Directories used for creating generated PB2 files
 generated_python/