Skip to content

Commit e03031d

Browse files
schlamarschlamar
committed
Merge pull request #58 from ionelmc/single-package-and-other-fixes
Merge cov-core and pytest-cov packages and other fixes
2 parents 5a06154 + 5b91aff commit e03031d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1353
-688
lines changed

‎.coveragerc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[paths]
2+
source = src
3+
4+
[run]
5+
branch = True
6+
source = src
7+
parallel = true
8+
9+
[report]
10+
show_missing = true
11+
precision = 2
12+
omit = *migrations*

‎.gitignore

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,60 @@
1-
.tox/
2-
*.egg-info/
1+
*.py[cod]
2+
3+
# C extensions
4+
*.so
5+
6+
# Packages
7+
*.egg
8+
*.egg-info
9+
dist
10+
build
11+
eggs
12+
parts
13+
bin
14+
var
15+
sdist
16+
develop-eggs
17+
.installed.cfg
18+
lib
19+
lib64
20+
venv*/
21+
pyvenv*/
22+
23+
# Installer logs
24+
pip-log.txt
25+
26+
# Unit test / coverage reports
327
.coverage
28+
.tox
429
.coverage.*
5-
*.pyc
30+
nosetests.xml
31+
htmlcov
32+
33+
# Translations
34+
*.mo
35+
36+
# Mr Developer
37+
.mr.developer.cfg
38+
.project
39+
.pydevproject
40+
.idea
41+
*.iml
42+
*.komodoproject
43+
44+
# Complexity
45+
output/*.html
46+
output/*/index.html
47+
48+
# Sphinx
49+
docs/_build
50+
51+
.DS_Store
52+
*~
53+
.*.sw[po]
54+
.build
55+
.ve
56+
.env
57+
.cache
58+
.pytest
59+
.bootstrap
60+
*.bak

‎.travis.yml

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,33 @@
11
language: python
2-
32
python: 2.7
4-
5-
env:
6-
- CWD=. TOX_ENV=flake8
7-
8-
- CWD=pytest-cov TOX_ENV=pypy COV_CORE_DEP=../cov-core
9-
- CWD=pytest-cov TOX_ENV=pypy3 COV_CORE_DEP=../cov-core
10-
- CWD=pytest-cov TOX_ENV=py26 COV_CORE_DEP=../cov-core
11-
- CWD=pytest-cov TOX_ENV=py27 COV_CORE_DEP=../cov-core
12-
- CWD=pytest-cov TOX_ENV=py32 COV_CORE_DEP=../cov-core
13-
- CWD=pytest-cov TOX_ENV=py33 COV_CORE_DEP=../cov-core
14-
- CWD=pytest-cov TOX_ENV=py34 COV_CORE_DEP=../cov-core
15-
16-
- CWD=pytest-cov TOX_ENV=pypy COV_CORE_DEP=cov-core
17-
- CWD=pytest-cov TOX_ENV=pypy3 COV_CORE_DEP=cov-core
18-
- CWD=pytest-cov TOX_ENV=py26 COV_CORE_DEP=cov-core
19-
- CWD=pytest-cov TOX_ENV=py27 COV_CORE_DEP=cov-core
20-
- CWD=pytest-cov TOX_ENV=py32 COV_CORE_DEP=cov-core
21-
- CWD=pytest-cov TOX_ENV=py33 COV_CORE_DEP=cov-core
22-
- CWD=pytest-cov TOX_ENV=py34 COV_CORE_DEP=cov-core
23-
24-
matrix:
25-
allow_failures:
26-
- env: CWD=pytest-cov TOX_ENV=pypy COV_CORE_DEP=cov-core
27-
- env: CWD=pytest-cov TOX_ENV=pypy3 COV_CORE_DEP=cov-core
28-
- env: CWD=pytest-cov TOX_ENV=py26 COV_CORE_DEP=cov-core
29-
- env: CWD=pytest-cov TOX_ENV=py27 COV_CORE_DEP=cov-core
30-
- env: CWD=pytest-cov TOX_ENV=py32 COV_CORE_DEP=cov-core
31-
- env: CWD=pytest-cov TOX_ENV=py33 COV_CORE_DEP=cov-core
32-
- env: CWD=pytest-cov TOX_ENV=py34 COV_CORE_DEP=cov-core
33-
343
sudo: false
35-
4+
env:
5+
global:
6+
LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
7+
matrix:
8+
- TOXENV=check
9+
- TOXENV=2.6-37
10+
- TOXENV=2.7-37
11+
- TOXENV=3.3-37
12+
- TOXENV=3.4-37
13+
- TOXENV=pypy-37
14+
- TOXENV=2.6-40
15+
- TOXENV=2.7-40
16+
- TOXENV=3.3-40
17+
- TOXENV=3.4-40
18+
- TOXENV=pypy-40
19+
before_install:
20+
- python --version
21+
- virtualenv --version
22+
- pip --version
23+
- uname -a
24+
- lsb_release -a
3625
install:
3726
- pip install tox
38-
3927
script:
40-
- cd $CWD && tox -e $TOX_ENV
41-
28+
- tox -v
4229
notifications:
4330
email:
4431
on_success: never
45-
on_failure: change
32+
on_failure: always
33+

‎AUTHORS.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Authors
2+
=======
3+
4+
* Marc Schlaich - http://www.schlamar.org/
5+
* Rick van Hattem - http://wol.ph/
6+
* Buck Evan - https://github.com/bukzor
7+
* Eric Larson - http://larsoner.com/
8+
* Marc Abramowitz - http://marc-abramowitz.com/
9+
* Thomas Kluyver - https://github.com/takluyver
10+
* Guillaume Ayoub - http://www.yabz.fr/
11+
* Federico Ceratto - http://firelet.net/
12+
* Josh Kalderimis - http://blog.cookiestack.com/
13+
* Ionel Cristian Mărieș - http://blog.ionelmc.ro

‎CHANGELOG.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Changelog
2+
=========
3+
4+
2.0.0 (??????????)
5+
------------------
6+
7+
* Added ``--cov-fail-under``, akin to the new ``fail_under`` option in `coverage-4.0`
8+
(automatically activated if there's a ``[report] fail_under = ...`` in ``.coveragerc``).
9+
* Changed ``--cov-report=term`` to automatically upgrade to ``--cov-report=term-missing``
10+
if there's ``[run] show_missing = True`` in ``.coveragerc``.
11+
* Changed ``--cov`` so it can be used with no path argument (in wich case the source
12+
settings from ``.coveragerc`` will be used instead).
13+
* Fixed `.pth` installation to work in all cases (install, easy_install, wheels, develop etc).
14+
* Fixed `.pth` uninstallation to work for wheel installs.
15+
* Support for coverage 4.0.
16+
* Data file suffixing changed to use coverage's ``data_suffix=True`` option (instead of the
17+
custom suffixing).
18+
19+
1.8.2 (2014-11-06)
20+
------------------
21+
22+
* N/A

‎CONTRIBUTING.rst

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
============
2+
Contributing
3+
============
4+
5+
Contributions are welcome, and they are greatly appreciated! Every
6+
little bit helps, and credit will always be given.
7+
8+
Bug reports
9+
===========
10+
11+
When `reporting a bug <https://github.com/schlamar/pytest-cov/issues>`_ please include:
12+
13+
* Your operating system name and version.
14+
* Any details about your local setup that might be helpful in troubleshooting.
15+
* Detailed steps to reproduce the bug.
16+
17+
Documentation improvements
18+
==========================
19+
20+
pytest-cov could always use more documentation, whether as part of the
21+
official pytest-cov docs, in docstrings, or even on the web in blog posts,
22+
articles, and such.
23+
24+
Feature requests and feedback
25+
=============================
26+
27+
The best way to send feedback is to file an issue at https://github.com/schlamar/pytest-cov/issues.
28+
29+
If you are proposing a feature:
30+
31+
* Explain in detail how it would work.
32+
* Keep the scope as narrow as possible, to make it easier to implement.
33+
* Remember that this is a volunteer-driven project, and that contributions are welcome :)
34+
35+
Development
36+
===========
37+
38+
To set up `pytest-cov` for local development:
39+
40+
1. `Fork pytest-cov on GitHub <https://github.com/schlamar/pytest-cov/fork>`_.
41+
2. Clone your fork locally::
42+
43+
git clone [email protected]:your_name_here/pytest-cov.git
44+
45+
3. Create a branch for local development::
46+
47+
git checkout -b name-of-your-bugfix-or-feature
48+
49+
Now you can make your changes locally.
50+
51+
4. When you're done making changes, run all the checks, doc builder and spell checker with `tox <http://tox.readthedocs.org/en/latest/install.html>`_ one command::
52+
53+
tox
54+
55+
5. Commit your changes and push your branch to GitHub::
56+
57+
git add .
58+
git commit -m "Your detailed description of your changes."
59+
git push origin name-of-your-bugfix-or-feature
60+
61+
6. Submit a pull request through the GitHub website.
62+
63+
Pull Request Guidelines
64+
-----------------------
65+
66+
If you need some code review or feedback while you're developing the code just make the pull request.
67+
68+
For merging, you should:
69+
70+
1. Include passing tests (run ``tox``) [1]_.
71+
2. Update documentation when there's new API, functionality etc.
72+
3. Add a note to ``CHANGELOG.rst`` about the changes.
73+
4. Add yourself to ``AUTHORS.rst``.
74+
75+
.. [1] If you don't have all the necessary python versions available locally you can rely on Travis - it will
76+
`run the tests <https://travis-ci.org/schlamar/pytest-cov/pull_requests>`_ for each change you add in the pull request.
77+
78+
It will be slower though ...
79+
80+
Tips
81+
----
82+
83+
To run a subset of tests::
84+
85+
tox -e envname -- py.test -k test_myfeature
86+
87+
To run all the test environments in *parallel* (you need to ``pip install detox``)::
88+
89+
detox

‎cov-core/LICENSE.txt renamed to ‎LICENSE

File renamed without changes.

‎MANIFEST.in

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
graft docs
2+
graft example
3+
graft src
4+
graft ci
5+
graft tests
6+
7+
include .bumpversion.cfg
8+
include .coveragerc
9+
include .cookiecutterrc
10+
include .isort.cfg
11+
include .pylintrc
12+
13+
include AUTHORS.rst
14+
include CHANGELOG.rst
15+
include CONTRIBUTING.rst
16+
include LICENSE
17+
include README.rst
18+
19+
include tox.ini .travis.yml appveyor.yml
20+
21+
global-exclude *.py[cod] __pycache__ *.so

0 commit comments

Comments
 (0)