From 0eada98182c7e4754927d5eefdd5e1ae72a9062d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= Date: Sun, 10 Jan 2021 22:54:35 +0200 Subject: [PATCH] Update skel; migrate to travis-ci.com. --- .bumpversion.cfg | 5 ++--- .cookiecutterrc | 9 +++------ .editorconfig | 6 +++++- .gitignore | 5 ++++- CONTRIBUTING.rst | 5 +++-- README.rst | 4 ++-- tox.ini | 10 ++++++++++ 7 files changed, 29 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fc1162d4..4999a65f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -8,8 +8,8 @@ search = version='{current_version}' replace = version='{new_version}' [bumpversion:file:README.rst] -search = v{current_version}. -replace = v{new_version}. +search = /v{current_version}.svg +replace = /v{new_version}.svg [bumpversion:file:docs/conf.py] search = version = release = '{current_version}' @@ -18,4 +18,3 @@ replace = version = release = '{new_version}' [bumpversion:file:src/pytest_cov/__init__.py] search = __version__ = '{current_version}' replace = __version__ = '{new_version}' - diff --git a/.cookiecutterrc b/.cookiecutterrc index c477a6f5..9cad1178 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -1,9 +1,6 @@ # Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher) -cookiecutter: - _extensions: - - jinja2_time.TimeExtension - _template: /home/ionel/open-source/cookiecutter-pylibrary +default_context: allow_tests_inside_package: no appveyor: yes c_extension_function: '-' @@ -23,7 +20,7 @@ cookiecutter: distribution_name: pytest-cov email: contact@ionelmc.ro full_name: Ionel Cristian Mărieș - landscape: no + legacy_python: yes license: MIT license linter: flake8 package_name: pytest_cov @@ -50,7 +47,7 @@ cookiecutter: test_runner: pytest travis: yes travis_osx: no - version: 2.10.0 + version: 2.10.1 website: http://blog.ionelmc.ro year_from: '2010' year_to: '2020' diff --git a/.editorconfig b/.editorconfig index a9c7977a..586c7367 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,10 +2,11 @@ root = true [*] +# Use Unix-style newlines for most files (except Windows files, see below). end_of_line = lf trim_trailing_whitespace = true -insert_final_newline = true indent_style = space +insert_final_newline = true indent_size = 4 charset = utf-8 @@ -14,3 +15,6 @@ end_of_line = crlf [*.{yml,yaml}] indent_size = 2 + +[*.tsv] +indent_style = tab diff --git a/.gitignore b/.gitignore index dfe58380..83a43fdb 100644 --- a/.gitignore +++ b/.gitignore @@ -39,11 +39,14 @@ htmlcov # Translations *.mo -# Mr Developer +# Buildout .mr.developer.cfg + +# IDE project files .project .pydevproject .idea +.vscode *.iml *.komodoproject diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 53f55975..f02562eb 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -74,7 +74,8 @@ For merging, you should: 4. Add yourself to ``AUTHORS.rst``. .. [1] If you don't have all the necessary python versions available locally you can rely on Travis - it will - `run the tests `_ for each change you add in the pull request. + `run the tests `_ + for each change you add in the pull request. It will be slower though ... @@ -85,6 +86,6 @@ To run a subset of tests:: tox -e envname -- pytest -k test_myfeature -To run the test environments in *parallel*:: +To run all the test environments in *parallel*:: tox -p auto diff --git a/README.rst b/README.rst index 2b1284df..45a23371 100644 --- a/README.rst +++ b/README.rst @@ -19,9 +19,9 @@ Overview :target: https://readthedocs.org/projects/pytest-cov :alt: Documentation Status -.. |travis| image:: https://api.travis-ci.org/pytest-dev/pytest-cov.svg?branch=master +.. |travis| image:: https://api.travis-ci.com/pytest-dev/pytest-cov.svg?branch=master :alt: Travis-CI Build Status - :target: https://travis-ci.org/pytest-dev/pytest-cov + :target: https://travis-ci.com/github/pytest-dev/pytest-cov .. |appveyor| image:: https://ci.appveyor.com/api/projects/status/github/pytest-dev/pytest-cov?branch=master&svg=true :alt: AppVeyor Build Status diff --git a/tox.ini b/tox.ini index ec088198..b59b70ec 100644 --- a/tox.ini +++ b/tox.ini @@ -1,3 +1,13 @@ +[testenv:bootstrap] +deps = + jinja2 + matrix + tox +skip_install = true +commands = + python ci/bootstrap.py --no-env +passenv = + * ; a generative tox configuration, see: https://tox.readthedocs.io/en/latest/config.html#generative-envlist [tox]