Skip to content

Commit c4b0722

Browse files
committed
Some skel updates. Added precommit.
1 parent 5ffc230 commit c4b0722

17 files changed

+213
-62
lines changed

.appveyor.yml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
version: '{branch}-{build}'
2+
build: off
3+
environment:
4+
matrix:
5+
- TOXENV: check
6+
TOXPYTHON: C:\Python36\python.exe
7+
PYTHON_HOME: C:\Python36
8+
PYTHON_VERSION: '3.6'
9+
PYTHON_ARCH: '32'
10+
- TOXENV: py27
11+
TOXPYTHON: C:\Python27\python.exe
12+
PYTHON_HOME: C:\Python27
13+
PYTHON_VERSION: '2.7'
14+
PYTHON_ARCH: '32'
15+
- TOXENV: py27
16+
TOXPYTHON: C:\Python27-x64\python.exe
17+
PYTHON_HOME: C:\Python27-x64
18+
PYTHON_VERSION: '2.7'
19+
PYTHON_ARCH: '64'
20+
WINDOWS_SDK_VERSION: v7.0
21+
- TOXENV: py35
22+
TOXPYTHON: C:\Python35\python.exe
23+
PYTHON_HOME: C:\Python35
24+
PYTHON_VERSION: '3.5'
25+
PYTHON_ARCH: '32'
26+
- TOXENV: py35
27+
TOXPYTHON: C:\Python35-x64\python.exe
28+
PYTHON_HOME: C:\Python35-x64
29+
PYTHON_VERSION: '3.5'
30+
PYTHON_ARCH: '64'
31+
- TOXENV: py36
32+
TOXPYTHON: C:\Python36\python.exe
33+
PYTHON_HOME: C:\Python36
34+
PYTHON_VERSION: '3.6'
35+
PYTHON_ARCH: '32'
36+
- TOXENV: py36
37+
TOXPYTHON: C:\Python36-x64\python.exe
38+
PYTHON_HOME: C:\Python36-x64
39+
PYTHON_VERSION: '3.6'
40+
PYTHON_ARCH: '64'
41+
- TOXENV: py37
42+
TOXPYTHON: C:\Python37\python.exe
43+
PYTHON_HOME: C:\Python37
44+
PYTHON_VERSION: '3.7'
45+
PYTHON_ARCH: '32'
46+
- TOXENV: py37
47+
TOXPYTHON: C:\Python37-x64\python.exe
48+
PYTHON_HOME: C:\Python37-x64
49+
PYTHON_VERSION: '3.7'
50+
PYTHON_ARCH: '64'
51+
- TOXENV: py38
52+
TOXPYTHON: C:\Python38\python.exe
53+
PYTHON_HOME: C:\Python38
54+
PYTHON_VERSION: '3.8'
55+
PYTHON_ARCH: '32'
56+
- TOXENV: py38
57+
TOXPYTHON: C:\Python38-x64\python.exe
58+
PYTHON_HOME: C:\Python38-x64
59+
PYTHON_VERSION: '3.8'
60+
PYTHON_ARCH: '64'
61+
init:
62+
- ps: echo $env:TOXENV
63+
- ps: ls C:\Python*
64+
install:
65+
- '%PYTHON_HOME%\python -mpip install --progress-bar=off tox -rci/requirements.txt'
66+
- '%PYTHON_HOME%\Scripts\virtualenv --version'
67+
- '%PYTHON_HOME%\Scripts\easy_install --version'
68+
- '%PYTHON_HOME%\Scripts\pip --version'
69+
- '%PYTHON_HOME%\Scripts\tox --version'
70+
test_script:
71+
- cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd %PYTHON_HOME%\Scripts\tox
72+
on_failure:
73+
- ps: dir "env:"
74+
- ps: get-content .tox\*\log\*
75+
76+
### To enable remote debugging uncomment this (also, see: http://www.appveyor.com/docs/how-to/rdp-to-build-worker):
77+
# on_finish:
78+
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

.bumpversion.cfg

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,17 @@ commit = True
44
tag = True
55

66
[bumpversion:file:setup.py]
7+
search = version='{current_version}'
8+
replace = version='{new_version}'
79

810
[bumpversion:file:README.rst]
11+
search = v{current_version}.
12+
replace = v{new_version}.
913

1014
[bumpversion:file:docs/conf.py]
15+
search = version = release = '{current_version}'
16+
replace = version = release = '{new_version}'
1117

1218
[bumpversion:file:src/pytest_cov/__init__.py]
13-
19+
search = __version__ = '{current_version}'
20+
replace = __version__ = '{new_version}'

.cookiecutterrc

Lines changed: 44 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,56 @@
11
# Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
22

33
cookiecutter:
4-
appveyor: 'yes'
5-
c_extension_cython: 'no'
6-
c_extension_optional: 'no'
7-
c_extension_support: 'no'
8-
codacy: 'yes'
9-
codeclimate: 'yes'
10-
codecov: 'no'
11-
command_line_interface: 'no'
12-
command_line_interface_bin_name: pytest-cov
13-
coveralls: 'no'
4+
_extensions:
5+
- jinja2_time.TimeExtension
6+
_template: /home/ionel/open-source/cookiecutter-pylibrary
7+
allow_tests_inside_package: no
8+
appveyor: yes
9+
c_extension_function: '-'
10+
c_extension_module: '-'
11+
c_extension_optional: no
12+
c_extension_support: no
13+
c_extension_test_pypi: no
14+
c_extension_test_pypi_username: '-'
15+
codacy: no
16+
codacy_projectid: '[Get ID from https://app.codacy.com/app/ionelmc/pytest-cov/settings]'
17+
codeclimate: no
18+
codecov: no
19+
command_line_interface: no
20+
command_line_interface_bin_name: '-'
21+
coveralls: no
22+
coveralls_token: '[Required for Appveyor, take it from https://coveralls.io/github/ionelmc/pytest-cov]'
1423
distribution_name: pytest-cov
1524
1625
full_name: Ionel Cristian Mărieș
17-
github_username: pytest-dev
18-
landscape: 'yes'
26+
landscape: no
27+
license: MIT license
28+
linter: flake8
1929
package_name: pytest_cov
30+
pre_commit: yes
2031
project_name: pytest-cov
21-
project_short_description: This plugin produces coverage reports. It supports
22-
centralised testing and distributed testing in both load and each modes. It
23-
also supports coverage of subprocesses.
24-
release_date: '2016-10-10'
32+
project_short_description: This plugin produces coverage reports. It supports centralised testing and distributed testing in both load and each modes. It also supports coverage of subprocesses.
33+
pypi_badge: yes
34+
pypi_disable_upload: no
35+
release_date: '2020-06-12'
36+
repo_hosting: github.com
37+
repo_hosting_domain: github.com
2538
repo_name: pytest-cov
26-
requiresio: 'yes'
27-
scrutinizer: 'yes'
28-
sphinx_doctest: 'no'
39+
repo_username: pytest-dev
40+
requiresio: yes
41+
scrutinizer: no
42+
setup_py_uses_setuptools_scm: no
43+
setup_py_uses_test_runner: no
44+
sphinx_docs: yes
45+
sphinx_docs_hosting: https://pytest-cov.readthedocs.io/
46+
sphinx_doctest: no
2947
sphinx_theme: sphinx-py3doc-enhanced-theme
30-
test_matrix_configurator: 'no'
31-
test_matrix_separate_coverage: 'no'
48+
test_matrix_configurator: no
49+
test_matrix_separate_coverage: no
3250
test_runner: pytest
33-
travis: 'yes'
34-
version: 2.4.0
51+
travis: yes
52+
travis_osx: no
53+
version: 2.10.0
3554
website: http://blog.ionelmc.ro
36-
year: now
55+
year_from: '2010'
56+
year_to: '2020'

.coveragerc

Lines changed: 0 additions & 12 deletions
This file was deleted.

.editorconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# see http://editorconfig.org
1+
# see https://editorconfig.org/
22
root = true
33

44
[*]
@@ -11,3 +11,6 @@ charset = utf-8
1111

1212
[*.{bat,cmd,ps1}]
1313
end_of_line = crlf
14+
15+
[*.{yml,yaml}]
16+
indent_size = 2

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
*.py[cod]
2+
__pycache__
23

34
# C extensions
45
*.so
@@ -21,6 +22,7 @@ lib
2122
lib64
2223
venv*/
2324
pyvenv*/
25+
pip-wheel-metadata/
2426

2527
# Installer logs
2628
pip-log.txt
@@ -29,6 +31,7 @@ pip-log.txt
2931
.coverage
3032
.tox
3133
.coverage.*
34+
.pytest_cache/
3235
nosetests.xml
3336
coverage.xml
3437
htmlcov
@@ -59,6 +62,10 @@ docs/_build
5962
.env
6063
.cache
6164
.pytest
65+
.benchmarks
6266
.bootstrap
6367
.appveyor.token
6468
*.bak
69+
70+
# Mypy Cache
71+
.mypy_cache/

.pre-commit-config.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# To install the git pre-commit hook run:
2+
# pre-commit install
3+
# To update the pre-commit hooks run:
4+
# pre-commit install-hooks
5+
exclude: '^(.tox|ci/templates|.bumpversion.cfg)(/|$)'
6+
repos:
7+
- repo: https://github.com/pre-commit/pre-commit-hooks
8+
rev: master
9+
hooks:
10+
- id: trailing-whitespace
11+
- id: end-of-file-fixer
12+
- id: debug-statements
13+
- repo: https://github.com/timothycrosley/isort
14+
rev: master
15+
hooks:
16+
- id: isort
17+
- repo: https://gitlab.com/pycqa/flake8
18+
rev: master
19+
hooks:
20+
- id: flake8

.readthedocs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ python:
77
version: 3
88
install:
99
- requirements: docs/requirements.txt
10+
- method: pip
11+
path: .

CONTRIBUTING.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ To set up `pytest-cov` for local development:
4141
(look for the "Fork" button).
4242
2. Clone your fork locally::
4343

44-
git clone [email protected]:your_name_here/pytest-cov.git
44+
git clone [email protected]:YOURGITHUBNAME/pytest-cov.git
4545

4646
3. Create a branch for local development::
4747

4848
git checkout -b name-of-your-bugfix-or-feature
4949

5050
Now you can make your changes locally.
5151

52-
4. When you're done making changes, run all the checks, doc builder and spell checker with `tox <http://tox.readthedocs.io/en/latest/install.html>`_ one command::
52+
4. When you're done making changes run all the checks and docs builder with `tox <https://tox.readthedocs.io/en/latest/install.html>`_ one command::
5353

5454
tox
5555

MANIFEST.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@ include .bumpversion.cfg
1414
include .coveragerc
1515
include .cookiecutterrc
1616
include .editorconfig
17-
include .isort.cfg
18-
include .pylintrc
19-
include .readthedocs.yml
2017

2118
include AUTHORS.rst
2219
include CHANGELOG.rst
2320
include CONTRIBUTING.rst
2421
include LICENSE
2522
include README.rst
2623

27-
include tox.ini .travis.yml appveyor.yml
24+
include tox.ini .travis.yml .appveyor.yml .readthedocs.yml .pre-commit-config.yaml
2825

29-
global-exclude *.py[cod] __pycache__ *.so .coverage
26+
global-exclude *.py[cod] __pycache__/* *.so *.dylib

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Overview
1919
:target: https://readthedocs.org/projects/pytest-cov
2020
:alt: Documentation Status
2121

22-
.. |travis| image:: https://travis-ci.org/pytest-dev/pytest-cov.svg?branch=master
22+
.. |travis| image:: https://api.travis-ci.org/pytest-dev/pytest-cov.svg?branch=master
2323
:alt: Travis-CI Build Status
2424
:target: https://travis-ci.org/pytest-dev/pytest-cov
2525

@@ -33,7 +33,7 @@ Overview
3333

3434
.. |version| image:: https://img.shields.io/pypi/v/pytest-cov.svg
3535
:alt: PyPI Package latest release
36-
:target: https://pypi.python.org/pypi/pytest-cov
36+
:target: https://pypi.org/project/pytest-cov
3737

3838
.. |conda-forge| image:: https://img.shields.io/conda/vn/conda-forge/pytest-cov.svg
3939
:target: https://anaconda.org/conda-forge/pytest-cov
@@ -44,15 +44,15 @@ Overview
4444

4545
.. |wheel| image:: https://img.shields.io/pypi/wheel/pytest-cov.svg
4646
:alt: PyPI Wheel
47-
:target: https://pypi.python.org/pypi/pytest-cov
47+
:target: https://pypi.org/project/pytest-cov
4848

4949
.. |supported-versions| image:: https://img.shields.io/pypi/pyversions/pytest-cov.svg
5050
:alt: Supported versions
51-
:target: https://pypi.python.org/pypi/pytest-cov
51+
:target: https://pypi.org/project/pytest-cov
5252

5353
.. |supported-implementations| image:: https://img.shields.io/pypi/implementation/pytest-cov.svg
5454
:alt: Supported implementations
55-
:target: https://pypi.python.org/pypi/pytest-cov
55+
:target: https://pypi.org/project/pytest-cov
5656

5757
.. end-badges
5858

ci/appveyor-with-compiler.cmd

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
:: Very simple setup:
2+
:: - if WINDOWS_SDK_VERSION is set then activate the SDK.
3+
:: - disable the WDK if it's around.
4+
5+
SET COMMAND_TO_RUN=%*
6+
SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
7+
SET WIN_WDK="c:\Program Files (x86)\Windows Kits\10\Include\wdf"
8+
ECHO SDK: %WINDOWS_SDK_VERSION% ARCH: %PYTHON_ARCH%
9+
10+
IF EXIST %WIN_WDK% (
11+
REM See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
12+
REN %WIN_WDK% 0wdf
13+
)
14+
IF "%WINDOWS_SDK_VERSION%"=="" GOTO main
15+
16+
SET DISTUTILS_USE_SDK=1
17+
SET MSSdk=1
18+
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
19+
CALL "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
20+
21+
:main
22+
ECHO Executing: %COMMAND_TO_RUN%
23+
CALL %COMMAND_TO_RUN% || EXIT 1

ci/requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
virtualenv>=16.6.0
2+
pip>=19.1.1
3+
setuptools>=18.0.1
4+
six>=1.14.0

ci/templates/appveyor.yml renamed to ci/templates/.appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ install:
1616
- IF "%TOXENV:~0,5%" == "pypy-" choco install --no-progress python.pypy
1717
- IF "%TOXENV:~0,6%" == "pypy3-" choco install --no-progress pypy3
1818
- SET PATH=C:\tools\pypy\pypy;%PATH%
19-
- C:\Python37\python -m pip install -U "virtualenv>=16.5.0"
20-
- C:\Python37\python -m pip install tox
19+
- C:\Python37\python -m pip install --progress-bar=off tox -rci/requirements.txt
2120

2221
test_script:
23-
- C:\Python37\python -m tox
22+
- cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd C:\Python37\python -m tox
2423

2524
on_failure:
2625
- ps: dir "env:"

ci/templates/.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ before_install:
4545
- uname -a
4646
- lsb_release -a
4747
install:
48-
- pip install tox
48+
- python -mpip install --progress-bar=off tox -rci/requirements.txt
4949
- virtualenv --version
5050
- easy_install --version
5151
- pip --version

0 commit comments

Comments
 (0)