Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into verbose
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomasrockhu
thomasrockhu authored Jun 9, 2019
2 parents fad5e4c + 3502fdd commit 1d5d288
Show file tree
Hide file tree
Showing 10 changed files with 234 additions and 163 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ coverage.xml
dist
htmlcov
venv
*.sw[op]
13 changes: 9 additions & 4 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@

language: python
cache: pip
notifications:
email: false
dist: xenial
sudo: false
python:
- 2.6
- 2.7
- pypy
- 3.3
- 3.4
- 3.5
- 3.6
- 3.7
- pypy3
matrix:
include:
- python: 2.7
dist: trusty
sudo: required
virtualenv:
system_site_packages: true
addons:
Expand All @@ -22,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
25 changes: 24 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
### `2.0.15`
- add `-X s3` to disable direct to S3 uploading

### `2.0.14`
- fixed coverage combine

### `2.0.13`
- fix encoding issues

### `2.0.12`
- revert merge commit fix, back to old way

### `2.0.11`
- fix merge commit when it's a pull request
- remove snapci, business closed
- skip vendor directories for gcov parsing
- run coverage combine not merge
- fix report encoding

### `2.0.10`
- fix uploading when reports contain characters outside of latin-1
- remove reduced_redundancy header from

### `2.0.7`
- Add `--name/-n` to cli
- Add support for Jenkins Blue
Expand Down Expand Up @@ -104,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`
Expand Down
22 changes: 10 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ Find coverage reports for all the [languages below](#languages), gather them and
## Usage

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

```
[testenv]
passenv = TOXENV CI TRAVIS TRAVIS_*
passenv = TOXENV CI TRAVIS TRAVIS_* CODECOV_*
deps = codecov>=1.4.0
commands = codecov -e TOXENV
```
Expand Down Expand Up @@ -65,7 +65,7 @@ after_success:
```yaml
# private repository on Travis CI
install:
- pip install --user codecov
- pip install codecov
# or
- conda install -c conda-forge codecov
after_success:
Expand All @@ -76,24 +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 |
| [Snap CI](https://snap-ci.com/) | 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:



Expand All @@ -103,4 +101,4 @@ after_success:

## Copyright

> Copyright 2014-2017 codecov
> Copyright 2014-2019 codecov
30 changes: 16 additions & 14 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,37 @@ environment:
# a later point release.

- PYTHON: "C:\\Python27"
PYTHON_VERSION: "2.7.x" # currently 2.7.9
PYTHON_VERSION: "2.7.x" # currently 2.7.15
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7.x" # currently 2.7.9
PYTHON_VERSION: "2.7.x" # currently 2.7.15
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python33"
PYTHON_VERSION: "3.3.x" # currently 3.3.5
- PYTHON: "C:\\Python34"
PYTHON_VERSION: "3.4.x" # currently 3.4.4
PYTHON_ARCH: "32"

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

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

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

# Also test Python 2.6.6 not pre-installed

- PYTHON: "C:\\Python266"
PYTHON_VERSION: "2.6.6"
- PYTHON: "C:\\Python37"
PYTHON_VERSION: "3.7.x" # currently 3.7.1
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7.x" # currently 3.7.1
PYTHON_ARCH: "64"

install:
# Download the Appveyor Python build accessories into subdirectory .\appveyor
- mkdir appveyor
Expand Down
Loading

0 comments on commit 1d5d288

Please sign in to comment.