Skip to content

Commit 333a9ad

Browse files
author
Tyler Goodlet
committed
Stop vendoring pluggy
Resolves #2716
1 parent 5c0feb2 commit 333a9ad

File tree

13 files changed

+4
-915
lines changed

13 files changed

+4
-915
lines changed

_pytest/_pluggy.py

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
"""
2-
imports symbols from vendored "pluggy" if available, otherwise
3-
falls back to importing "pluggy" from the default namespace.
2+
Import symbols from ``pluggy``
43
"""
54
from __future__ import absolute_import, division, print_function
6-
try:
7-
from _pytest.vendored_packages.pluggy import * # noqa
8-
from _pytest.vendored_packages.pluggy import __version__ # noqa
9-
except ImportError:
10-
from pluggy import * # noqa
11-
from pluggy import __version__ # noqa
5+
from pluggy import *
6+
from pluggy import __version__

_pytest/vendored_packages/README.md

-13
This file was deleted.

_pytest/vendored_packages/__init__.py

Whitespace-only changes.

_pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst

-11
This file was deleted.

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

-1
This file was deleted.

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

-22
This file was deleted.

_pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA

-40
This file was deleted.

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

-9
This file was deleted.

_pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL

-6
This file was deleted.

_pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json

-1
This file was deleted.

_pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt

-1
This file was deleted.

0 commit comments

Comments
 (0)