Upgrade coverage to 4.x

.travis.yml

@@ -1,4 +1,6 @@
+dist: xenial
 language: python
+python: 2.7
 env:
   - REPO=lyft/confidant
 sudo: required

Dockerfile

@@ -28,7 +28,8 @@ RUN virtualenv /venv && \
     pip install -r piptools_requirements.txt && \
     pip install -r requirements.txt
 
-RUN gem install rb-inotify -v 0.9.10 && \
+RUN gem install ffi -v 1.10.0 && \
+    gem install rb-inotify -v 0.9.10 && \
     gem install compass -v 1.0.3 && \
     npm install grunt-cli && \
     npm install

confidant/routes/v1.py

@@ -1213,7 +1213,7 @@ def update_blind_credential(id):
 def generate_value():
     value = kms_client.generate_random(NumberOfBytes=128)['Plaintext']
     value = base64.urlsafe_b64encode(value)
-    value = re.sub('[\W_]+', '', value)
+    value = re.sub(r'[\W_]+', '', value)
     if len(value) > VALUE_LENGTH:
         value = value[:VALUE_LENGTH]
     return jsonify({'value': value})

confidant/scripts/bootstrap.py

@@ -41,7 +41,7 @@ def run(self, _in, _out):
         }
         data = json.dumps(data)
         if _out == '-':
-            print data
+            print(data)
         else:
             with open(os.path.join(_out), 'w') as f:
                 f.write(data)
@@ -57,7 +57,7 @@ def run(self, _out):
         data = settings.encrypted_settings.get_all_secrets()
         data = yaml.safe_dump(data, default_flow_style=False, indent=2)
         if _out == '-':
-            print data
+            print(data)
         else:
             with open(os.path.join(_out), 'w') as f:
                 f.write(data)

requirements.in

@@ -109,17 +109,12 @@ guard==1.0.1
 # The modular source code checker: pep8, pyflakes and co
 # License: MIT
 # Upstream url: http://bitbucket.org/tarek/flake8
-flake8==2.3.0
+flake8>3
 
 # Measures code coverage and emits coverage reports
 # Licence: BSD
 # Upstream url: https://pypi.python.org/pypi/coverage
-coverage==3.7.1
-
-# tool to check your Python code against some of the style conventions
-# License: Expat License
-# Upstream url: https://github.com/jcrocholl/pep8.git
-pep8==1.5.7
+coverage>4
 
 # nose makes testing easier
 # License: GNU Library or Lesser General Public License (LGPL)

requirements.txt

@@ -10,17 +10,20 @@ boto3==1.4.0
 botocore==1.4.58
 certifi==2018.4.16
 cffi==1.10.0
-coverage==3.7.1
+configparser==3.7.4       # via entrypoints, flake8
+coverage==4.5.4
 cryptography==2.3
 defusedxml==0.5.0         # via python3-saml
 docutils==0.13.1          # via botocore
+entrypoints==0.3          # via flake8
 enum34==1.1.6
-flake8==2.3.0
+flake8==3.7.8
 flask-script==2.0.5
 flask-session==0.2.1
 flask-sslify==0.1.5
 flask==0.10.1
 funcsigs==1.0.2           # via mock
+functools32==3.2.3.post2  # via flake8
 futures==3.0.5            # via s3transfer
 gevent==1.2.1
 greenlet==0.4.12
@@ -41,11 +44,11 @@ ndg-httpsclient==0.4.2
 nose-pathmunge==0.1.2
 nose==1.3.3
 pbr==2.0.0                # via mock
-pep8==1.5.7
 pkgconfig==1.3.1          # via xmlsec
 pyasn1==0.4.4
+pycodestyle==2.5.0        # via flake8
 pycparser==2.18
-pyflakes==1.5.0           # via flake8
+pyflakes==2.1.1           # via flake8
 pynamodb==3.2.1
 pyopenssl==16.2.0
 python-dateutil==2.6.0    # via botocore, pynamodb
@@ -56,6 +59,7 @@ requests==2.11.1
 s3transfer==0.1.10        # via boto3
 six==1.10.0
 statsd==3.2.1
+typing==3.7.4             # via flake8
 werkzeug==0.12.1          # via flask
 xmlsec==1.3.3             # via python3-saml
 

requirements3.txt

@@ -9,11 +9,12 @@ authomatic==0.1.0.post1
 boto3==1.4.0
 botocore==1.4.58
 cffi==1.10.0
-coverage==3.7.1
+coverage==4.5.4
 cryptography==2.3
 defusedxml==0.5.0         # via python3-saml
 docutils==0.13.1          # via botocore
-flake8==2.3.0
+entrypoints==0.3          # via flake8
+flake8==3.7.8
 flask-script==2.0.5
 flask-session==0.2.1
 flask-sslify==0.1.5
@@ -36,11 +37,11 @@ ndg-httpsclient==0.4.2
 nose-pathmunge==0.1.2
 nose==1.3.3
 pbr==2.0.0                # via mock
-pep8==1.5.7
 pkgconfig==1.3.1          # via xmlsec
 pyasn1==0.4.4
+pycodestyle==2.5.0        # via flake8
 pycparser==2.18
-pyflakes==1.5.0           # via flake8
+pyflakes==2.1.1           # via flake8
 pynamodb==3.2.1
 pyopenssl==16.2.0
 python-dateutil==2.6.0    # via botocore, pynamodb