Skip to content

Commit 4667b4d

Browse files
nicoddemusnicoddemus
committed
Merge branch 'master' into features
2 parents 654af0b + a87b1c7 commit 4667b4d

33 files changed

Lines changed: 177 additions & 84 deletions

‎CHANGELOG.rst‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ Changes
2525
``addopts=--pdbcls=module.SomeClass`` on ``pytest.ini``. Thanks `@davidszotten`_ for
2626
the PR (`#1952`_).
2727

28-
*
29-
30-
*
3128

3229
.. _@davidszotten: https://github.com/davidszotten
3330
.. _@fushi: https://github.com/fushi
@@ -38,9 +35,22 @@ Changes
3835
.. _#1952: https://github.com/pytest-dev/pytest/pull/1952
3936

4037

41-
3.0.3.dev
38+
3.0.4.dev
4239
=========
4340

41+
42+
*
43+
44+
*
45+
46+
*
47+
48+
*
49+
50+
51+
3.0.3
52+
=====
53+
4454
* The ``ids`` argument to ``parametrize`` again accepts ``unicode`` strings
4555
in Python 2 (`#1905`_).
4656
Thanks `@philpep`_ for the report and `@nicoddemus`_ for the PR.
@@ -59,6 +69,10 @@ Changes
5969
* Explain a bad scope value passed to ``@fixture`` declarations or
6070
a ``MetaFunc.parametrize()`` call. Thanks `@tgoodlet`_ for the PR.
6171

72+
* This version includes ``pluggy-0.4.0``, which correctly handles
73+
``VersionConflict`` errors in plugins (`#704`_).
74+
Thanks `@nicoddemus`_ for the PR.
75+
6276

6377
.. _@philpep: https://github.com/philpep
6478
.. _@raquel-ucl: https://github.com/raquel-ucl
@@ -69,6 +83,7 @@ Changes
6983
.. _#1905: https://github.com/pytest-dev/pytest/issues/1905
7084
.. _#1934: https://github.com/pytest-dev/pytest/issues/1934
7185
.. _#1944: https://github.com/pytest-dev/pytest/issues/1944
86+
.. _#704: https://github.com/pytest-dev/pytest/issues/704
7287

7388

7489

‎_pytest/vendored_packages/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ $ pip install -U pluggy==<version> --no-compile --target=_pytest/vendored_packag
1010
```
1111

1212
And commit the modified files. The `pluggy-<version>.dist-info` directory
13-
created by `pip` should be ignored.
13+
created by `pip` should be added as well.

‎_pytest/vendored_packages/pluggy-0.3.1.dist-info/RECORD‎

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

‎_pytest/vendored_packages/pluggy-0.3.1.dist-info/metadata.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_pytest/vendored_packages/pluggy-0.3.1.dist-info/pbr.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

_pytest/vendored_packages/pluggy-0.3.1.dist-info/DESCRIPTION.rst renamed to _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Plugin registration and hook calling for Python
23
===============================================
34

‎_pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pip

‎_pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 holger krekel (rather uses bitbucket/hpk42)
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+

_pytest/vendored_packages/pluggy-0.3.1.dist-info/METADATA renamed to _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Metadata-Version: 2.0
22
Name: pluggy
3-
Version: 0.3.1
3+
Version: 0.4.0
44
Summary: plugin and hook calling mechanisms for python
5-
Home-page: UNKNOWN
5+
Home-page: https://github.com/pytest-dev/pluggy
66
Author: Holger Krekel
77
Author-email: holger at merlinux.eu
88
License: MIT license
@@ -27,6 +27,7 @@ Classifier: Programming Language :: Python :: 3.3
2727
Classifier: Programming Language :: Python :: 3.4
2828
Classifier: Programming Language :: Python :: 3.5
2929

30+
3031
Plugin registration and hook calling for Python
3132
===============================================
3233

‎_pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
pluggy.py,sha256=u0oG9cv-oLOkNvEBlwnnu8pp1AyxpoERgUO00S3rvpQ,31543
2+
pluggy-0.4.0.dist-info/DESCRIPTION.rst,sha256=ltvjkFd40LW_xShthp6RRVM6OB_uACYDFR3kTpKw7o4,307
3+
pluggy-0.4.0.dist-info/LICENSE.txt,sha256=ruwhUOyV1HgE9F35JVL9BCZ9vMSALx369I4xq9rhpkM,1134
4+
pluggy-0.4.0.dist-info/METADATA,sha256=pe2hbsqKFaLHC6wAQPpFPn0KlpcPfLBe_BnS4O70bfk,1364
5+
pluggy-0.4.0.dist-info/RECORD,,
6+
pluggy-0.4.0.dist-info/WHEEL,sha256=9Z5Xm-eel1bTS7e6ogYiKz0zmPEqDwIypurdHN1hR40,116
7+
pluggy-0.4.0.dist-info/metadata.json,sha256=T3go5L2qOa_-H-HpCZi3EoVKb8sZ3R-fOssbkWo2nvM,1119
8+
pluggy-0.4.0.dist-info/top_level.txt,sha256=xKSCRhai-v9MckvMuWqNz16c1tbsmOggoMSwTgcpYHE,7
9+
pluggy-0.4.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4

0 commit comments

Comments
 (0)