Skip to content
This repository was archived by the owner on May 21, 2025. It is now read-only.

Commit 54033d8

Browse files
thomasrockhuthomasrockhu
authored
Merge pull request #192 from hugovk/add-3.7
Add support for Python 3.7
2 parents 0b96aba + 71f5066 commit 54033d8

File tree

8 files changed

+25
-30
lines changed

8 files changed

+25
-30
lines changed

‎.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
language: python
3+
cache: pip
34
notifications:
45
email: false
56
dist: xenial
@@ -16,7 +17,6 @@ matrix:
1617
include:
1718
- python: 2.7
1819
dist: trusty
19-
sudo: required
2020
virtualenv:
2121
system_site_packages: true
2222
addons:
@@ -25,11 +25,13 @@ matrix:
2525
- python-requests
2626
- python-coverage
2727
- python-mock
28+
- python: 3.7
29+
dist: xenial
2830

2931
install:
3032
- pip install -r tests/requirements.txt
3133
- python setup.py install
3234
script:
33-
- py.test tests/test.py --cov=codecov
35+
- pytest tests/test.py --cov=codecov
3436
after_success:
3537
- codecov

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127

128128
### `1.1.5`
129129
- search for all `lcov|gcov` files
130-
- depreciate `--min-coverage`, use Github Status Update feature
130+
- depreciate `--min-coverage`, use GitHub Status Update feature
131131
- pre-process xml => json
132132

133133
### `1.1.4`

‎README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,22 @@ after_success:
7676
## CI Providers
7777
| Company | Supported | Token Required |
7878
| --------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------- |
79-
| [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 |
79+
| [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 |
8080
| [CircleCI](https://circleci.com/) | Yes | Private only |
8181
| [Codeship](https://codeship.com/) | Yes | Public & Private |
8282
| [Jenkins](https://jenkins-ci.org/) | Yes | Public & Private |
8383
| [Semaphore](https://semaphoreci.com/) | Yes | Public & Private |
8484
| [Drone.io](https://drone.io/) | Yes | Public & Private |
85-
| [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 |
85+
| [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 |
8686
| [Wercker](http://wercker.com/) | Yes | Public & Private |
8787
| [Magnum CI](https://magnum-ci.com/) | Yes | Public & Private |
88-
| [Shippable](http://www.shippable.com/) | Yes | Public & Private |
88+
| [Shippable](https://www.shippable.com/) | Yes | Public & Private |
8989
| [Gitlab CI](https://about.gitlab.com/gitlab-ci/) | Yes | Public & Private |
90-
| git / mercurial | Yes (as a fallback) | Public & Private |
91-
| [Buildbot](http://buildbot.net/) | `coming soon` [buildbot/buildbot#1671](https://github.com/buildbot/buildbot/pull/1671) | |
90+
| Git / Mercurial | Yes (as a fallback) | Public & Private |
91+
| [Buildbot](https://buildbot.net/) | `coming soon` [buildbot/buildbot#1671](https://github.com/buildbot/buildbot/pull/1671) | |
9292
| [Bamboo](https://www.atlassian.com/software/bamboo) | `coming soon` | |
9393
| [Solano Labs](https://www.solanolabs.com/) | `coming soon` | |
9494

95-
> Using **Travis CI**? Uploader is compatible with `sudo: false` which can speed up your builds. :+1:
9695

9796

9897

‎codecov/__init__.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@
2222
import subprocess
2323

2424
# https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning
25-
try:
26-
import logging
27-
logging.captureWarnings(True)
28-
except:
29-
# not py2.6 compatible
30-
pass
25+
import logging
26+
logging.captureWarnings(True)
3127

3228

3329
version = VERSION = __version__ = '2.0.15'

‎setup.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
#!/usr/bin/env python
22
from setuptools import setup
3-
import sys
43

54
version = '2.0.15'
65
classifiers = ["Development Status :: 5 - Production/Stable",
76
"Environment :: Plugins",
87
"Intended Audience :: Developers",
98
"Programming Language :: Python",
9+
"Programming Language :: Python :: 2",
1010
"Programming Language :: Python :: 2.7",
1111
"Programming Language :: Python :: 3",
1212
"Programming Language :: Python :: 3.4",
13+
"Programming Language :: Python :: 3.5",
14+
"Programming Language :: Python :: 3.6",
15+
"Programming Language :: Python :: 3.7",
1316
"Programming Language :: Python :: Implementation :: PyPy",
1417
"License :: OSI Approved :: Apache Software License",
1518
"Topic :: Software Development :: Testing"]
1619

17-
if sys.version_info >= (2, 7):
18-
install_requires = ["requests>=2.7.9", "coverage"]
19-
else:
20-
install_requires = ["requests>=2.7.9", "coverage", "argparse"]
21-
2220
setup(name='codecov',
2321
version=version,
24-
description="Hosted coverage reports for Github, Bitbucket and Gitlab",
22+
description="Hosted coverage reports for GitHub, Bitbucket and Gitlab",
2523
long_description=None,
2624
classifiers=classifiers,
2725
keywords='coverage codecov code python java scala php',
2826
author='@codecov',
2927
author_email='[email protected]',
30-
url='http://github.com/codecov/codecov-python',
28+
url='https://github.com/codecov/codecov-python',
3129
license='http://www.apache.org/licenses/LICENSE-2.0',
3230
packages=['codecov'],
3331
include_package_data=True,
3432
zip_safe=True,
35-
install_requires=install_requires,
36-
tests_require=["unittest2"],
37-
entry_points={'console_scripts': ['codecov=codecov:main']})
33+
install_requires=["requests>=2.7.9", "coverage"],
34+
entry_points={'console_scripts': ['codecov=codecov:main']},
35+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
36+
)

‎tests/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ pytest>=3.6.0
55
pytest-cov
66
funcsigs
77
requests
8-
unittest2

‎tests/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import itertools
55
from ddt import ddt, data
66
from mock import patch, Mock
7-
import unittest2 as unittest
7+
import unittest
88

99
import subprocess
1010

‎tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[tox]
2-
envlist = py26, py27, py34
2+
envlist = py27, py34, py35, py36, py37
33

44
[testenv]
55
deps =
66
-r{toxinidir}/tests/requirements.txt
77
commands =
8-
py.test tests/test.py
8+
pytest tests/test.py

0 commit comments

Comments
 (0)