diff --git a/.appveyor.yml b/.appveyor.yml index 9bd4fc2..e4a9ded 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -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 @@ -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 @@ -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 @@ -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' @@ -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' @@ -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' @@ -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' @@ -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' @@ -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' diff --git a/.cookiecutterrc b/.cookiecutterrc index 8874d1b..f353dbd 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -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: contact@ionelmc.ro full_name: Ionel Cristian Mărieș @@ -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 `_). - release_date: '2018-11-17' + release_date: '2019-01-19' repo_name: python-hunter requiresio: yes scrutinizer: no @@ -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' diff --git a/.travis.yml b/.travis.yml index 79220ae..dd710bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -34,7 +33,7 @@ matrix: ) - python: '2.7' env: - - TOXENV=py27-pure-cover,coveralls + - TOXENV=py27-pure-cover,codecov - os: osx language: generic cache: @@ -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: @@ -85,13 +84,13 @@ 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 @@ -99,13 +98,13 @@ matrix: - 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 @@ -113,7 +112,7 @@ matrix: - WHEEL_PATH=wheelhouse - python: '3.7' env: - - TOXENV=py37-pure-cover,coveralls + - TOXENV=py37-pure-cover,codecov - os: osx language: generic cache: @@ -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: @@ -164,19 +163,19 @@ 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: @@ -184,7 +183,7 @@ matrix: - 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: @@ -192,7 +191,7 @@ matrix: - 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: @@ -200,7 +199,7 @@ matrix: - 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: diff --git a/README.rst b/README.rst index 60e5303..2159a17 100644 --- a/README.rst +++ b/README.rst @@ -11,7 +11,7 @@ Overview - |docs| * - tests - | |travis| |appveyor| |requires| - | |coveralls| + | |codecov| * - package - | |version| |wheel| |supported-versions| |supported-implementations| | |commits-since| @@ -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 diff --git a/ci/bootstrap.py b/ci/bootstrap.py index 9e06424..5f1e609 100755 --- a/ci/bootstrap.py +++ b/ci/bootstrap.py @@ -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: diff --git a/ci/templates/.appveyor.yml b/ci/templates/.appveyor.yml index 6750f5d..b06b06f 100644 --- a/ci/templates/.appveyor.yml +++ b/ci/templates/.appveyor.yml @@ -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 @@ -15,7 +12,7 @@ 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] }}' @@ -23,7 +20,7 @@ environment: {% 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')) %} diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml index f7bc3bf..e7f7245 100644 --- a/ci/templates/.travis.yml +++ b/ci/templates/.travis.yml @@ -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 @@ -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") %}{{ '' }} diff --git a/tox.ini b/tox.ini index a652e55..457b3f2 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@ basepython = py36: {env:TOXPYTHON:python3.6} py37: {env:TOXPYTHON:python3.7} py38: {env:TOXPYTHON:python3.8} - {bootstrap,clean,check,report,coveralls,docs,spell}: {env:TOXPYTHON:python3} + {bootstrap,clean,check,report,codecov,docs,spell}: {env:TOXPYTHON:python3} setenv = PYTHONPATH={toxinidir}/tests PYTHONUNBUFFERED=yes @@ -93,15 +93,14 @@ commands = sphinx-build {posargs:-E} -b html docs dist/docs sphinx-build -b linkcheck docs dist/docs -[testenv:coveralls] +[testenv:codecov] deps = - coveralls + codecov cython==0.29.9 skip_install = true -setenv = - PYTHONPATH={toxinidir}/src commands = - coveralls [] + coverage xml --ignore-errors + codecov [] [testenv:report] deps =