Merge b0eea21 into 2c88188

.pre-commit-config.yaml

@@ -1,29 +1,30 @@
+repos:
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    sha: 219c70a9c1e8a946d3835974369d08f3ff5a00ec
+    rev: v1.4.0
     hooks:
     -   id: check-added-large-files
-        language_version: python2.7
+        language_version: python3.6
     -   id: check-merge-conflict
-        language_version: python2.7
+        language_version: python3.6
     -   id: trailing-whitespace
-        language_version: python2.7
+        language_version: python3.6
     -   id: end-of-file-fixer
-        language_version: python2.7
+        language_version: python3.6
     -   id: autopep8-wrapper
-        language_version: python2.7
+        language_version: python3.6
     -   id: check-yaml
-        language_version: python2.7
+        language_version: python3.6
     -   id: debug-statements
-        language_version: python2.7
+        language_version: python3.6
     -   id: name-tests-test
-        language_version: python2.7
+        language_version: python3.6
         exclude: ^tests/testing.py$
     -   id: flake8
-        language_version: python2.7
+        language_version: python3.6
     -   id: requirements-txt-fixer
-        language_version: python2.7
+        language_version: python3.6
 -   repo: git://github.com/asottile/reorder_python_imports
-    sha: f5c67b716c04babb6e8e80bb52e329ee7654b1b8
+    rev: v1.1.0
     hooks:
     -   id: reorder-python-imports
-        language_version: python2.7
+        language_version: python3.6

.travis.yml

@@ -1,15 +1,19 @@
 language: python
-env: # These should match the tox env list
-    - TOXENV=py27
-    - TOXENV=py34
+matrix:
+  include: # These should match the tox env list
+    -  env: TOXENV=py27
+       python: 2.7
+    -  env: TOXENV=py36
+       python: 3.6
+    -  env: TOXENV=pypy
+       python: pypy-5.7.1
 install: pip install coveralls tox
 script: tox
 # Special snowflake.  Our tests depend on a credentials_secret.json
 before_install:
     - cp tests/json/credentials.json tests/json/credentials_secret.json
 after_success:
     - coveralls
-sudo: false
 cache:
     directories:
         - $HOME/.cache/pip

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 project = yelp
-envlist = py27,py34
+envlist = py27,py36
 
 [testenv]
 deps = -rrequirements-dev.txt
@@ -14,5 +14,5 @@ commands =
 
 [testenv:venv]
 envdir = venv-{[tox]project}
-basepython = /usr/bin/python2.7
+basepython = /usr/bin/python3.6
 commands =