Move to Python 3 only

aragilar · May 16, 2019 · d3ba968 · d3ba968
1 parent 95808f9
commit d3ba968
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,22 +1,10 @@
 language: python
-
-sudo: false
+dist: xenial
 
 cache:
   directories:
     - $HOME/.cache/pip
 
-env:
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-  #- TOXENV=py35
-  #- TOXENV=py36
-  - TOXENV=flake8
-  - TOXENV=pylint
-  - TOXENV=docs
-  - TOXENV=check-manifest
-  #- TOXENV=checkreadme
 matrix:
   include:
     - python: 3.5
@@ -25,6 +13,27 @@ matrix:
     - python: 3.6
       env:
       - TOXENV=py36
+    - python: 3.7
+      env:
+      - TOXENV=py37
+    #- python: 3.8
+    #  env:
+    #  - TOXENV=py38
+    - python: 3.5
+      env:
+      - TOXENV=flake8
+    - python: 3.5
+      env:
+      - TOXENV=pylint
+    - python: 3.5
+      env:
+      - TOXENV=docs
+    - python: 3.5
+      env:
+      - TOXENV=check-manifest
+    - python: 3.5
+      env:
+      - TOXENV=checkreadme
 
 before_install:
   - pip install codecov # for coverage

diff --git a/pytest_info_collector/__init__.py b/pytest_info_collector/__init__.py
@@ -10,7 +10,7 @@
 del get_versions
 
 
-class InfoCollector(object):
+class InfoCollector:
     """
     Main driver of test information collection
     """

diff --git a/setup.py b/setup.py
@@ -14,6 +14,7 @@
     name="pytest-info-collector",
     version=versioneer.get_version(),
     packages = ['pytest_info_collector'],
+    python_requires = '>=3.5',
     install_requires = ["pytest"],
     author = "James Tocknell",
     author_email = "aragilar@gmail.com",
@@ -32,13 +33,11 @@
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     cmdclass=versioneer.get_cmdclass(),
 )
diff --git a/tox.ini b/tox.ini
@@ -4,12 +4,22 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27,py33,py34,py35,py36,flake8,pylint,docs,check-manifest,checkreadme
+envlist = py35,py36,py37,py38,flake8,pylint,docs,check-manifest,checkreadme
 
 [testenv]
 commands = py.test -p pytester --cov={envsitepackagesdir}/pytest_info_collector --runpytest=subprocess {posargs}
 deps =
     -rtest-requirements.txt
+basepython =
+    py35: {env:TOXPYTHON:python3.5}
+    py36: {env:TOXPYTHON:python3.6}
+    py37: {env:TOXPYTHON:python3.7}
+    py38: {env:TOXPYTHON:python3.8}
+    flake8: {env:TOXPYTHON:python3}
+    pylint: {env:TOXPYTHON:python3}
+    docs: {env:TOXPYTHON:python3}
+    check-manifest: {env:TOXPYTHON:python3}
+    checkreadme: {env:TOXPYTHON:python3}
 
 [testenv:docs]
 changedir=docs