Merge pull request #165 from pre-commit/py36
Test py36 instead of py34
diff --git a/.travis.yml b/.travis.yml
index 3bec92f..a3e5fc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,19 @@
language: python
-python: 3.5
-env: # These should match the tox env list
- - TOXENV=py27
- - TOXENV=py34
- - TOXENV=py35
- - TOXENV=pypy
+sudo: false
+matrix:
+ include: # These should match the tox env list
+ - env: TOXENV=py27
+ - env: TOXENV=py35
+ python: 3.5
+ - env: TOXENV=py36
+ python: 3.6
+ - env: TOXENV=pypy
install: pip install coveralls tox
script: tox
before_install:
# Install git-lfs for a test
- './get-git-lfs.py && export PATH="/tmp/git-lfs:$PATH"'
-after_success:
- - coveralls
-sudo: false
+after_success: coveralls
cache:
directories:
- $HOME/.cache/pip
diff --git a/appveyor.yml b/appveyor.yml
index 4bde8cc..a0df40b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,10 +1,10 @@
environment:
matrix:
- TOXENV: py27
- - TOXENV: py35
+ - TOXENV: py36
install:
- - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%"
+ - "SET PATH=C:\\Python36;C:\\Python36\\Scripts;%PATH%"
- pip install tox
# Not a C# project
diff --git a/get-git-lfs.py b/get-git-lfs.py
index 4897a56..c1f2197 100755
--- a/get-git-lfs.py
+++ b/get-git-lfs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
"""This is a script to install git-lfs to a tempdir for use in tests"""
import io
import os.path
diff --git a/setup.py b/setup.py
index fb6abad..b41b466 100644
--- a/setup.py
+++ b/setup.py
@@ -14,11 +14,10 @@
classifiers=[
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.6',
'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 :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
],
@@ -27,7 +26,6 @@
install_requires=[
# quickfix to prevent pep8 conflicts
'flake8!=2.5.3',
- 'argparse',
'autopep8>=1.1',
'pyyaml',
'simplejson',