Skip to content

Commit

Permalink
Switch to codecov. Seem like coveralls is really broken when publishi…
Browse files Browse the repository at this point in the history
…ng data from two CI systems.
  • Loading branch information
ionelmc committed May 31, 2019
1 parent 1f4cb4b commit 3ccd441
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 56 deletions.
35 changes: 16 additions & 19 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ version: '{branch}-{build}'
build: off
environment:
global:
COVERALLS_PARALLEL: true
COVERALLS_REPO_TOKEN:
secure: 1FnQ1slZatdVqT63JCuf/ALH3jviE6zwCwmiE7JSV8MD2M5KhktvLOgmhbwwXp4+
TWINE_PASSWORD:
secure: fDwCnDhQiptm9a4ZcFpgyQ==
TWINE_USERNAME: ionel
Expand All @@ -14,12 +11,12 @@ environment:
PYTHON_HOME: C:\Python36
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '32'
- TOXENV: 'py27-pure-cover,coveralls'
- TOXENV: 'py27-pure-cover,codecov'
TOXPYTHON: C:\Python27\python.exe
PYTHON_HOME: C:\Python27
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '32'
- TOXENV: 'py27-pure-cover,coveralls'
- TOXENV: 'py27-pure-cover,codecov'
TOXPYTHON: C:\Python27-x64\python.exe
WINDOWS_SDK_VERSION: v7.0
PYTHON_HOME: C:\Python27-x64
Expand All @@ -36,12 +33,12 @@ environment:
PYTHON_HOME: C:\Python27-x64
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '64'
- TOXENV: 'py27-cython-cover,coveralls'
- TOXENV: 'py27-cython-cover,codecov'
TOXPYTHON: C:\Python27\python.exe
PYTHON_HOME: C:\Python27
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '32'
- TOXENV: 'py27-cython-cover,coveralls'
- TOXENV: 'py27-cython-cover,codecov'
TOXPYTHON: C:\Python27-x64\python.exe
WINDOWS_SDK_VERSION: v7.0
PYTHON_HOME: C:\Python27-x64
Expand All @@ -60,12 +57,12 @@ environment:
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '64'
WHEEL_PATH: .tox/dist
- TOXENV: 'py35-pure-cover,coveralls'
- TOXENV: 'py35-pure-cover,codecov'
TOXPYTHON: C:\Python35\python.exe
PYTHON_HOME: C:\Python35
PYTHON_VERSION: '3.5'
PYTHON_ARCH: '32'
- TOXENV: 'py35-pure-cover,coveralls'
- TOXENV: 'py35-pure-cover,codecov'
TOXPYTHON: C:\Python35-x64\python.exe
PYTHON_HOME: C:\Python35-x64
PYTHON_VERSION: '3.5'
Expand All @@ -80,12 +77,12 @@ environment:
PYTHON_HOME: C:\Python35-x64
PYTHON_VERSION: '3.5'
PYTHON_ARCH: '64'
- TOXENV: 'py35-cython-cover,coveralls'
- TOXENV: 'py35-cython-cover,codecov'
TOXPYTHON: C:\Python35\python.exe
PYTHON_HOME: C:\Python35
PYTHON_VERSION: '3.5'
PYTHON_ARCH: '32'
- TOXENV: 'py35-cython-cover,coveralls'
- TOXENV: 'py35-cython-cover,codecov'
TOXPYTHON: C:\Python35-x64\python.exe
PYTHON_HOME: C:\Python35-x64
PYTHON_VERSION: '3.5'
Expand All @@ -102,12 +99,12 @@ environment:
PYTHON_VERSION: '3.5'
PYTHON_ARCH: '64'
WHEEL_PATH: .tox/dist
- TOXENV: 'py36-pure-cover,coveralls'
- TOXENV: 'py36-pure-cover,codecov'
TOXPYTHON: C:\Python36\python.exe
PYTHON_HOME: C:\Python36
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '32'
- TOXENV: 'py36-pure-cover,coveralls'
- TOXENV: 'py36-pure-cover,codecov'
TOXPYTHON: C:\Python36-x64\python.exe
PYTHON_HOME: C:\Python36-x64
PYTHON_VERSION: '3.6'
Expand All @@ -122,12 +119,12 @@ environment:
PYTHON_HOME: C:\Python36-x64
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '64'
- TOXENV: 'py36-cython-cover,coveralls'
- TOXENV: 'py36-cython-cover,codecov'
TOXPYTHON: C:\Python36\python.exe
PYTHON_HOME: C:\Python36
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '32'
- TOXENV: 'py36-cython-cover,coveralls'
- TOXENV: 'py36-cython-cover,codecov'
TOXPYTHON: C:\Python36-x64\python.exe
PYTHON_HOME: C:\Python36-x64
PYTHON_VERSION: '3.6'
Expand All @@ -144,12 +141,12 @@ environment:
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '64'
WHEEL_PATH: .tox/dist
- TOXENV: 'py37-pure-cover,coveralls'
- TOXENV: 'py37-pure-cover,codecov'
TOXPYTHON: C:\Python37\python.exe
PYTHON_HOME: C:\Python37
PYTHON_VERSION: '3.7'
PYTHON_ARCH: '32'
- TOXENV: 'py37-pure-cover,coveralls'
- TOXENV: 'py37-pure-cover,codecov'
TOXPYTHON: C:\Python37-x64\python.exe
PYTHON_HOME: C:\Python37-x64
PYTHON_VERSION: '3.7'
Expand All @@ -164,12 +161,12 @@ environment:
PYTHON_HOME: C:\Python37-x64
PYTHON_VERSION: '3.7'
PYTHON_ARCH: '64'
- TOXENV: 'py37-cython-cover,coveralls'
- TOXENV: 'py37-cython-cover,codecov'
TOXPYTHON: C:\Python37\python.exe
PYTHON_HOME: C:\Python37
PYTHON_VERSION: '3.7'
PYTHON_ARCH: '32'
- TOXENV: 'py37-cython-cover,coveralls'
- TOXENV: 'py37-cython-cover,codecov'
TOXPYTHON: C:\Python37-x64\python.exe
PYTHON_HOME: C:\Python37-x64
PYTHON_VERSION: '3.7'
Expand Down
19 changes: 14 additions & 5 deletions .cookiecutterrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
# Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)

cookiecutter:
_extensions:
- jinja2_time.TimeExtension
_template: cookiecutter-pylibrary
appveyor: yes
c_extension_function: '-'
c_extension_module: '-'
c_extension_optional: yes
c_extension_support: cython
c_extension_test_pypi: yes
c_extension_test_pypi_appveyor_secret: fDwCnDhQiptm9a4ZcFpgyQ==
c_extension_test_pypi_travis_secret: "# The password should be set in https://travis-ci.org/ionelmc/python-hunter/settings\n # Alternatively you can run this shell oneliner if you got travis gem installed:\n #\n # echo -n \"Password:\"; (read -s p; echo -n TWINE_PASSWORD=$p) | travis encrypt --add=env.global --repo=ionelmc/python-hunter"
c_extension_test_pypi_username: ionelmc
codacy: no
codacy_projectid: '-'
codeclimate: no
codecov: no
codecov: yes
command_line_interface: argparse
command_line_interface_bin_name: hunter-trace
coveralls: yes
coveralls: no
coveralls_token: '-'
distribution_name: hunter
email: [email protected]
full_name: Ionel Cristian Mărieș
Expand All @@ -23,7 +31,7 @@ cookiecutter:
package_name: hunter
project_name: Hunter
project_short_description: Hunter is a flexible code tracing toolkit, not for measuring coverage, but for debugging, logging, inspection and other nefarious purposes. It has a simple Python API and a convenient terminal API (see `Environment variable activation <env-var-activation_>`_).
release_date: '2018-11-17'
release_date: '2019-01-19'
repo_name: python-hunter
requiresio: yes
scrutinizer: no
Expand All @@ -34,6 +42,7 @@ cookiecutter:
test_matrix_separate_coverage: yes
test_runner: pytest
travis: yes
version: 2.1.0
version: 2.2.1
website: https://blog.ionelmc.ro
year: 2015-2019
year_from: '2015'
year_to: '2019'
29 changes: 14 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ env:
- SEGFAULT_SIGNALS=all
- SETUPPY_CFLAGS=-DCYTHON_TRACE=1
- PYTEST_ADDOPTS=--benchmark-disable
- COVERALLS_PARALLEL=true
matrix:
- TOXENV=check
- TOXENV=docs
Expand All @@ -34,7 +33,7 @@ matrix:
)
- python: '2.7'
env:
- TOXENV=py27-pure-cover,coveralls
- TOXENV=py27-pure-cover,codecov
- os: osx
language: generic
cache:
Expand All @@ -58,7 +57,7 @@ matrix:
- SETUPPY_CFLAGS=
- python: '2.7'
env:
- TOXENV=py27-cython-cover,coveralls
- TOXENV=py27-cython-cover,codecov
- os: osx
language: generic
cache:
Expand All @@ -85,35 +84,35 @@ matrix:
- WHEEL_PATH=.tox/dist
- python: '3.5'
env:
- TOXENV=py35-pure-cover,coveralls
- TOXENV=py35-pure-cover,codecov
- python: '3.5'
env:
- TOXENV=py35-pure-nocov
- python: '3.5'
env:
- TOXENV=py35-cython-cover,coveralls
- TOXENV=py35-cython-cover,codecov
- python: '3.5'
env:
- TOXENV=py35-cython-nocov
- WHEEL_MANYLINUX1=cp35
- WHEEL_PATH=wheelhouse
- python: '3.6'
env:
- TOXENV=py36-pure-cover,coveralls
- TOXENV=py36-pure-cover,codecov
- python: '3.6'
env:
- TOXENV=py36-pure-nocov
- python: '3.6'
env:
- TOXENV=py36-cython-cover,coveralls
- TOXENV=py36-cython-cover,codecov
- python: '3.6'
env:
- TOXENV=py36-cython-nocov
- WHEEL_MANYLINUX1=cp36
- WHEEL_PATH=wheelhouse
- python: '3.7'
env:
- TOXENV=py37-pure-cover,coveralls
- TOXENV=py37-pure-cover,codecov
- os: osx
language: generic
cache:
Expand All @@ -137,7 +136,7 @@ matrix:
- SETUPPY_CFLAGS=
- python: '3.7'
env:
- TOXENV=py37-cython-cover,coveralls
- TOXENV=py37-cython-cover,codecov
- os: osx
language: generic
cache:
Expand All @@ -164,43 +163,43 @@ matrix:
- WHEEL_PATH=.tox/dist
- python: '3.8-dev'
env:
- TOXENV=py38-pure-cover,coveralls
- TOXENV=py38-pure-cover,codecov
- python: '3.8-dev'
env:
- TOXENV=py38-pure-nocov
- python: '3.8-dev'
env:
- TOXENV=py38-cython-cover,coveralls
- TOXENV=py38-cython-cover,codecov
- python: '3.8-dev'
env:
- TOXENV=py38-cython-nocov
- python: 'pypy2.7-6.0'
env:
- TOXENV=pypy-pure-cover,coveralls
- TOXENV=pypy-pure-cover,codecov
- TOXPYTHON=pypy
- python: 'pypy2.7-6.0'
env:
- TOXENV=pypy-pure-nocov
- TOXPYTHON=pypy
- python: 'pypy2.7-6.0'
env:
- TOXENV=pypy-cython-cover,coveralls
- TOXENV=pypy-cython-cover,codecov
- TOXPYTHON=pypy
- python: 'pypy2.7-6.0'
env:
- TOXENV=pypy-cython-nocov
- TOXPYTHON=pypy
- python: 'pypy3.5-6.0'
env:
- TOXENV=pypy3-pure-cover,coveralls
- TOXENV=pypy3-pure-cover,codecov
- TOXPYTHON=pypy3
- python: 'pypy3.5-6.0'
env:
- TOXENV=pypy3-pure-nocov
- TOXPYTHON=pypy3
- python: 'pypy3.5-6.0'
env:
- TOXENV=pypy3-cython-cover,coveralls
- TOXENV=pypy3-cython-cover,codecov
- TOXPYTHON=pypy3
- python: 'pypy3.5-6.0'
env:
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Overview
- |docs|
* - tests
- | |travis| |appveyor| |requires|
| |coveralls|
| |codecov|
* - package
- | |version| |wheel| |supported-versions| |supported-implementations|
| |commits-since|
Expand All @@ -31,9 +31,9 @@ Overview
:alt: Requirements Status
:target: https://requires.io/github/ionelmc/python-hunter/requirements/?branch=master

.. |coveralls| image:: https://coveralls.io/repos/ionelmc/python-hunter/badge.svg?branch=master&service=github
.. |codecov| image:: https://codecov.io/github/ionelmc/python-hunter/coverage.svg?branch=master
:alt: Coverage Status
:target: https://coveralls.io/r/ionelmc/python-hunter
:target: https://codecov.io/github/ionelmc/python-hunter

.. |version| image:: https://img.shields.io/pypi/v/hunter.svg
:alt: PyPI Package latest release
Expand Down
2 changes: 1 addition & 1 deletion ci/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
# WARNING: 'tox' must be installed globally or in the project's virtualenv
for line in subprocess.check_output(['tox', '--listenvs'], universal_newlines=True).splitlines()
]
tox_environments = [line for line in tox_environments if line not in ['clean', 'report', 'docs', 'check']]
tox_environments = [line for line in tox_environments if line.startswith('py')]

for name in os.listdir(join("ci", "templates")):
with open(join(base_path, name), "w") as fh:
Expand Down
7 changes: 2 additions & 5 deletions ci/templates/.appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ version: '{branch}-{build}'
build: off
environment:
global:
COVERALLS_PARALLEL: true
COVERALLS_REPO_TOKEN:
secure: 1FnQ1slZatdVqT63JCuf/ALH3jviE6zwCwmiE7JSV8MD2M5KhktvLOgmhbwwXp4+
TWINE_PASSWORD:
secure: fDwCnDhQiptm9a4ZcFpgyQ==
TWINE_USERNAME: ionel
Expand All @@ -15,15 +12,15 @@ environment:
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '32'
{%- for env in tox_environments %}{% if env.startswith(('py2', 'py3')) and not env.startswith('py38') %}{{ '' }}
- TOXENV: '{{ env }}{% if 'cover' in env %},coveralls{% endif %}'
- TOXENV: '{{ env }}{% if 'cover' in env %},codecov{% endif %}'
TOXPYTHON: C:\Python{{ env[2:4] }}\python.exe
PYTHON_HOME: C:\Python{{ env[2:4] }}
PYTHON_VERSION: '{{ env[2] }}.{{ env[3] }}'
PYTHON_ARCH: '32'
{% if "cython-nocov" in env %}
WHEEL_PATH: .tox/dist
{% endif %}
- TOXENV: '{{ env }}{% if 'cover' in env %},coveralls{%- endif %}'
- TOXENV: '{{ env }}{% if 'cover' in env %},codecov{%- endif %}'
TOXPYTHON: C:\Python{{ env[2:4] }}-x64\python.exe
{%- if env.startswith(('py2', 'py34')) %}

Expand Down
3 changes: 1 addition & 2 deletions ci/templates/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ env:
- SEGFAULT_SIGNALS=all
- SETUPPY_CFLAGS=-DCYTHON_TRACE=1
- PYTEST_ADDOPTS=--benchmark-disable
- COVERALLS_PARALLEL=true
matrix:
- TOXENV=check
- TOXENV=docs
Expand Down Expand Up @@ -43,7 +42,7 @@ matrix:
- python: '{{ env.split("-")[0] if env.startswith("pypy") else "{0[2]}.{0[3]}".format(env) }}'
{% endif %}
env:
- TOXENV={{ env }}{% if "cover" in env %},coveralls{% endif %}
- TOXENV={{ env }}{% if "cover" in env %},codecov{% endif %}
{%- if "pypy" in env %}{{ '' }}
- TOXPYTHON={{ env.split("-")[0] }}
{%- elif "cython-nocov" in env and not env.startswith("py38") %}{{ '' }}
Expand Down
Loading

0 comments on commit 3ccd441

Please sign in to comment.