From 756db2131f6009f0fee2b20e82484f3db1188f47 Mon Sep 17 00:00:00 2001
From: Tyler Goodlet <tgoodlet@gmail.com>
Date: Thu, 24 Aug 2017 16:53:24 -0400
Subject: [PATCH] Drop vendoring from packaging

---
 .coveragerc | 1 -
 setup.py    | 2 +-
 tox.ini     | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 27db64e09..48670b41d 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -4,4 +4,3 @@ omit =
     *standalonetemplate.py
     # oldinterpret could be removed, as it is no longer used in py26+
     *oldinterpret.py
-    vendored_packages
diff --git a/setup.py b/setup.py
index e7fb194d2..5698bed81 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ def main():
         setup_requires=['setuptools-scm'],
         install_requires=install_requires,
         extras_require=extras_require,
-        packages=['_pytest', '_pytest.assertion', '_pytest._code', '_pytest.vendored_packages'],
+        packages=['_pytest', '_pytest.assertion', '_pytest._code'],
         py_modules=['pytest'],
         zip_safe=False,
     )
diff --git a/tox.ini b/tox.ini
index 61a9ece8d..907b7891b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -162,7 +162,7 @@ usedevelop = True
 deps =
     autopep8
 commands =
-    autopep8 --in-place -r --max-line-length=120 --exclude=vendored_packages,test_source_multiline_block.py _pytest testing
+    autopep8 --in-place -r --max-line-length=120 --exclude=test_source_multiline_block.py _pytest testing
 
 [testenv:jython]
 changedir = testing
@@ -213,4 +213,3 @@ filterwarnings =
 
 [flake8]
 max-line-length = 120
-exclude = _pytest/vendored_packages/pluggy.py