Merge pull request #192 from hugovk/add-3.7

Add support for Python 3.7
codecov · Jun 7, 2019 · 54033d8 · 54033d8
2 parents 0b96aba + 71f5066
commit 54033d8
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 
 language: python
+cache: pip
 notifications:
   email: false
 dist: xenial
@@ -16,7 +17,6 @@ matrix:
   include:
     - python: 2.7
       dist: trusty
-      sudo: required
       virtualenv:
         system_site_packages: true
       addons:
@@ -25,11 +25,13 @@ matrix:
             - python-requests
             - python-coverage
             - python-mock
+    - python: 3.7
+      dist: xenial
 
 install:
   - pip install -r tests/requirements.txt
   - python setup.py install
 script:
-  - py.test tests/test.py --cov=codecov
+  - pytest tests/test.py --cov=codecov
 after_success:
   - codecov
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -127,7 +127,7 @@
 
 ### `1.1.5`
 - search for all `lcov|gcov` files
-- depreciate `--min-coverage`, use Github Status Update feature
+- depreciate `--min-coverage`, use GitHub Status Update feature
 - pre-process xml => json
 
 ### `1.1.4`

diff --git a/README.md b/README.md
@@ -76,23 +76,22 @@ after_success:
 ## CI Providers
 |                       Company                       |                                                                                     Supported                                                                                      |  Token Required  |
 | --------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------- |
-| [Travis CI](https://travis-ci.org/)                 | Yes [![Build Status](https://secure.travis-ci.org/codecov/codecov-python.svg?branch=master)](http://travis-ci.org/codecov/codecov-python)                                          | Private only     |
+| [Travis CI](https://travis-ci.org/)                 | Yes [![Build Status](https://secure.travis-ci.org/codecov/codecov-python.svg?branch=master)](https://travis-ci.org/codecov/codecov-python)                                         | Private only     |
 | [CircleCI](https://circleci.com/)                   | Yes                                                                                                                                                                                | Private only     |
 | [Codeship](https://codeship.com/)                   | Yes                                                                                                                                                                                | Public & Private |
 | [Jenkins](https://jenkins-ci.org/)                  | Yes                                                                                                                                                                                | Public & Private |
 | [Semaphore](https://semaphoreci.com/)               | Yes                                                                                                                                                                                | Public & Private |
 | [Drone.io](https://drone.io/)                       | Yes                                                                                                                                                                                | Public & Private |
-| [AppVeyor](http://www.appveyor.com/)                | Yes [![Build status](https://ci.appveyor.com/api/projects/status/sw18lsj7786bw806/branch/master?svg=true)](https://ci.appveyor.com/project/stevepeak/codecov-python/branch/master) | Private only     |
+| [AppVeyor](https://www.appveyor.com/)               | Yes [![Build status](https://ci.appveyor.com/api/projects/status/sw18lsj7786bw806/branch/master?svg=true)](https://ci.appveyor.com/project/stevepeak/codecov-python/branch/master) | Private only     |
 | [Wercker](http://wercker.com/)                      | Yes                                                                                                                                                                                | Public & Private |
 | [Magnum CI](https://magnum-ci.com/)                 | Yes                                                                                                                                                                                | Public & Private |
-| [Shippable](http://www.shippable.com/)              | Yes                                                                                                                                                                                | Public & Private |
+| [Shippable](https://www.shippable.com/)             | Yes                                                                                                                                                                                | Public & Private |
 | [Gitlab CI](https://about.gitlab.com/gitlab-ci/)    | Yes                                                                                                                                                                                | Public & Private |
-| git / mercurial                                     | Yes (as a fallback)                                                                                                                                                                | Public & Private |
-| [Buildbot](http://buildbot.net/)                    | `coming soon` [buildbot/buildbot#1671](https://github.com/buildbot/buildbot/pull/1671)                                                                                             |                  |
+| Git / Mercurial                                     | Yes (as a fallback)                                                                                                                                                                | Public & Private |
+| [Buildbot](https://buildbot.net/)                   | `coming soon` [buildbot/buildbot#1671](https://github.com/buildbot/buildbot/pull/1671)                                                                                             |                  |
 | [Bamboo](https://www.atlassian.com/software/bamboo) | `coming soon`                                                                                                                                                                      |                  |
 | [Solano Labs](https://www.solanolabs.com/)          | `coming soon`                                                                                                                                                                      |                  |
 
-> Using **Travis CI**? Uploader is compatible with `sudo: false` which can speed up your builds. :+1:
 
 
 

diff --git a/codecov/__init__.py b/codecov/__init__.py
@@ -22,12 +22,8 @@
 import subprocess
 
 # https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning
-try:
-    import logging
-    logging.captureWarnings(True)
-except:
-    # not py2.6 compatible
-    pass
+import logging
+logging.captureWarnings(True)
 
 
 version = VERSION = __version__ = '2.0.15'

diff --git a/setup.py b/setup.py
@@ -1,37 +1,36 @@
 #!/usr/bin/env python
 from setuptools import setup
-import sys
 
 version = '2.0.15'
 classifiers = ["Development Status :: 5 - Production/Stable",
                "Environment :: Plugins",
                "Intended Audience :: Developers",
                "Programming Language :: Python",
+               "Programming Language :: Python :: 2",
                "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 :: 3.7",
                "Programming Language :: Python :: Implementation :: PyPy",
                "License :: OSI Approved :: Apache Software License",
                "Topic :: Software Development :: Testing"]
 
-if sys.version_info >= (2, 7):
-    install_requires = ["requests>=2.7.9", "coverage"]
-else:
-    install_requires = ["requests>=2.7.9", "coverage", "argparse"]
-
 setup(name='codecov',
       version=version,
-      description="Hosted coverage reports for Github, Bitbucket and Gitlab",
+      description="Hosted coverage reports for GitHub, Bitbucket and Gitlab",
       long_description=None,
       classifiers=classifiers,
       keywords='coverage codecov code python java scala php',
       author='@codecov',
       author_email='hello@codecov.io',
-      url='http://github.com/codecov/codecov-python',
+      url='https://github.com/codecov/codecov-python',
       license='http://www.apache.org/licenses/LICENSE-2.0',
       packages=['codecov'],
       include_package_data=True,
       zip_safe=True,
-      install_requires=install_requires,
-      tests_require=["unittest2"],
-      entry_points={'console_scripts': ['codecov=codecov:main']})
+      install_requires=["requests>=2.7.9", "coverage"],
+      entry_points={'console_scripts': ['codecov=codecov:main']},
+      python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+      )
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -5,4 +5,3 @@ pytest>=3.6.0
 pytest-cov
 funcsigs
 requests
-unittest2
diff --git a/tests/test.py b/tests/test.py
@@ -4,7 +4,7 @@
 import itertools
 from ddt import ddt, data
 from mock import patch, Mock
-import unittest2 as unittest
+import unittest
 
 import subprocess
 

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
-envlist = py26, py27, py34
+envlist = py27, py34, py35, py36, py37
 
 [testenv]
 deps =
     -r{toxinidir}/tests/requirements.txt
 commands =
-    py.test tests/test.py
+    pytest tests/test.py