Skip to content

Commit 1d5d288

Browse files
thomasrockhuthomasrockhu
authored
Merge branch 'master' into verbose
2 parents fad5e4c + 3502fdd commit 1d5d288

File tree

10 files changed

+234
-163
lines changed

10 files changed

+234
-163
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ coverage.xml
1111
dist
1212
htmlcov
1313
venv
14+
*.sw[op]

‎.travis.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1+
12
language: python
3+
cache: pip
24
notifications:
35
email: false
6+
dist: xenial
47
sudo: false
58
python:
6-
- 2.6
79
- 2.7
810
- pypy
9-
- 3.3
1011
- 3.4
12+
- 3.5
13+
- 3.6
14+
- 3.7
1115
- pypy3
1216
matrix:
1317
include:
1418
- python: 2.7
1519
dist: trusty
16-
sudo: required
1720
virtualenv:
1821
system_site_packages: true
1922
addons:
@@ -22,11 +25,13 @@ matrix:
2225
- python-requests
2326
- python-coverage
2427
- python-mock
28+
- python: 3.7
29+
dist: xenial
2530

2631
install:
2732
- pip install -r tests/requirements.txt
2833
- python setup.py install
2934
script:
30-
- py.test tests/test.py --cov=codecov
35+
- pytest tests/test.py --cov=codecov
3136
after_success:
3237
- codecov

‎CHANGELOG.md

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
### `2.0.15`
2+
- add `-X s3` to disable direct to S3 uploading
3+
4+
### `2.0.14`
5+
- fixed coverage combine
6+
7+
### `2.0.13`
8+
- fix encoding issues
9+
10+
### `2.0.12`
11+
- revert merge commit fix, back to old way
12+
13+
### `2.0.11`
14+
- fix merge commit when it's a pull request
15+
- remove snapci, business closed
16+
- skip vendor directories for gcov parsing
17+
- run coverage combine not merge
18+
- fix report encoding
19+
20+
### `2.0.10`
21+
- fix uploading when reports contain characters outside of latin-1
22+
- remove reduced_redundancy header from
23+
124
### `2.0.7`
225
- Add `--name/-n` to cli
326
- Add support for Jenkins Blue
@@ -104,7 +127,7 @@
104127

105128
### `1.1.5`
106129
- search for all `lcov|gcov` files
107-
- depreciate `--min-coverage`, use Github Status Update feature
130+
- depreciate `--min-coverage`, use GitHub Status Update feature
108131
- pre-process xml => json
109132

110133
### `1.1.4`

‎README.md

+10-12
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ Find coverage reports for all the [languages below](#languages), gather them and
1414
## Usage
1515

1616
```sh
17-
pip install --user codecov && codecov -t the-repository-upload-token
17+
pip install --user codecov && codecov -t <the-repository-upload-token>
1818
```
1919
or
2020
```sh
21-
conda install -c conda-forge codecov && codecov -t the-repository-upload-token
21+
conda install -c conda-forge codecov && codecov -t <the-repository-upload-token>
2222
```
2323
> `--user` argument not needed for Python projects. [See example here](https://github.com/codecov/example-python).
2424
@@ -35,7 +35,7 @@ Just please make sure to pass all the necessary environment variables through:
3535

3636
```
3737
[testenv]
38-
passenv = TOXENV CI TRAVIS TRAVIS_*
38+
passenv = TOXENV CI TRAVIS TRAVIS_* CODECOV_*
3939
deps = codecov>=1.4.0
4040
commands = codecov -e TOXENV
4141
```
@@ -65,7 +65,7 @@ after_success:
6565
```yaml
6666
# private repository on Travis CI
6767
install:
68-
- pip install --user codecov
68+
- pip install codecov
6969
# or
7070
- conda install -c conda-forge codecov
7171
after_success:
@@ -76,24 +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-
| [Snap CI](https://snap-ci.com/) | Yes | Public & Private |
91-
| git / mercurial | Yes (as a fallback) | Public & Private |
92-
| [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) | |
9392
| [Bamboo](https://www.atlassian.com/software/bamboo) | `coming soon` | |
9493
| [Solano Labs](https://www.solanolabs.com/) | `coming soon` | |
9594

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

9896

9997

@@ -103,4 +101,4 @@ after_success:
103101

104102
## Copyright
105103

106-
> Copyright 2014-2017 codecov
104+
> Copyright 2014-2019 codecov

‎appveyor.yml

+16-14
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,37 @@ environment:
1313
# a later point release.
1414

1515
- PYTHON: "C:\\Python27"
16-
PYTHON_VERSION: "2.7.x" # currently 2.7.9
16+
PYTHON_VERSION: "2.7.x" # currently 2.7.15
1717
PYTHON_ARCH: "32"
1818

1919
- PYTHON: "C:\\Python27-x64"
20-
PYTHON_VERSION: "2.7.x" # currently 2.7.9
20+
PYTHON_VERSION: "2.7.x" # currently 2.7.15
2121
PYTHON_ARCH: "64"
2222

23-
- PYTHON: "C:\\Python33"
24-
PYTHON_VERSION: "3.3.x" # currently 3.3.5
23+
- PYTHON: "C:\\Python34"
24+
PYTHON_VERSION: "3.4.x" # currently 3.4.4
2525
PYTHON_ARCH: "32"
2626

27-
- PYTHON: "C:\\Python33-x64"
28-
PYTHON_VERSION: "3.3.x" # currently 3.3.5
27+
- PYTHON: "C:\\Python34-x64"
28+
PYTHON_VERSION: "3.4.x" # currently 3.4.4
2929
PYTHON_ARCH: "64"
3030

31-
- PYTHON: "C:\\Python34"
32-
PYTHON_VERSION: "3.4.x" # currently 3.4.3
31+
- PYTHON: "C:\\Python36"
32+
PYTHON_VERSION: "3.6.x" # currently 3.6.6
3333
PYTHON_ARCH: "32"
3434

35-
- PYTHON: "C:\\Python34-x64"
36-
PYTHON_VERSION: "3.4.x" # currently 3.4.3
35+
- PYTHON: "C:\\Python36-x64"
36+
PYTHON_VERSION: "3.6.x" # currently 3.6.6
3737
PYTHON_ARCH: "64"
3838

39-
# Also test Python 2.6.6 not pre-installed
40-
41-
- PYTHON: "C:\\Python266"
42-
PYTHON_VERSION: "2.6.6"
39+
- PYTHON: "C:\\Python37"
40+
PYTHON_VERSION: "3.7.x" # currently 3.7.1
4341
PYTHON_ARCH: "32"
4442

43+
- PYTHON: "C:\\Python37-x64"
44+
PYTHON_VERSION: "3.7.x" # currently 3.7.1
45+
PYTHON_ARCH: "64"
46+
4547
install:
4648
# Download the Appveyor Python build accessories into subdirectory .\appveyor
4749
- mkdir appveyor

0 commit comments

Comments
 (0)