Skip to content

Commit

Permalink
Fix #31238: use vendoring for our vendoring
Browse files Browse the repository at this point in the history
  • Loading branch information
gsnedders committed Oct 24, 2021
1 parent ee92e46 commit bbe9367
Show file tree
Hide file tree
Showing 1,783 changed files with 72,540 additions and 326,953 deletions.
26 changes: 1 addition & 25 deletions tools/localpaths.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,7 @@

sys.path.insert(0, os.path.join(here))
sys.path.insert(0, os.path.join(here, "wptserve"))
sys.path.insert(0, os.path.join(here, "third_party", "pywebsocket3"))
sys.path.insert(0, os.path.join(here, "third_party", "atomicwrites"))
sys.path.insert(0, os.path.join(here, "third_party", "attrs", "src"))
sys.path.insert(0, os.path.join(here, "third_party", "funcsigs"))
sys.path.insert(0, os.path.join(here, "third_party", "html5lib"))
sys.path.insert(0, os.path.join(here, "third_party", "zipp"))
sys.path.insert(0, os.path.join(here, "third_party", "more-itertools"))
sys.path.insert(0, os.path.join(here, "third_party", "packaging"))
sys.path.insert(0, os.path.join(here, "third_party", "pathlib2"))
sys.path.insert(0, os.path.join(here, "third_party", "pluggy", "src"))
sys.path.insert(0, os.path.join(here, "third_party", "py"))
sys.path.insert(0, os.path.join(here, "third_party", "pytest"))
sys.path.insert(0, os.path.join(here, "third_party", "pytest", "src"))
sys.path.insert(0, os.path.join(here, "third_party", "pytest-asyncio"))
sys.path.insert(0, os.path.join(here, "third_party", "six"))
sys.path.insert(0, os.path.join(here, "third_party", "webencodings"))
sys.path.insert(0, os.path.join(here, "third_party", "h2"))
sys.path.insert(0, os.path.join(here, "third_party", "hpack"))
sys.path.insert(0, os.path.join(here, "third_party", "hyperframe"))
sys.path.insert(0, os.path.join(here, "third_party", "certifi"))
sys.path.insert(0, os.path.join(here, "third_party", "hyper"))
sys.path.insert(0, os.path.join(here, "third_party", "websockets", "src"))
sys.path.insert(0, os.path.join(here, "third_party", "iniconfig", "src"))
if sys.version_info < (3, 8):
sys.path.insert(0, os.path.join(here, "third_party", "importlib_metadata"))
sys.path.insert(0, os.path.join(here, "third_party"))
sys.path.insert(0, os.path.join(here, "webdriver"))
sys.path.insert(0, os.path.join(here, "wptrunner"))
sys.path.insert(0, os.path.join(here, "webtransport"))
12 changes: 12 additions & 0 deletions tools/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[tool.vendoring]
destination = "third_party/"
requirements = "requirements_vendor.txt"
namespace = "third_party"
patches-dir = "third_party_patches"

[tool.vendoring.license.fallback-urls]
funcsigs = "https://github.com/aliles/funcsigs/raw/master/LICENSE"
hyperframe = "https://github.com/python-hyper/hyperframe/raw/master/LICENSE"
hpack = "https://github.com/python-hyper/hpack/raw/master/LICENSE"
h2 = "https://github.com/python-hyper/h2/raw/master/LICENSE"
webencodings = "https://github.com/gsnedders/python-webencodings/raw/master/LICENSE"
26 changes: 26 additions & 0 deletions tools/requirements_vendor.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
atomicwrites==1.4.0
attrs==21.2.0
certifi==2021.10.8
funcsigs==1.0.2
h2==2.6.2
hpack==3.0.0
html5lib==1.1
hyper==0.7.0
hyperframe==3.2.0
importlib-metadata==4.8.1
iniconfig==1.1.1
mod-pywebsocket @ git+https://github.com/GoogleChromeLabs/pywebsocket3.git@50602a14f1b6da17e0b619833a13addc6ea78bc2
more-itertools==8.10.0
packaging==21.0
pathlib2==2.3.6
pluggy==1.0.0
py==1.10.0
pyparsing==3.0.0
pytest==6.2.5
pytest-asyncio==0.16.0
six==1.16.0
toml==0.10.2
typing-extensions==3.10.0.2
webencodings==0.5.1
websockets==9.1
zipp==3.6.0
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
uses a python program to determine startup script generated by pip.
You can speed up completion somewhat by changing this script to include
# PYTHON_ARGCOMPLETE_OK
so the the python-argcomplete-check-easy-install-script does not
so the python-argcomplete-check-easy-install-script does not
need to be called to find the entry point of the code and see if that is
marked with PYTHON_ARGCOMPLETE_OK.
Expand Down Expand Up @@ -103,7 +103,7 @@ def __call__(self, prefix: str, **kwargs: Any) -> List[str]:
import argcomplete.completers
except ImportError:
sys.exit(-1)
filescompleter = FastFilesCompleter() # type: Optional[FastFilesCompleter]
filescompleter: Optional[FastFilesCompleter] = FastFilesCompleter()

def try_argcomplete(parser: argparse.ArgumentParser) -> None:
argcomplete.autocomplete(parser, always_complete_options=False)
Expand Down
File renamed without changes.
Loading

0 comments on commit bbe9367

Please sign in to comment.