Skip to content

Commit

Permalink
Update skel; migrate to travis-ci.com.
Browse files Browse the repository at this point in the history
  • Loading branch information
ionelmc committed Jan 10, 2021
1 parent 6592810 commit 0eada98
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 15 deletions.
5 changes: 2 additions & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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}'
Expand All @@ -18,4 +18,3 @@ replace = version = release = '{new_version}'
[bumpversion:file:src/pytest_cov/__init__.py]
search = __version__ = '{current_version}'
replace = __version__ = '{new_version}'

9 changes: 3 additions & 6 deletions .cookiecutterrc
Original file line number Diff line number Diff line change
@@ -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: '-'
Expand All @@ -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
Expand All @@ -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'
6 changes: 5 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -14,3 +15,6 @@ end_of_line = crlf

[*.{yml,yaml}]
indent_size = 2

[*.tsv]
indent_style = tab
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,14 @@ htmlcov
# Translations
*.mo

# Mr Developer
# Buildout
.mr.developer.cfg

# IDE project files
.project
.pydevproject
.idea
.vscode
*.iml
*.komodoproject

Expand Down
5 changes: 3 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://travis-ci.org/pytest-dev/pytest-cov/pull_requests>`_ for each change you add in the pull request.
`run the tests <https://travis-ci.com//github/pytest-dev/pytest-cov/pull_requests>`_
for each change you add in the pull request.
It will be slower though ...
Expand All @@ -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
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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]
Expand Down

0 comments on commit 0eada98

Please sign in to comment.