diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 4beef059..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,60 +0,0 @@ -version: 2 - -jobs: - python2-test: - docker: - - image: "python:2.7-stretch" - steps: - - checkout - - run: pip install -e .[all] .[test] - - run: py.test -v test/ - - run: pylint pyls test - - run: pycodestyle pyls test - - run: pyflakes pyls test - - python3-test: - docker: - - image: "python:3.6-stretch" - steps: - - checkout - # To test Jedi environments - - run: python3 -m venv /tmp/pyenv - - run: /tmp/pyenv/bin/python -m pip install loghub - - run: pip install -e .[all] .[test] - - run: py.test -v test/ - - lint: - docker: - - image: "python:2.7-stretch" - steps: - - checkout - - run: pip install -e .[all] .[test] - - run: pylint pyls test - - run: pycodestyle pyls test - - run: pyflakes pyls test - - publish: - docker: - - image: "python:3.6-stretch" - steps: - - checkout - - run: ./scripts/circle/pypi.sh - - -workflows: - version: 2 - build: - jobs: - - python2-test: - filters: { tags: { only: /.*/ } } - - python3-test: - filters: { tags: { only: /.*/ } } - - publish: - filters: - tags: - only: /[0-9]+(\.[0-9]+)+((-(beta|rc)[0-9]{1,2})(\.[0-9])?)?/ - branches: - ignore: /.*/ - requires: - - python2-test - - python3-test diff --git a/.coveragerc b/.coveragerc index ba07147b..2c18c08a 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,2 +1,2 @@ [run] -omit = pyls/_version.py +omit = pylsp/_version.py diff --git a/.gitattributes b/.gitattributes index 1602f153..1d256835 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -pyls/_version.py export-subst +pylsp/_version.py export-subst diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index bae3cca7..04cd2a8f 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -28,13 +28,13 @@ jobs: with: # TODO: check with Python 3, but need to fix the # errors first - python-version: '2.7' + python-version: '3.6' architecture: 'x64' - run: python -m pip install --upgrade pip setuptools - run: pip install -e .[pylint,pycodestyle,pyflakes] - name: Pylint checks - run: pylint pyls test + run: pylint pylsp test - name: Code style checks - run: pycodestyle pyls test + run: pycodestyle pylsp test - name: Pyflakes checks - run: pyflakes pyls test + run: pyflakes pylsp test diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index cdd8b07c..012a4365 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - PYTHON_VERSION: ['3.9', '3.8', '3.7', '3.6', '2.7'] + PYTHON_VERSION: ['3.9', '3.8', '3.7', '3.6'] timeout-minutes: 10 steps: - uses: actions/cache@v1 @@ -41,3 +41,7 @@ jobs: - run: python -m pip install --upgrade pip setuptools - run: pip install -e .[all,test] - run: pytest -v test/ + # Enable this if SSH debugging is required + # - name: Setup tmate session + # uses: mxschmitt/action-tmate@v3 + # if: ${{ failure() }} diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml index b17b72a0..513ba39e 100644 --- a/.github/workflows/test-mac.yml +++ b/.github/workflows/test-mac.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - PYTHON_VERSION: ['3.9', '3.8', '3.7', '3.6', '2.7'] + PYTHON_VERSION: ['3.9', '3.8', '3.7', '3.6'] timeout-minutes: 10 steps: - uses: actions/cache@v1 @@ -41,3 +41,7 @@ jobs: - run: python -m pip install --upgrade pip setuptools - run: pip install -e .[all,test] - run: pytest -v test/ + # Enable this if SSH debugging is required + # - name: Setup tmate session + # uses: mxschmitt/action-tmate@v3 + # if: ${{ failure() }} diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml index 03032ae1..0902f556 100644 --- a/.github/workflows/test-win.yml +++ b/.github/workflows/test-win.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - PYTHON_VERSION: ['3.9', '3.8', '3.7', '3.6', '2.7'] + PYTHON_VERSION: ['3.9', '3.8', '3.7', '3.6'] timeout-minutes: 10 steps: - uses: actions/cache@v1 diff --git a/.pylintrc b/.pylintrc index 29802a2c..4249ac52 100644 --- a/.pylintrc +++ b/.pylintrc @@ -25,5 +25,5 @@ reports = no [TYPECHECK] generated-members = - pyls_* + pylsp_* cache_clear diff --git a/LICENSE b/LICENSE index 56c842e2..6dc565b9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright 2017 Palantir Technologies, Inc. +Copyright 2017-2020 Palantir Technologies, Inc. +Copyright 2021 Python Language Server Contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/MANIFEST.in b/MANIFEST.in index eea26600..e82d1f50 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include README.md include versioneer.py -include pyls/_version.py +include pylsp/_version.py include LICENSE include .pylintrc recursive-include test *.py diff --git a/README.md b/README.md index ad19b5c3..863c3502 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -# Python Language Server +# Python LSP Server [![image](https://github.com/python-ls/python-ls/workflows/Linux%20tests/badge.svg)](https://github.com/python-ls/python-ls/actions?query=workflow%3A%22Linux+tests%22) [![image](https://github.com/python-ls/python-ls/workflows/Mac%20tests/badge.svg)](https://github.com/python-ls/python-ls/actions?query=workflow%3A%22Mac+tests%22) [![image](https://github.com/python-ls/python-ls/workflows/Windows%20tests/badge.svg)](https://github.com/python-ls/python-ls/actions?query=workflow%3A%22Windows+tests%22) [![image](https://img.shields.io/github/license/python-ls/python-ls.svg)](https://github.com/python-ls/python-ls/blob/master/LICENSE) -A Python 2.7 and 3.5+ implementation of the [Language Server Protocol](https://github.com/Microsoft/language-server-protocol). +A Python 3.6+ implementation of the [Language Server Protocol](https://github.com/Microsoft/language-server-protocol). ## Installation The base language server requires [Jedi](https://github.com/davidhalter/jedi) to provide Completions, Definitions, Hover, References, Signature Help, and Symbols: ``` -pip install python-language-server +pip install python-lsp-server ``` If the respective dependencies are found, the following optional providers will be enabled: @@ -24,13 +24,13 @@ If the respective dependencies are found, the following optional providers will Optional providers can be installed using the `extras` syntax. To install [YAPF](https://github.com/google/yapf) formatting for example: ``` -pip install 'python-language-server[yapf]' +pip install 'python-lsp-server[yapf]' ``` All optional providers can be installed using: ``` -pip install 'python-language-server[all]' +pip install 'python-lsp-server[all]' ``` If you get an error similar to `'install_requires' must be a string or list of strings` then please upgrade setuptools before trying again. @@ -57,12 +57,12 @@ Configuration is loaded from zero or more configuration sources. Currently impl - pycodestyle: discovered in `~/.config/pycodestyle`, `setup.cfg`, `tox.ini` and `pycodestyle.cfg`. - flake8: discovered in `~/.config/flake8`, `setup.cfg`, `tox.ini` and `flake8.cfg` -The default configuration source is pycodestyle. Change the `pyls.configurationSources` setting to `['flake8']` in order to respect flake8 configuration instead. +The default configuration source is pycodestyle. Change the `pylsp.configurationSources` setting to `['flake8']` in order to respect flake8 configuration instead. Overall configuration is computed first from user configuration (in home directory), overridden by configuration passed in by the language client, and then overriden by configuration discovered in the workspace. To enable pydocstyle for linting docstrings add the following setting in your LSP configuration: -`\` "pyls.plugins.pydocstyle.enabled": true \`` +`\` "pylsp.plugins.pydocstyle.enabled": true \`` See [vscode-client/package.json](vscode-client/package.json) for the full set of supported configuration options. @@ -108,33 +108,6 @@ To run the test suite: pip install .[test] && pytest ``` -# Develop against VS Code - -The Python language server can be developed against a local instance of -Visual Studio Code. - -Install [VSCode](https://code.visualstudio.com/download) - -```bash -# Setup a virtual env -virtualenv env -. env/bin/activate - -# Install pyls -pip install . - -# Install the vscode-client extension -cd vscode-client -yarn install - -# Run VSCode which is configured to use pyls -# See the bottom of vscode-client/src/extension.ts for info -yarn run vscode -- $PWD/../ -``` - -Then to debug, click View -> Output and in the dropdown will be pyls. -To refresh VSCode, press `Cmd + r` - ## License This project is made available under the MIT License. diff --git a/RELEASE.md b/RELEASE.md index 2311c1b0..64b59e52 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,4 @@ -To release a new version of the PyLS you need to follow these steps: +To release a new version of the PyLSP you need to follow these steps: * Close the current milestone on Github diff --git a/pyls/__init__.py b/pyls/__init__.py deleted file mode 100644 index d3e7ead0..00000000 --- a/pyls/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2017 Palantir Technologies, Inc. -import os -import sys -import pluggy -from ._version import get_versions - -if sys.version_info[0] < 3: - from future.standard_library import install_aliases - install_aliases() - -__version__ = get_versions()['version'] -del get_versions - -PYLS = 'pyls' - -hookspec = pluggy.HookspecMarker(PYLS) -hookimpl = pluggy.HookimplMarker(PYLS) - -IS_WIN = os.name == 'nt' diff --git a/pyls/_version.py b/pyls/_version.py deleted file mode 100644 index aab9f795..00000000 --- a/pyls/_version.py +++ /dev/null @@ -1,520 +0,0 @@ -# pylint: skip-file -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.18 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "$Format:%d$" - git_full = "$Format:%H$" - git_date = "$Format:%ci$" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "pep440" - cfg.tag_prefix = "" - cfg.parentdir_prefix = "" - cfg.versionfile_source = "pyls/_version.py" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %s but none started with prefix %s" % - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %s" % r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%s*" % tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%s'" - % describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" - % (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, - verbose) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None} - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", "date": None} diff --git a/pyls/config/__init__.py b/pyls/config/__init__.py deleted file mode 100644 index 9c6eb52c..00000000 --- a/pyls/config/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Copyright 2017 Palantir Technologies, Inc. diff --git a/pyls/hookspecs.py b/pyls/hookspecs.py deleted file mode 100644 index 5f30cd08..00000000 --- a/pyls/hookspecs.py +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 2017 Palantir Technologies, Inc. -# pylint: disable=redefined-builtin, unused-argument -from pyls import hookspec - - -@hookspec -def pyls_code_actions(config, workspace, document, range, context): - pass - - -@hookspec -def pyls_code_lens(config, workspace, document): - pass - - -@hookspec -def pyls_commands(config, workspace): - """The list of command strings supported by the server. - - Returns: - List[str]: The supported commands. - """ - - -@hookspec -def pyls_completions(config, workspace, document, position): - pass - - -@hookspec -def pyls_definitions(config, workspace, document, position): - pass - - -@hookspec -def pyls_dispatchers(config, workspace): - pass - - -@hookspec -def pyls_document_did_open(config, workspace, document): - pass - - -@hookspec -def pyls_document_did_save(config, workspace, document): - pass - - -@hookspec -def pyls_document_highlight(config, workspace, document, position): - pass - - -@hookspec -def pyls_document_symbols(config, workspace, document): - pass - - -@hookspec(firstresult=True) -def pyls_execute_command(config, workspace, command, arguments): - pass - - -@hookspec -def pyls_experimental_capabilities(config, workspace): - pass - - -@hookspec -def pyls_folding_range(config, workspace, document): - pass - - -@hookspec(firstresult=True) -def pyls_format_document(config, workspace, document): - pass - - -@hookspec(firstresult=True) -def pyls_format_range(config, workspace, document, range): - pass - - -@hookspec(firstresult=True) -def pyls_hover(config, workspace, document, position): - pass - - -@hookspec -def pyls_initialize(config, workspace): - pass - - -@hookspec -def pyls_initialized(): - pass - - -@hookspec -def pyls_lint(config, workspace, document, is_saved): - pass - - -@hookspec -def pyls_references(config, workspace, document, position, exclude_declaration): - pass - - -@hookspec(firstresult=True) -def pyls_rename(config, workspace, document, position, new_name): - pass - - -@hookspec -def pyls_settings(config): - pass - - -@hookspec(firstresult=True) -def pyls_signature_help(config, workspace, document, position): - pass diff --git a/pyls/plugins/__init__.py b/pyls/plugins/__init__.py deleted file mode 100644 index 9c6eb52c..00000000 --- a/pyls/plugins/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Copyright 2017 Palantir Technologies, Inc. diff --git a/pylsp/__init__.py b/pylsp/__init__.py new file mode 100644 index 00000000..923ad919 --- /dev/null +++ b/pylsp/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + +import os +import pluggy +from ._version import __version__ + +PYLSP = 'pylsp' +IS_WIN = os.name == 'nt' + +hookspec = pluggy.HookspecMarker(PYLSP) +hookimpl = pluggy.HookimplMarker(PYLSP) + +__all__ = [__version__] diff --git a/pyls/__main__.py b/pylsp/__main__.py similarity index 77% rename from pyls/__main__.py rename to pylsp/__main__.py index 6440085f..065cdee9 100644 --- a/pyls/__main__.py +++ b/pylsp/__main__.py @@ -1,4 +1,6 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import argparse import logging import logging.config @@ -9,8 +11,8 @@ except Exception: # pylint: disable=broad-except import json -from .python_ls import (PythonLanguageServer, start_io_lang_server, - start_tcp_lang_server) +from .python_lsp import (PythonLSPServer, start_io_lang_server, + start_tcp_lang_server) LOG_FORMAT = "%(asctime)s UTC - %(levelname)s - %(name)s - %(message)s" @@ -62,11 +64,11 @@ def main(): if args.tcp: start_tcp_lang_server(args.host, args.port, args.check_parent_process, - PythonLanguageServer) + PythonLSPServer) else: stdin, stdout = _binary_stdio() start_io_lang_server(stdin, stdout, args.check_parent_process, - PythonLanguageServer) + PythonLSPServer) def _binary_stdio(): @@ -75,23 +77,7 @@ def _binary_stdio(): This seems to be different for Window/Unix Python2/3, so going by: https://stackoverflow.com/questions/2850893/reading-binary-data-from-stdin """ - PY3K = sys.version_info >= (3, 0) - - if PY3K: - # pylint: disable=no-member - stdin, stdout = sys.stdin.buffer, sys.stdout.buffer - else: - # Python 2 on Windows opens sys.stdin in text mode, and - # binary data that read from it becomes corrupted on \r\n - if sys.platform == "win32": - # set sys.stdin to binary mode - # pylint: disable=no-member,import-error - import os - import msvcrt - msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) - msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) - stdin, stdout = sys.stdin, sys.stdout - + stdin, stdout = sys.stdin.buffer, sys.stdout.buffer return stdin, stdout diff --git a/pyls/_utils.py b/pylsp/_utils.py similarity index 92% rename from pyls/_utils.py rename to pylsp/_utils.py index 9163bfc5..dd46701f 100644 --- a/pyls/_utils.py +++ b/pylsp/_utils.py @@ -1,21 +1,17 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import functools import inspect import logging import os -import sys +import pathlib import threading import jedi -PY2 = sys.version_info.major == 2 JEDI_VERSION = jedi.__version__ -if PY2: - import pathlib2 as pathlib -else: - import pathlib - log = logging.getLogger(__name__) @@ -27,8 +23,9 @@ def wrapper(func): @functools.wraps(func) def debounced(*args, **kwargs): - call_args = inspect.getcallargs(func, *args, **kwargs) - key = call_args[keyed_by] if keyed_by else None + sig = inspect.signature(func) + call_args = sig.bind(*args, **kwargs) + key = call_args.arguments[keyed_by] if keyed_by else None def run(): with lock: @@ -100,11 +97,7 @@ def match_uri_to_workspace(uri, workspaces): max_len, chosen_workspace = -1, None path = pathlib.Path(uri).parts for workspace in workspaces: - try: - workspace_parts = pathlib.Path(workspace).parts - except TypeError: - # This can happen in Python2 if 'value' is a subclass of string - workspace_parts = pathlib.Path(unicode(workspace)).parts + workspace_parts = pathlib.Path(workspace).parts if len(workspace_parts) > len(path): continue match_len = 0 diff --git a/pylsp/_version.py b/pylsp/_version.py new file mode 100644 index 00000000..016ef939 --- /dev/null +++ b/pylsp/_version.py @@ -0,0 +1,8 @@ +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + +"""PyLSP versioning information.""" + + +VERSION_INFO = (1, 0, 0, 'dev0') +__version__ = '.'.join(map(str, VERSION_INFO)) diff --git a/pylsp/config/__init__.py b/pylsp/config/__init__.py new file mode 100644 index 00000000..58c60e1c --- /dev/null +++ b/pylsp/config/__init__.py @@ -0,0 +1,2 @@ +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. diff --git a/pyls/config/config.py b/pylsp/config/config.py similarity index 89% rename from pyls/config/config.py rename to pylsp/config/config.py index 0e124e2c..053dd236 100644 --- a/pyls/config/config.py +++ b/pylsp/config/config.py @@ -1,14 +1,14 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. +# pylint: disable=import-outside-toplevel + import logging +from functools import lru_cache import pkg_resources -try: - from functools import lru_cache -except ImportError: - from backports.functools_lru_cache import lru_cache import pluggy -from pyls import _utils, hookspecs, uris, PYLS +from pylsp import _utils, hookspecs, uris, PYLSP log = logging.getLogger(__name__) @@ -16,8 +16,7 @@ DEFAULT_CONFIG_SOURCES = ['pycodestyle'] -class Config(object): - +class Config: def __init__(self, root_uri, init_opts, process_id, capabilities): self._root_path = uris.to_fs_path(root_uri) self._root_uri = root_uri @@ -40,7 +39,7 @@ def __init__(self, root_uri, init_opts, process_id, capabilities): except ImportError: pass - self._pm = pluggy.PluginManager(PYLS) + self._pm = pluggy.PluginManager(PYLSP) self._pm.trace.root.setwriter(log.debug) self._pm.enable_tracing() self._pm.add_hookspecs(hookspecs) @@ -48,21 +47,21 @@ def __init__(self, root_uri, init_opts, process_id, capabilities): # Pluggy will skip loading a plugin if it throws a DistributionNotFound exception. # However I don't want all plugins to have to catch ImportError and re-throw. So here we'll filter # out any entry points that throw ImportError assuming one or more of their dependencies isn't present. - for entry_point in pkg_resources.iter_entry_points(PYLS): + for entry_point in pkg_resources.iter_entry_points(PYLSP): try: entry_point.load() except ImportError as e: - log.warning("Failed to load %s entry point '%s': %s", PYLS, entry_point.name, e) + log.warning("Failed to load %s entry point '%s': %s", PYLSP, entry_point.name, e) self._pm.set_blocked(entry_point.name) # Load the entry points into pluggy, having blocked any failing ones - self._pm.load_setuptools_entrypoints(PYLS) + self._pm.load_setuptools_entrypoints(PYLSP) for name, plugin in self._pm.list_name_plugin(): if plugin is not None: - log.info("Loaded pyls plugin %s from %s", name, plugin) + log.info("Loaded pylsp plugin %s from %s", name, plugin) - for plugin_conf in self._pm.hook.pyls_settings(config=self): + for plugin_conf in self._pm.hook.pylsp_settings(config=self): self._plugin_settings = _utils.merge_dicts(self._plugin_settings, plugin_conf) self._update_disabled_plugins() diff --git a/pyls/config/flake8_conf.py b/pylsp/config/flake8_conf.py similarity index 91% rename from pyls/config/flake8_conf.py rename to pylsp/config/flake8_conf.py index 47b6cfad..e2c90099 100644 --- a/pyls/config/flake8_conf.py +++ b/pylsp/config/flake8_conf.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging import os -from pyls._utils import find_parents +from pylsp._utils import find_parents from .source import ConfigSource log = logging.getLogger(__name__) diff --git a/pyls/config/pycodestyle_conf.py b/pylsp/config/pycodestyle_conf.py similarity index 88% rename from pyls/config/pycodestyle_conf.py rename to pylsp/config/pycodestyle_conf.py index 49d3d16f..a5f2fbe9 100644 --- a/pyls/config/pycodestyle_conf.py +++ b/pylsp/config/pycodestyle_conf.py @@ -1,6 +1,8 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import pycodestyle -from pyls._utils import find_parents +from pylsp._utils import find_parents from .source import ConfigSource diff --git a/pyls/config/source.py b/pylsp/config/source.py similarity index 95% rename from pyls/config/source.py rename to pylsp/config/source.py index c3442e01..87fe7156 100644 --- a/pyls/config/source.py +++ b/pylsp/config/source.py @@ -1,4 +1,6 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import configparser import logging import os @@ -7,7 +9,7 @@ log = logging.getLogger(__name__) -class ConfigSource(object): +class ConfigSource: """Base class for implementing a config source.""" def __init__(self, root_path): diff --git a/pylsp/hookspecs.py b/pylsp/hookspecs.py new file mode 100644 index 00000000..ff2925ac --- /dev/null +++ b/pylsp/hookspecs.py @@ -0,0 +1,124 @@ +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + +# pylint: disable=redefined-builtin, unused-argument +from pylsp import hookspec + + +@hookspec +def pylsp_code_actions(config, workspace, document, range, context): + pass + + +@hookspec +def pylsp_code_lens(config, workspace, document): + pass + + +@hookspec +def pylsp_commands(config, workspace): + """The list of command strings supported by the server. + + Returns: + List[str]: The supported commands. + """ + + +@hookspec +def pylsp_completions(config, workspace, document, position): + pass + + +@hookspec +def pylsp_definitions(config, workspace, document, position): + pass + + +@hookspec +def pylsp_dispatchers(config, workspace): + pass + + +@hookspec +def pylsp_document_did_open(config, workspace, document): + pass + + +@hookspec +def pylsp_document_did_save(config, workspace, document): + pass + + +@hookspec +def pylsp_document_highlight(config, workspace, document, position): + pass + + +@hookspec +def pylsp_document_symbols(config, workspace, document): + pass + + +@hookspec(firstresult=True) +def pylsp_execute_command(config, workspace, command, arguments): + pass + + +@hookspec +def pylsp_experimental_capabilities(config, workspace): + pass + + +@hookspec +def pylsp_folding_range(config, workspace, document): + pass + + +@hookspec(firstresult=True) +def pylsp_format_document(config, workspace, document): + pass + + +@hookspec(firstresult=True) +def pylsp_format_range(config, workspace, document, range): + pass + + +@hookspec(firstresult=True) +def pylsp_hover(config, workspace, document, position): + pass + + +@hookspec +def pylsp_initialize(config, workspace): + pass + + +@hookspec +def pylsp_initialized(): + pass + + +@hookspec +def pylsp_lint(config, workspace, document, is_saved): + pass + + +@hookspec +def pylsp_references(config, workspace, document, position, exclude_declaration): + pass + + +@hookspec(firstresult=True) +def pylsp_rename(config, workspace, document, position, new_name): + pass + + +@hookspec +def pylsp_settings(config): + pass + + +@hookspec(firstresult=True) +def pylsp_signature_help(config, workspace, document, position): + pass diff --git a/pyls/lsp.py b/pylsp/lsp.py similarity index 79% rename from pyls/lsp.py rename to pylsp/lsp.py index a3f88d38..b82c72c5 100644 --- a/pyls/lsp.py +++ b/pylsp/lsp.py @@ -1,11 +1,13 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + """Some Language Server Protocol constants https://github.com/Microsoft/language-server-protocol/blob/master/protocol.md """ -class CompletionItemKind(object): +class CompletionItemKind: Text = 1 Method = 2 Function = 3 @@ -33,32 +35,32 @@ class CompletionItemKind(object): TypeParameter = 25 -class DocumentHighlightKind(object): +class DocumentHighlightKind: Text = 1 Read = 2 Write = 3 -class DiagnosticSeverity(object): +class DiagnosticSeverity: Error = 1 Warning = 2 Information = 3 Hint = 4 -class InsertTextFormat(object): +class InsertTextFormat: PlainText = 1 Snippet = 2 -class MessageType(object): +class MessageType: Error = 1 Warning = 2 Info = 3 Log = 4 -class SymbolKind(object): +class SymbolKind: File = 1 Module = 2 Namespace = 3 @@ -79,7 +81,7 @@ class SymbolKind(object): Array = 18 -class TextDocumentSyncKind(object): +class TextDocumentSyncKind: NONE = 0 FULL = 1 INCREMENTAL = 2 diff --git a/pylsp/plugins/__init__.py b/pylsp/plugins/__init__.py new file mode 100644 index 00000000..58c60e1c --- /dev/null +++ b/pylsp/plugins/__init__.py @@ -0,0 +1,2 @@ +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. diff --git a/pyls/plugins/autopep8_format.py b/pylsp/plugins/autopep8_format.py similarity index 90% rename from pyls/plugins/autopep8_format.py rename to pylsp/plugins/autopep8_format.py index f841b64f..f62443f6 100644 --- a/pyls/plugins/autopep8_format.py +++ b/pylsp/plugins/autopep8_format.py @@ -1,20 +1,22 @@ -# Copyright 2018 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging import pycodestyle from autopep8 import fix_code, continued_indentation as autopep8_c_i -from pyls import hookimpl +from pylsp import hookimpl log = logging.getLogger(__name__) @hookimpl(tryfirst=True) # Prefer autopep8 over YAPF -def pyls_format_document(config, document): +def pylsp_format_document(config, document): log.info("Formatting document %s with autopep8", document) return _format(config, document) @hookimpl(tryfirst=True) # Prefer autopep8 over YAPF -def pyls_format_range(config, document, range): # pylint: disable=redefined-builtin +def pylsp_format_range(config, document, range): # pylint: disable=redefined-builtin log.info("Formatting document %s in range %s with autopep8", document, range) # First we 'round' the range up/down to full lines only diff --git a/pyls/plugins/definition.py b/pylsp/plugins/definition.py similarity index 83% rename from pyls/plugins/definition.py rename to pylsp/plugins/definition.py index b5b637fa..c46b27ab 100644 --- a/pyls/plugins/definition.py +++ b/pylsp/plugins/definition.py @@ -1,12 +1,14 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging -from pyls import hookimpl, uris, _utils +from pylsp import hookimpl, uris, _utils log = logging.getLogger(__name__) @hookimpl -def pyls_definitions(config, document, position): +def pylsp_definitions(config, document, position): settings = config.plugin_settings('jedi_definition') code_position = _utils.position_to_jedi_linecolumn(document, position) definitions = document.jedi_script().goto( diff --git a/pyls/plugins/flake8_lint.py b/pylsp/plugins/flake8_lint.py similarity index 96% rename from pyls/plugins/flake8_lint.py rename to pylsp/plugins/flake8_lint.py index 4f2e054e..d6323950 100644 --- a/pyls/plugins/flake8_lint.py +++ b/pylsp/plugins/flake8_lint.py @@ -1,23 +1,25 @@ -# Copyright 2019 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + """Linter pluging for flake8""" import logging import os.path import re from subprocess import Popen, PIPE -from pyls import hookimpl, lsp +from pylsp import hookimpl, lsp log = logging.getLogger(__name__) FIX_IGNORES_RE = re.compile(r'([^a-zA-Z0-9_,]*;.*(\W+||$))') @hookimpl -def pyls_settings(): +def pylsp_settings(): # Default flake8 to disabled return {'plugins': {'flake8': {'enabled': False}}} @hookimpl -def pyls_lint(workspace, document): +def pylsp_lint(workspace, document): config = workspace._config settings = config.plugin_settings('flake8', document_path=document.path) log.debug("Got flake8 settings: %s", settings) diff --git a/pyls/plugins/folding.py b/pylsp/plugins/folding.py similarity index 96% rename from pyls/plugins/folding.py rename to pylsp/plugins/folding.py index bb9a9281..91469d3d 100644 --- a/pyls/plugins/folding.py +++ b/pylsp/plugins/folding.py @@ -1,19 +1,19 @@ -# pylint: disable=len-as-condition -# Copyright 2019 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. import re import parso import parso.python.tree as tree_nodes -from pyls import hookimpl +from pylsp import hookimpl SKIP_NODES = (tree_nodes.Module, tree_nodes.IfStmt, tree_nodes.TryStmt) IDENTATION_REGEX = re.compile(r'(\s+).+') @hookimpl -def pyls_folding_range(document): +def pylsp_folding_range(document): program = document.source + '\n' lines = program.splitlines() tree = parso.parse(program) @@ -178,7 +178,7 @@ def __compute_folding_ranges(tree, lines): if isinstance(node, tree_nodes.Newline): # Skip newline nodes continue - elif isinstance(node, tree_nodes.PythonErrorNode): + if isinstance(node, tree_nodes.PythonErrorNode): # Fallback to indentation-based (best-effort) folding start_line, _ = node.start_pos start_line -= 1 @@ -188,7 +188,7 @@ def __compute_folding_ranges(tree, lines): folding_ranges = __merge_folding_ranges( folding_ranges, identation_ranges) break - elif not isinstance(node, SKIP_NODES): + if not isinstance(node, SKIP_NODES): valid = __check_if_node_is_valid(node) if valid: start_line, end_line, stack = __compute_start_end_lines( diff --git a/pyls/plugins/highlight.py b/pylsp/plugins/highlight.py similarity index 80% rename from pyls/plugins/highlight.py rename to pylsp/plugins/highlight.py index 0e63bc27..a67979ac 100644 --- a/pyls/plugins/highlight.py +++ b/pylsp/plugins/highlight.py @@ -1,12 +1,14 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging -from pyls import hookimpl, lsp, _utils +from pylsp import hookimpl, lsp, _utils log = logging.getLogger(__name__) @hookimpl -def pyls_document_highlight(document, position): +def pylsp_document_highlight(document, position): code_position = _utils.position_to_jedi_linecolumn(document, position) usages = document.jedi_script().get_references(**code_position) diff --git a/pyls/plugins/hover.py b/pylsp/plugins/hover.py similarity index 87% rename from pyls/plugins/hover.py rename to pylsp/plugins/hover.py index 9332a52d..e3e6feda 100644 --- a/pyls/plugins/hover.py +++ b/pylsp/plugins/hover.py @@ -1,14 +1,15 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. import logging -from pyls import hookimpl, _utils +from pylsp import hookimpl, _utils log = logging.getLogger(__name__) @hookimpl -def pyls_hover(document, position): +def pylsp_hover(document, position): code_position = _utils.position_to_jedi_linecolumn(document, position) definitions = document.jedi_script().infer(**code_position) word = document.word_at_position(position) diff --git a/pyls/plugins/jedi_completion.py b/pylsp/plugins/jedi_completion.py similarity index 97% rename from pyls/plugins/jedi_completion.py rename to pylsp/plugins/jedi_completion.py index ff9254a0..1e3c80e7 100644 --- a/pyls/plugins/jedi_completion.py +++ b/pylsp/plugins/jedi_completion.py @@ -1,10 +1,12 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging import os.path as osp import parso -from pyls import _utils, hookimpl, lsp +from pylsp import _utils, hookimpl, lsp log = logging.getLogger(__name__) @@ -51,7 +53,7 @@ @hookimpl -def pyls_completions(config, document, position): +def pylsp_completions(config, document, position): """Get formatted completions for current code position""" settings = config.plugin_settings('jedi_completion', document_path=document.path) code_position = _utils.position_to_jedi_linecolumn(document, position) diff --git a/pyls/plugins/jedi_rename.py b/pylsp/plugins/jedi_rename.py similarity index 82% rename from pyls/plugins/jedi_rename.py rename to pylsp/plugins/jedi_rename.py index 8072d50c..c1edc75f 100644 --- a/pyls/plugins/jedi_rename.py +++ b/pylsp/plugins/jedi_rename.py @@ -1,21 +1,23 @@ -# Copyright 2020 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging -from pyls import hookimpl, uris, _utils +from pylsp import hookimpl, uris, _utils log = logging.getLogger(__name__) @hookimpl -def pyls_rename(config, workspace, document, position, new_name): # pylint: disable=unused-argument +def pylsp_rename(config, workspace, document, position, new_name): # pylint: disable=unused-argument log.debug('Executing rename of %s to %s', document.word_at_position(position), new_name) kwargs = _utils.position_to_jedi_linecolumn(document, position) kwargs['new_name'] = new_name try: refactoring = document.jedi_script().rename(**kwargs) - except NotImplementedError: + except NotImplementedError as exc: raise Exception('No support for renaming in Python 2/3.5 with Jedi. ' - 'Consider using the rope_rename plugin instead') + 'Consider using the rope_rename plugin instead') from exc log.debug('Finished rename: %s', refactoring.get_diff()) changes = [] for file_path, changed_file in refactoring.get_changed_files().items(): diff --git a/pyls/plugins/mccabe_lint.py b/pylsp/plugins/mccabe_lint.py similarity index 87% rename from pyls/plugins/mccabe_lint.py rename to pylsp/plugins/mccabe_lint.py index d8e0cedf..77ff3a05 100644 --- a/pyls/plugins/mccabe_lint.py +++ b/pylsp/plugins/mccabe_lint.py @@ -1,8 +1,10 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import ast import logging import mccabe -from pyls import hookimpl, lsp +from pylsp import hookimpl, lsp log = logging.getLogger(__name__) @@ -11,7 +13,7 @@ @hookimpl -def pyls_lint(config, document): +def pylsp_lint(config, document): threshold = config.plugin_settings('mccabe', document_path=document.path).get(THRESHOLD, DEFAULT_THRESHOLD) log.debug("Running mccabe lint with threshold: %s", threshold) diff --git a/pyls/plugins/preload_imports.py b/pylsp/plugins/preload_imports.py similarity index 86% rename from pyls/plugins/preload_imports.py rename to pylsp/plugins/preload_imports.py index 02a03f46..b3994606 100644 --- a/pyls/plugins/preload_imports.py +++ b/pylsp/plugins/preload_imports.py @@ -1,6 +1,8 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging -from pyls import hookimpl +from pylsp import hookimpl log = logging.getLogger(__name__) @@ -16,7 +18,7 @@ @hookimpl -def pyls_settings(): +def pylsp_settings(): # Setup default modules to preload, and rope extension modules return { 'plugins': {'preload': {'modules': MODULES}}, @@ -25,7 +27,7 @@ def pyls_settings(): @hookimpl -def pyls_initialize(config): +def pylsp_initialize(config): for mod_name in config.plugin_settings('preload').get('modules', []): try: __import__(mod_name) diff --git a/pyls/plugins/pycodestyle_lint.py b/pylsp/plugins/pycodestyle_lint.py similarity index 93% rename from pyls/plugins/pycodestyle_lint.py rename to pylsp/plugins/pycodestyle_lint.py index 820c4778..c8d7dae8 100644 --- a/pyls/plugins/pycodestyle_lint.py +++ b/pylsp/plugins/pycodestyle_lint.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging import pycodestyle -from pyls import hookimpl, lsp +from pylsp import hookimpl, lsp try: from autopep8 import continued_indentation as autopep8_c_i @@ -19,7 +21,7 @@ @hookimpl -def pyls_lint(workspace, document): +def pylsp_lint(workspace, document): config = workspace._config settings = config.plugin_settings('pycodestyle', document_path=document.path) log.debug("Got pycodestyle settings: %s", settings) @@ -49,7 +51,7 @@ class PyCodeStyleDiagnosticReport(pycodestyle.BaseReport): def __init__(self, options): self.diagnostics = [] - super(PyCodeStyleDiagnosticReport, self).__init__(options=options) + super().__init__(options=options) def error(self, line_number, offset, text, check): code = text[:4] diff --git a/pyls/plugins/pydocstyle_lint.py b/pylsp/plugins/pydocstyle_lint.py similarity index 94% rename from pyls/plugins/pydocstyle_lint.py rename to pylsp/plugins/pydocstyle_lint.py index 62587e52..7a986aa6 100644 --- a/pyls/plugins/pydocstyle_lint.py +++ b/pylsp/plugins/pydocstyle_lint.py @@ -1,4 +1,6 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import contextlib import logging import os @@ -6,7 +8,7 @@ import sys import pydocstyle -from pyls import hookimpl, lsp +from pylsp import hookimpl, lsp log = logging.getLogger(__name__) @@ -19,13 +21,13 @@ @hookimpl -def pyls_settings(): +def pylsp_settings(): # Default pydocstyle to disabled return {'plugins': {'pydocstyle': {'enabled': False}}} @hookimpl -def pyls_lint(config, document): +def pylsp_lint(config, document): settings = config.plugin_settings('pydocstyle', document_path=document.path) log.debug("Got pydocstyle settings: %s", settings) @@ -58,7 +60,7 @@ def pyls_lint(config, document): conf = pydocstyle.config.ConfigurationParser() with _patch_sys_argv(args): - # TODO(gatesn): We can add more pydocstyle args here from our pyls config + # TODO(gatesn): We can add more pydocstyle args here from our pylsp config conf.parse() # Will only yield a single filename, the document path diff --git a/pyls/plugins/pyflakes_lint.py b/pylsp/plugins/pyflakes_lint.py similarity index 92% rename from pyls/plugins/pyflakes_lint.py rename to pylsp/plugins/pyflakes_lint.py index c37aad89..da0ee66b 100644 --- a/pyls/plugins/pyflakes_lint.py +++ b/pylsp/plugins/pyflakes_lint.py @@ -1,6 +1,8 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + from pyflakes import api as pyflakes_api, messages -from pyls import hookimpl, lsp +from pylsp import hookimpl, lsp # Pyflakes messages that should be reported as Errors instead of Warns PYFLAKES_ERROR_MESSAGES = ( @@ -19,13 +21,13 @@ @hookimpl -def pyls_lint(document): +def pylsp_lint(document): reporter = PyflakesDiagnosticReport(document.lines) pyflakes_api.check(document.source.encode('utf-8'), document.path, reporter=reporter) return reporter.diagnostics -class PyflakesDiagnosticReport(object): +class PyflakesDiagnosticReport: def __init__(self, lines): self.lines = lines diff --git a/pyls/plugins/pylint_lint.py b/pylsp/plugins/pylint_lint.py similarity index 94% rename from pyls/plugins/pylint_lint.py rename to pylsp/plugins/pylint_lint.py index 32521002..54917875 100644 --- a/pyls/plugins/pylint_lint.py +++ b/pylsp/plugins/pylint_lint.py @@ -1,4 +1,7 @@ # Copyright 2018 Google LLC. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + """Linter plugin for pylint.""" import collections import logging @@ -7,7 +10,7 @@ from subprocess import Popen, PIPE from pylint.epylint import py_run -from pyls import hookimpl, lsp +from pylsp import hookimpl, lsp try: import ujson as json @@ -17,18 +20,18 @@ log = logging.getLogger(__name__) -class PylintLinter(object): +class PylintLinter: last_diags = collections.defaultdict(list) @classmethod def lint(cls, document, is_saved, flags=''): - """Plugin interface to pyls linter. + """Plugin interface to pylsp linter. Args: document: The document to be linted. is_saved: Whether or not the file has been saved to disk. flags: Additional flags to pass to pylint. Not exposed to - pyls_lint, but used for testing. + pylsp_lint, but used for testing. Returns: A list of dicts with the following format: @@ -105,7 +108,7 @@ def lint(cls, document, is_saved, flags=''): # * warning diagnostics = [] for diag in json.loads(json_out): - # pylint lines index from 1, pyls lines index from 0 + # pylint lines index from 1, pylsp lines index from 0 line = diag['line'] - 1 err_range = { @@ -153,7 +156,7 @@ def _build_pylint_flags(settings): @hookimpl -def pyls_settings(): +def pylsp_settings(): # Default pylint to disabled because it requires a config # file to be useful. return {'plugins': {'pylint': { @@ -165,7 +168,7 @@ def pyls_settings(): @hookimpl -def pyls_lint(config, document, is_saved): +def pylsp_lint(config, document, is_saved): """Run pylint linter.""" settings = config.plugin_settings('pylint') log.debug("Got pylint settings: %s", settings) @@ -204,7 +207,7 @@ def pylint_lint_stdin(pylint_executable, document, flags): :param pylint_executable: path to pylint executable :type pylint_executable: string :param document: document to run pylint on - :type document: pyls.workspace.Document + :type document: pylsp.workspace.Document :param flags: arguments to path to pylint :type flags: list @@ -221,7 +224,7 @@ def _run_pylint_stdio(pylint_executable, document, flags): :param pylint_executable: path to pylint executable :type pylint_executable: string :param document: document to run pylint on - :type document: pyls.workspace.Document + :type document: pylsp.workspace.Document :param flags: arguments to path to pylint :type flags: list @@ -250,7 +253,7 @@ def _parse_pylint_stdio_result(document, stdout): """Parse pylint results. :param document: document to run pylint on - :type document: pyls.workspace.Document + :type document: pylsp.workspace.Document :param stdout: pylint results to parse :type stdout: string diff --git a/pyls/plugins/references.py b/pylsp/plugins/references.py similarity index 77% rename from pyls/plugins/references.py rename to pylsp/plugins/references.py index cf1036c7..4ef2072a 100644 --- a/pyls/plugins/references.py +++ b/pylsp/plugins/references.py @@ -1,12 +1,14 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging -from pyls import hookimpl, uris, _utils +from pylsp import hookimpl, uris, _utils log = logging.getLogger(__name__) @hookimpl -def pyls_references(document, position, exclude_declaration=False): +def pylsp_references(document, position, exclude_declaration=False): code_position = _utils.position_to_jedi_linecolumn(document, position) usages = document.jedi_script().get_references(**code_position) diff --git a/pyls/plugins/rope_completion.py b/pylsp/plugins/rope_completion.py similarity index 93% rename from pyls/plugins/rope_completion.py rename to pylsp/plugins/rope_completion.py index e556e464..c1e162a2 100644 --- a/pyls/plugins/rope_completion.py +++ b/pylsp/plugins/rope_completion.py @@ -1,21 +1,23 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging from rope.contrib.codeassist import code_assist, sorted_proposals -from pyls import hookimpl, lsp +from pylsp import hookimpl, lsp log = logging.getLogger(__name__) @hookimpl -def pyls_settings(): +def pylsp_settings(): # Default rope_completion to disabled return {'plugins': {'rope_completion': {'enabled': False}}} @hookimpl -def pyls_completions(config, workspace, document, position): +def pylsp_completions(config, workspace, document, position): # Rope is a bit rubbish at completing module imports, so we'll return None word = document.word_at_position({ # The -1 should really be trying to look at the previous word, but that might be quite expensive @@ -62,7 +64,7 @@ def _sort_text(definition): if definition.name.startswith("_"): # It's a 'hidden' func, put it next last return 'z' + definition.name - elif definition.scope == 'builtin': + if definition.scope == 'builtin': return 'y' + definition.name # Else put it at the front diff --git a/pyls/plugins/rope_rename.py b/pylsp/plugins/rope_rename.py similarity index 87% rename from pyls/plugins/rope_rename.py rename to pylsp/plugins/rope_rename.py index 730ae333..d9ebab5c 100644 --- a/pyls/plugins/rope_rename.py +++ b/pylsp/plugins/rope_rename.py @@ -1,22 +1,24 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging from rope.base import libutils from rope.refactor.rename import Rename -from pyls import hookimpl, uris +from pylsp import hookimpl, uris log = logging.getLogger(__name__) @hookimpl -def pyls_settings(): +def pylsp_settings(): # Default rope_rename to disabled return {'plugins': {'rope_rename': {'enabled': False}}} @hookimpl -def pyls_rename(config, workspace, document, position, new_name): +def pylsp_rename(config, workspace, document, position, new_name): rope_config = config.settings(document_path=document.path).get('rope', {}) rope_project = workspace._rope_project_builder(rope_config) diff --git a/pyls/plugins/signature.py b/pylsp/plugins/signature.py similarity index 90% rename from pyls/plugins/signature.py rename to pylsp/plugins/signature.py index fff7a576..c4c3048f 100644 --- a/pyls/plugins/signature.py +++ b/pylsp/plugins/signature.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging import re -from pyls import hookimpl, _utils +from pylsp import hookimpl, _utils log = logging.getLogger(__name__) @@ -13,7 +15,7 @@ @hookimpl -def pyls_signature_help(document, position): +def pylsp_signature_help(document, position): code_position = _utils.position_to_jedi_linecolumn(document, position) signatures = document.jedi_script().get_signatures(**code_position) diff --git a/pyls/plugins/symbols.py b/pylsp/plugins/symbols.py similarity index 96% rename from pyls/plugins/symbols.py rename to pylsp/plugins/symbols.py index ef8e7fb8..48a8935f 100644 --- a/pyls/plugins/symbols.py +++ b/pylsp/plugins/symbols.py @@ -1,15 +1,17 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging import os -from pyls import hookimpl -from pyls.lsp import SymbolKind +from pylsp import hookimpl +from pylsp.lsp import SymbolKind log = logging.getLogger(__name__) @hookimpl -def pyls_document_symbols(config, document): +def pylsp_document_symbols(config, document): # pylint: disable=broad-except # pylint: disable=too-many-nested-blocks # pylint: disable=too-many-locals diff --git a/pyls/plugins/yapf_format.py b/pylsp/plugins/yapf_format.py similarity index 85% rename from pyls/plugins/yapf_format.py rename to pylsp/plugins/yapf_format.py index 16afe97d..6728007b 100644 --- a/pyls/plugins/yapf_format.py +++ b/pylsp/plugins/yapf_format.py @@ -1,20 +1,22 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import logging import os from yapf.yapflib import file_resources from yapf.yapflib.yapf_api import FormatCode -from pyls import hookimpl +from pylsp import hookimpl log = logging.getLogger(__name__) @hookimpl -def pyls_format_document(document): +def pylsp_format_document(document): return _format(document) @hookimpl -def pyls_format_range(document, range): # pylint: disable=redefined-builtin +def pylsp_format_range(document, range): # pylint: disable=redefined-builtin # First we 'round' the range up/down to full lines only range['start']['character'] = 0 range['end']['line'] += 1 diff --git a/pyls/python_ls.py b/pylsp/python_lsp.py similarity index 88% rename from pyls/python_ls.py rename to pylsp/python_lsp.py index 0a11aa9b..62350971 100644 --- a/pyls/python_ls.py +++ b/pylsp/python_lsp.py @@ -1,4 +1,6 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + from functools import partial import logging import os @@ -23,14 +25,13 @@ CONFIG_FILEs = ('pycodestyle.cfg', 'setup.cfg', 'tox.ini', '.flake8') -class _StreamHandlerWrapper(socketserver.StreamRequestHandler, object): +class _StreamHandlerWrapper(socketserver.StreamRequestHandler): """A wrapper class that is used to construct a custom handler class.""" delegate = None def setup(self): - super(_StreamHandlerWrapper, self).setup() - # pylint: disable=no-member + super().setup() self.delegate = self.DELEGATE_CLASS(self.rfile, self.wfile) def handle(self): @@ -44,13 +45,12 @@ def handle(self): if isinstance(e, WindowsError) and e.winerror == 10054: pass - # pylint: disable=no-member self.SHUTDOWN_CALL() def start_tcp_lang_server(bind_addr, port, check_parent_process, handler_class): - if not issubclass(handler_class, PythonLanguageServer): - raise ValueError('Handler class must be an instance of PythonLanguageServer') + if not issubclass(handler_class, PythonLSPServer): + raise ValueError('Handler class must be an instance of PythonLSPServer') def shutdown_server(check_parent_process, *args): # pylint: disable=unused-argument @@ -83,14 +83,14 @@ def shutdown_server(check_parent_process, *args): def start_io_lang_server(rfile, wfile, check_parent_process, handler_class): - if not issubclass(handler_class, PythonLanguageServer): - raise ValueError('Handler class must be an instance of PythonLanguageServer') + if not issubclass(handler_class, PythonLSPServer): + raise ValueError('Handler class must be an instance of PythonLSPServer') log.info('Starting %s IO language server', handler_class.__name__) server = handler_class(rfile, wfile, check_parent_process) server.start() -class PythonLanguageServer(MethodDispatcher): +class PythonLSPServer(MethodDispatcher): """ Implementation of the Microsoft VSCode Language Server Protocol https://github.com/Microsoft/language-server-protocol/blob/master/versions/protocol-1-x.md """ @@ -124,7 +124,7 @@ def __getitem__(self, item): raise KeyError try: - return super(PythonLanguageServer, self).__getitem__(item) + return super().__getitem__(item) except KeyError: # Fallback through extra dispatchers for dispatcher in self._dispatchers: @@ -137,7 +137,6 @@ def __getitem__(self, item): def m_shutdown(self, **_kwargs): self._shutdown = True - return None def m_exit(self, **_kwargs): self._endpoint.shutdown() @@ -171,7 +170,7 @@ def capabilities(self): 'documentSymbolProvider': True, 'definitionProvider': True, 'executeCommandProvider': { - 'commands': flatten(self._hook('pyls_commands')) + 'commands': flatten(self._hook('pylsp_commands')) }, 'hoverProvider': True, 'referencesProvider': True, @@ -193,7 +192,8 @@ def capabilities(self): 'changeNotifications': True } }, - 'experimental': merge(self._hook('pyls_experimental_capabilities')) + 'experimental': merge( + self._hook('pylsp_experimental_capabilities')) } log.info('Server capabilities: %s', server_capabilities) return server_capabilities @@ -209,8 +209,8 @@ def m_initialize(self, processId=None, rootUri=None, rootPath=None, initializati processId, _kwargs.get('capabilities', {})) self.workspace = Workspace(rootUri, self._endpoint, self.config) self.workspaces[rootUri] = self.workspace - self._dispatchers = self._hook('pyls_dispatchers') - self._hook('pyls_initialize') + self._dispatchers = self._hook('pylsp_dispatchers') + self._hook('pylsp_initialize') if self._check_parent_process and processId is not None and self.watching_thread is None: def watch_parent_process(pid): @@ -228,41 +228,41 @@ def watch_parent_process(pid): return {'capabilities': self.capabilities()} def m_initialized(self, **_kwargs): - self._hook('pyls_initialized') + self._hook('pylsp_initialized') def code_actions(self, doc_uri, range, context): - return flatten(self._hook('pyls_code_actions', doc_uri, range=range, context=context)) + return flatten(self._hook('pylsp_code_actions', doc_uri, range=range, context=context)) def code_lens(self, doc_uri): - return flatten(self._hook('pyls_code_lens', doc_uri)) + return flatten(self._hook('pylsp_code_lens', doc_uri)) def completions(self, doc_uri, position): - completions = self._hook('pyls_completions', doc_uri, position=position) + completions = self._hook('pylsp_completions', doc_uri, position=position) return { 'isIncomplete': False, 'items': flatten(completions) } def definitions(self, doc_uri, position): - return flatten(self._hook('pyls_definitions', doc_uri, position=position)) + return flatten(self._hook('pylsp_definitions', doc_uri, position=position)) def document_symbols(self, doc_uri): - return flatten(self._hook('pyls_document_symbols', doc_uri)) + return flatten(self._hook('pylsp_document_symbols', doc_uri)) def execute_command(self, command, arguments): - return self._hook('pyls_execute_command', command=command, arguments=arguments) + return self._hook('pylsp_execute_command', command=command, arguments=arguments) def format_document(self, doc_uri): - return self._hook('pyls_format_document', doc_uri) + return self._hook('pylsp_format_document', doc_uri) def format_range(self, doc_uri, range): - return self._hook('pyls_format_range', doc_uri, range=range) + return self._hook('pylsp_format_range', doc_uri, range=range) def highlight(self, doc_uri, position): - return flatten(self._hook('pyls_document_highlight', doc_uri, position=position)) or None + return flatten(self._hook('pylsp_document_highlight', doc_uri, position=position)) or None def hover(self, doc_uri, position): - return self._hook('pyls_hover', doc_uri, position=position) or {'contents': ''} + return self._hook('pylsp_hover', doc_uri, position=position) or {'contents': ''} @_utils.debounce(LINT_DEBOUNCE_S, keyed_by='doc_uri') def lint(self, doc_uri, is_saved): @@ -271,23 +271,23 @@ def lint(self, doc_uri, is_saved): if doc_uri in workspace.documents: workspace.publish_diagnostics( doc_uri, - flatten(self._hook('pyls_lint', doc_uri, is_saved=is_saved)) + flatten(self._hook('pylsp_lint', doc_uri, is_saved=is_saved)) ) def references(self, doc_uri, position, exclude_declaration): return flatten(self._hook( - 'pyls_references', doc_uri, position=position, + 'pylsp_references', doc_uri, position=position, exclude_declaration=exclude_declaration )) def rename(self, doc_uri, position, new_name): - return self._hook('pyls_rename', doc_uri, position=position, new_name=new_name) + return self._hook('pylsp_rename', doc_uri, position=position, new_name=new_name) def signature_help(self, doc_uri, position): - return self._hook('pyls_signature_help', doc_uri, position=position) + return self._hook('pylsp_signature_help', doc_uri, position=position) def folding(self, doc_uri): - return flatten(self._hook('pyls_folding_range', doc_uri)) + return flatten(self._hook('pylsp_folding_range', doc_uri)) def m_text_document__did_close(self, textDocument=None, **_kwargs): workspace = self._match_uri_to_workspace(textDocument['uri']) @@ -296,7 +296,7 @@ def m_text_document__did_close(self, textDocument=None, **_kwargs): def m_text_document__did_open(self, textDocument=None, **_kwargs): workspace = self._match_uri_to_workspace(textDocument['uri']) workspace.put_document(textDocument['uri'], textDocument['text'], version=textDocument.get('version')) - self._hook('pyls_document_did_open', textDocument['uri']) + self._hook('pylsp_document_did_open', textDocument['uri']) self.lint(textDocument['uri'], is_saved=True) def m_text_document__did_change(self, contentChanges=None, textDocument=None, **_kwargs): @@ -355,7 +355,7 @@ def m_text_document__signature_help(self, textDocument=None, position=None, **_k return self.signature_help(textDocument['uri'], position) def m_workspace__did_change_configuration(self, settings=None): - self.config.update((settings or {}).get('pyls', {})) + self.config.update((settings or {}).get('pylsp', {})) for workspace_uri in self.workspaces: workspace = self.workspaces[workspace_uri] workspace.update_config(settings) diff --git a/pyls/uris.py b/pylsp/uris.py similarity index 96% rename from pyls/uris.py rename to pylsp/uris.py index 7299ac9f..552761fc 100644 --- a/pyls/uris.py +++ b/pylsp/uris.py @@ -1,11 +1,13 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + """A collection of URI utilities with logic built on the VSCode URI library. https://github.com/Microsoft/vscode-uri/blob/e59cab84f5df6265aed18ae5f43552d3eef13bb9/lib/index.ts """ import re from urllib import parse -from pyls import IS_WIN +from pylsp import IS_WIN RE_DRIVE_LETTER_PATH = re.compile(r'^\/[a-zA-Z]:') @@ -114,8 +116,6 @@ def _normalize_win_path(path): else: netloc = path[2:idx] path = path[idx:] - else: - path = path # Ensure that path starts with a slash # or that it is at least a slash diff --git a/pyls/workspace.py b/pylsp/workspace.py similarity index 96% rename from pyls/workspace.py rename to pylsp/workspace.py index 78674d31..20720c9b 100644 --- a/pyls/workspace.py +++ b/pylsp/workspace.py @@ -1,4 +1,6 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import io import logging import os @@ -26,7 +28,7 @@ def wrapper(self, *args, **kwargs): return wrapper -class Workspace(object): +class Workspace: M_PUBLISH_DIAGNOSTICS = 'textDocument/publishDiagnostics' M_APPLY_EDIT = 'workspace/applyEdit' @@ -48,6 +50,7 @@ def __init__(self, root_uri, endpoint, config=None): self.__rope_config = None def _rope_project_builder(self, rope_config): + # pylint: disable=import-outside-toplevel from rope.base.project import Project # TODO: we could keep track of dirty files and validate only those @@ -96,7 +99,7 @@ def update_document(self, doc_uri, change, version=None): self._docs[doc_uri].version = version def update_config(self, settings): - self._config.update((settings or {}).get('pyls', {})) + self._config.update((settings or {}).get('pylsp', {})) for doc_uri in self.documents: self.get_document(doc_uri).update_config(settings) @@ -126,7 +129,7 @@ def _create_document(self, doc_uri, source=None, version=None): ) -class Document(object): +class Document: def __init__(self, uri, workspace, source=None, version=None, local=True, extra_sys_path=None, rope_project_builder=None): @@ -148,6 +151,7 @@ def __str__(self): return str(self.uri) def _rope_resource(self, rope_config): + # pylint: disable=import-outside-toplevel from rope.base import libutils return libutils.path_to_resource(self._rope_project_builder(rope_config), self.path) @@ -165,7 +169,7 @@ def source(self): return self._source def update_config(self, settings): - self._config.update((settings or {}).get('pyls', {})) + self._config.update((settings or {}).get('pylsp', {})) @lock def apply_change(self, change): diff --git a/setup.cfg b/setup.cfg index c2bb1ae8..5a1f6077 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,3 @@ -[versioneer] -VCS = git -style = pep440 -versionfile_source = pyls/_version.py -versionfile_build = pyls/_version.py -tag_prefix = -parentdir_prefix = - [pycodestyle] ignore = E226, E722, W504 max-line-length = 120 @@ -15,4 +7,4 @@ exclude = test/plugins/.ropeproject,test/.ropeproject testpaths = test addopts = --cov-report html --cov-report term --junitxml=pytest.xml - --cov pyls --cov test + --cov pylsp --cov test diff --git a/setup.py b/setup.py index 2c36df1b..0751e362 100755 --- a/setup.py +++ b/setup.py @@ -1,54 +1,48 @@ #!/usr/bin/env python -import sys + +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + +import ast +import os from setuptools import find_packages, setup -import versioneer -import sys + +HERE = os.path.abspath(os.path.dirname(__file__)) + + +def get_version(module='pylsp'): + """Get version.""" + with open(os.path.join(HERE, module, '_version.py'), 'r') as f: + data = f.read() + lines = data.split('\n') + for line in lines: + if line.startswith('VERSION_INFO'): + version_tuple = ast.literal_eval(line.split('=')[-1].strip()) + version = '.'.join(map(str, version_tuple)) + break + return version + README = open('README.md', 'r').read() install_requires = [ - 'configparser; python_version<"3.0"', - 'future>=0.14.0; python_version<"3"', - 'backports.functools_lru_cache; python_version<"3.2"', - 'jedi>=0.17.2,<0.19.0', - 'python-jsonrpc-server>=0.4.0', - 'pluggy', - 'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"', - 'ujson>=3.0.0 ; python_version>"3"'] + 'jedi>=0.17.2,<0.19.0', + 'python-jsonrpc-server>=0.4.0', + 'pluggy', + 'ujson>=3.0.0' +] setup( - name='python-language-server', - - # Versions should comply with PEP440. For a discussion on single-sourcing - # the version across setup.py and the project code, see - # https://packaging.python.org/en/latest/single_source_version.html - version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), - + name='python-lsp-server', + version=get_version(), description='Python Language Server for the Language Server Protocol', - long_description=README, long_description_content_type='text/markdown', - - # The project's main homepage. - url='https://github.com/python-ls/python-ls', - - author='Palantir Technologies, Inc.', - - # You can just specify the packages manually here if your project is - # simple. Or you can use find_packages(). + url='https://github.com/python-lsp/python-lsp-server', + author='Python Language Server Contributors', packages=find_packages(exclude=['contrib', 'docs', 'test', 'test.*']), - - # List run-time dependencies here. These will be installed by pip when - # your project is installed. For an analysis of "install_requires" vs pip's - # requirements files see: - # https://packaging.python.org/en/latest/requirements.html install_requires=install_requires, - - # List additional groups of dependencies here (e.g. development - # dependencies). You can install these using the following syntax, - # for example: - # $ pip install -e .[test] + python_requires='>=3.6', extras_require={ 'all': [ 'autopep8', @@ -57,9 +51,7 @@ 'pycodestyle>=2.6.0,<2.7.0', 'pydocstyle>=2.0.0', 'pyflakes>=2.2.0,<2.3.0', - # pylint >= 2.5.0 is required for working through stdin and only - # available with python3 - 'pylint>=2.5.0' if sys.version_info.major >= 3 else 'pylint', + 'pylint>=2.5.0', 'rope>=0.10.5', 'yapf', ], @@ -69,44 +61,37 @@ 'pycodestyle': ['pycodestyle>=2.6.0,<2.7.0'], 'pydocstyle': ['pydocstyle>=2.0.0'], 'pyflakes': ['pyflakes>=2.2.0,<2.3.0'], - 'pylint': [ - 'pylint>=2.5.0' if sys.version_info.major >= 3 else 'pylint'], + 'pylint': ['pylint>=2.5.0'], 'rope': ['rope>0.10.5'], 'yapf': ['yapf'], - 'test': ['versioneer', - 'pylint>=2.5.0' if sys.version_info.major >= 3 else 'pylint', - 'pytest', 'mock', 'pytest-cov', 'coverage', 'numpy', 'pandas', - 'matplotlib', 'pyqt5;python_version>="3"', 'flaky'], + 'test': ['pylint>=2.5.0', 'pytest', 'pytest-cov', 'coverage', 'numpy', + 'pandas', 'matplotlib', 'pyqt5', 'flaky'], }, - - # To provide executable scripts, use entry points in preference to the - # "scripts" keyword. Entry points provide cross-platform support and allow - # pip to create the appropriate form of executable for the target platform. entry_points={ 'console_scripts': [ - 'pyls = pyls.__main__:main', + 'pylsp = pylsp.__main__:main', ], - 'pyls': [ - 'autopep8 = pyls.plugins.autopep8_format', - 'folding = pyls.plugins.folding', - 'flake8 = pyls.plugins.flake8_lint', - 'jedi_completion = pyls.plugins.jedi_completion', - 'jedi_definition = pyls.plugins.definition', - 'jedi_hover = pyls.plugins.hover', - 'jedi_highlight = pyls.plugins.highlight', - 'jedi_references = pyls.plugins.references', - 'jedi_rename = pyls.plugins.jedi_rename', - 'jedi_signature_help = pyls.plugins.signature', - 'jedi_symbols = pyls.plugins.symbols', - 'mccabe = pyls.plugins.mccabe_lint', - 'preload = pyls.plugins.preload_imports', - 'pycodestyle = pyls.plugins.pycodestyle_lint', - 'pydocstyle = pyls.plugins.pydocstyle_lint', - 'pyflakes = pyls.plugins.pyflakes_lint', - 'pylint = pyls.plugins.pylint_lint', - 'rope_completion = pyls.plugins.rope_completion', - 'rope_rename = pyls.plugins.rope_rename', - 'yapf = pyls.plugins.yapf_format' + 'pylsp': [ + 'autopep8 = pylsp.plugins.autopep8_format', + 'folding = pylsp.plugins.folding', + 'flake8 = pylsp.plugins.flake8_lint', + 'jedi_completion = pylsp.plugins.jedi_completion', + 'jedi_definition = pylsp.plugins.definition', + 'jedi_hover = pylsp.plugins.hover', + 'jedi_highlight = pylsp.plugins.highlight', + 'jedi_references = pylsp.plugins.references', + 'jedi_rename = pylsp.plugins.jedi_rename', + 'jedi_signature_help = pylsp.plugins.signature', + 'jedi_symbols = pylsp.plugins.symbols', + 'mccabe = pylsp.plugins.mccabe_lint', + 'preload = pylsp.plugins.preload_imports', + 'pycodestyle = pylsp.plugins.pycodestyle_lint', + 'pydocstyle = pylsp.plugins.pydocstyle_lint', + 'pyflakes = pylsp.plugins.pyflakes_lint', + 'pylint = pylsp.plugins.pylint_lint', + 'rope_completion = pylsp.plugins.rope_completion', + 'rope_rename = pylsp.plugins.rope_rename', + 'yapf = pylsp.plugins.yapf_format' ] }, ) diff --git a/test/__init__.py b/test/__init__.py index 8b18553c..ab920d25 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import sys import pytest -from pyls import IS_WIN +from pylsp import IS_WIN IS_PY3 = sys.version_info.major == 3 diff --git a/test/conftest.py b/test/conftest.py index 59542dd2..839fd126 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + """ py.test configuration""" import logging -from pyls.__main__ import LOG_FORMAT +from pylsp.__main__ import LOG_FORMAT logging.basicConfig(level=logging.DEBUG, format=LOG_FORMAT) diff --git a/test/fixtures.py b/test/fixtures.py index a21396aa..c50c1c10 100644 --- a/test/fixtures.py +++ b/test/fixtures.py @@ -1,18 +1,16 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import os -import sys -from mock import Mock +from io import StringIO +from unittest.mock import Mock import pytest -from pyls import uris -from pyls.config.config import Config -from pyls.python_ls import PythonLanguageServer -from pyls.workspace import Workspace, Document +from pylsp import uris +from pylsp.config.config import Config +from pylsp.python_lsp import PythonLSPServer +from pylsp.workspace import Workspace, Document -if sys.version_info[0] < 3: - from StringIO import StringIO -else: - from io import StringIO DOC_URI = uris.from_fs_path(__file__) DOC = """import sys @@ -23,9 +21,9 @@ def main(): @pytest.fixture -def pyls(tmpdir): +def pylsp(tmpdir): """ Return an initialized python LS """ - ls = PythonLanguageServer(StringIO, StringIO) + ls = PythonLSPServer(StringIO, StringIO) ls.m_initialize( processId=1, diff --git a/test/plugins/test_autopep8_format.py b/test/plugins/test_autopep8_format.py index d23a1c49..cfb7bb60 100644 --- a/test/plugins/test_autopep8_format.py +++ b/test/plugins/test_autopep8_format.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. -from pyls import uris -from pyls.plugins.autopep8_format import pyls_format_document, pyls_format_range -from pyls.workspace import Document +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + +from pylsp import uris +from pylsp.plugins.autopep8_format import pylsp_format_document, pylsp_format_range +from pylsp.workspace import Document DOC_URI = uris.from_fs_path(__file__) DOC = """a = 123 @@ -37,7 +39,7 @@ def func(): def test_format(config, workspace): doc = Document(DOC_URI, workspace, DOC) - res = pyls_format_document(config, doc) + res = pylsp_format_document(config, doc) assert len(res) == 1 assert res[0]['newText'] == "a = 123\n\n\ndef func():\n pass\n" @@ -50,7 +52,7 @@ def test_range_format(config, workspace): 'start': {'line': 0, 'character': 0}, 'end': {'line': 2, 'character': 0} } - res = pyls_format_range(config, doc, def_range) + res = pylsp_format_range(config, doc, def_range) assert len(res) == 1 @@ -60,12 +62,12 @@ def test_range_format(config, workspace): def test_no_change(config, workspace): doc = Document(DOC_URI, workspace, GOOD_DOC) - assert not pyls_format_document(config, doc) + assert not pylsp_format_document(config, doc) def test_hanging_indentation(config, workspace): doc = Document(DOC_URI, workspace, INDENTED_DOC) - res = pyls_format_document(config, doc) + res = pylsp_format_document(config, doc) assert len(res) == 1 assert res[0]['newText'] == CORRECT_INDENTED_DOC diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py index 91df89cb..258b2288 100644 --- a/test/plugins/test_completion.py +++ b/test/plugins/test_completion.py @@ -1,13 +1,15 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import os import sys import pytest -from pyls import uris, lsp -from pyls.workspace import Document -from pyls.plugins.jedi_completion import pyls_completions as pyls_jedi_completions -from pyls.plugins.rope_completion import pyls_completions as pyls_rope_completions +from pylsp import uris, lsp +from pylsp.workspace import Document +from pylsp.plugins.jedi_completion import pylsp_completions as pylsp_jedi_completions +from pylsp.plugins.rope_completion import pylsp_completions as pylsp_rope_completions PY2 = sys.version[0] == '2' @@ -44,7 +46,7 @@ def everyone(self, a, b, c=None, d=2): def test_rope_import_completion(config, workspace): com_position = {'line': 0, 'character': 7} doc = Document(DOC_URI, workspace, DOC) - items = pyls_rope_completions(config, workspace, doc, com_position) + items = pylsp_rope_completions(config, workspace, doc, com_position) assert items is None @@ -52,14 +54,14 @@ def test_jedi_completion(config, workspace): # Over 'i' in os.path.isabs(...) com_position = {'line': 1, 'character': 15} doc = Document(DOC_URI, workspace, DOC) - items = pyls_jedi_completions(config, doc, com_position) + items = pylsp_jedi_completions(config, doc, com_position) assert items labels = [i['label'] for i in items] assert 'isabs(path)' in labels # Test we don't throw with big character - pyls_jedi_completions(config, doc, {'line': 1, 'character': 1000}) + pylsp_jedi_completions(config, doc, {'line': 1, 'character': 1000}) def test_jedi_completion_with_fuzzy_enabled(config, workspace): @@ -68,13 +70,13 @@ def test_jedi_completion_with_fuzzy_enabled(config, workspace): com_position = {'line': 1, 'character': 15} doc = Document(DOC_URI, workspace, DOC) - items = pyls_jedi_completions(config, doc, com_position) + items = pylsp_jedi_completions(config, doc, com_position) assert items assert items[0]['label'] == 'commonprefix(list)' # Test we don't throw with big character - pyls_jedi_completions(config, doc, {'line': 1, 'character': 1000}) + pylsp_jedi_completions(config, doc, {'line': 1, 'character': 1000}) def test_rope_completion(config, workspace): @@ -82,7 +84,7 @@ def test_rope_completion(config, workspace): com_position = {'line': 1, 'character': 15} workspace.put_document(DOC_URI, source=DOC) doc = workspace.get_document(DOC_URI) - items = pyls_rope_completions(config, workspace, doc, com_position) + items = pylsp_rope_completions(config, workspace, doc, com_position) assert items assert items[0]['label'] == 'isabs' @@ -92,7 +94,7 @@ def test_jedi_completion_ordering(config, workspace): # Over the blank line com_position = {'line': 8, 'character': 0} doc = Document(DOC_URI, workspace, DOC) - completions = pyls_jedi_completions(config, doc, com_position) + completions = pylsp_jedi_completions(config, doc, com_position) items = {c['label']: c['sortText'] for c in completions} @@ -104,7 +106,7 @@ def test_jedi_property_completion(config, workspace): # Over the 'w' in 'print Hello().world' com_position = {'line': 18, 'character': 15} doc = Document(DOC_URI, workspace, DOC) - completions = pyls_jedi_completions(config, doc, com_position) + completions = pylsp_jedi_completions(config, doc, com_position) items = {c['label']: c['sortText'] for c in completions} @@ -120,7 +122,7 @@ def test_jedi_method_completion(config, workspace): config.capabilities['textDocument'] = {'completion': {'completionItem': {'snippetSupport': True}}} config.update({'plugins': {'jedi_completion': {'include_params': True}}}) - completions = pyls_jedi_completions(config, doc, com_position) + completions = pylsp_jedi_completions(config, doc, com_position) everyone_method = [completion for completion in completions if completion['label'] == 'everyone(a, b, c, d)'][0] # Ensure we only generate snippets for positional args @@ -130,7 +132,7 @@ def test_jedi_method_completion(config, workspace): # Disable param snippets config.update({'plugins': {'jedi_completion': {'include_params': False}}}) - completions = pyls_jedi_completions(config, doc, com_position) + completions = pylsp_jedi_completions(config, doc, com_position) everyone_method = [completion for completion in completions if completion['label'] == 'everyone(a, b, c, d)'][0] assert 'insertTextFormat' not in everyone_method @@ -144,7 +146,7 @@ def test_pyqt_completion(config, workspace): doc_pyqt = "from PyQt5.QtWidgets import QA" com_position = {'line': 0, 'character': len(doc_pyqt)} doc = Document(DOC_URI, workspace, doc_pyqt) - completions = pyls_jedi_completions(config, doc, com_position) + completions = pylsp_jedi_completions(config, doc, com_position) assert completions is not None @@ -153,30 +155,30 @@ def test_numpy_completions(config, workspace): doc_numpy = "import numpy as np; np." com_position = {'line': 0, 'character': len(doc_numpy)} doc = Document(DOC_URI, workspace, doc_numpy) - items = pyls_jedi_completions(config, doc, com_position) + items = pylsp_jedi_completions(config, doc, com_position) assert items - assert any(['array' in i['label'] for i in items]) + assert any('array' in i['label'] for i in items) def test_pandas_completions(config, workspace): doc_pandas = "import pandas as pd; pd." com_position = {'line': 0, 'character': len(doc_pandas)} doc = Document(DOC_URI, workspace, doc_pandas) - items = pyls_jedi_completions(config, doc, com_position) + items = pylsp_jedi_completions(config, doc, com_position) assert items - assert any(['DataFrame' in i['label'] for i in items]) + assert any('DataFrame' in i['label'] for i in items) def test_matplotlib_completions(config, workspace): doc_mpl = "import matplotlib.pyplot as plt; plt." com_position = {'line': 0, 'character': len(doc_mpl)} doc = Document(DOC_URI, workspace, doc_mpl) - items = pyls_jedi_completions(config, doc, com_position) + items = pylsp_jedi_completions(config, doc, com_position) assert items - assert any(['plot' in i['label'] for i in items]) + assert any('plot' in i['label'] for i in items) def test_snippets_completion(config, workspace): @@ -186,11 +188,11 @@ def test_snippets_completion(config, workspace): config.capabilities['textDocument'] = { 'completion': {'completionItem': {'snippetSupport': True}}} config.update({'plugins': {'jedi_completion': {'include_params': True}}}) - completions = pyls_jedi_completions(config, doc, com_position) + completions = pylsp_jedi_completions(config, doc, com_position) assert completions[0]['insertText'] == 'defaultdict' com_position = {'line': 1, 'character': len(doc_snippets)} - completions = pyls_jedi_completions(config, doc, com_position) + completions = pylsp_jedi_completions(config, doc, com_position) assert completions[0]['insertText'] == 'defaultdict($0)' assert completions[0]['insertTextFormat'] == lsp.InsertTextFormat.Snippet @@ -205,7 +207,7 @@ def test_completion_with_class_objects(config, workspace): 'include_params': True, 'include_class_objects': True, }}}) - completions = pyls_jedi_completions(config, doc, com_position) + completions = pylsp_jedi_completions(config, doc, com_position) assert len(completions) == 2 assert completions[0]['label'] == 'FOOBAR' @@ -222,7 +224,7 @@ def test_snippet_parsing(config, workspace): config.capabilities['textDocument'] = { 'completion': {'completionItem': {'snippetSupport': True}}} config.update({'plugins': {'jedi_completion': {'include_params': True}}}) - completions = pyls_jedi_completions(config, doc, completion_position) + completions = pylsp_jedi_completions(config, doc, completion_position) out = 'divmod(${1:a}, ${2:b})$0' assert completions[0]['insertText'] == out @@ -235,11 +237,11 @@ def test_multiline_import_snippets(config, workspace): config.update({'plugins': {'jedi_completion': {'include_params': True}}}) position = {'line': 1, 'character': 5} - completions = pyls_jedi_completions(config, doc, position) + completions = pylsp_jedi_completions(config, doc, position) assert completions[0]['insertText'] == 'date' position = {'line': 2, 'character': 9} - completions = pyls_jedi_completions(config, doc, position) + completions = pylsp_jedi_completions(config, doc, position) assert completions[0]['insertText'] == 'datetime' @@ -251,11 +253,11 @@ def test_multiline_snippets(config, workspace): config.update({'plugins': {'jedi_completion': {'include_params': True}}}) position = {'line': 1, 'character': 5} - completions = pyls_jedi_completions(config, doc, position) + completions = pylsp_jedi_completions(config, doc, position) assert completions[0]['insertText'] == 'date' position = {'line': 2, 'character': 9} - completions = pyls_jedi_completions(config, doc, position) + completions = pylsp_jedi_completions(config, doc, position) assert completions[0]['insertText'] == 'datetime' @@ -267,13 +269,13 @@ def test_multistatement_snippet(config, workspace): document = 'a = 1; from datetime import date' doc = Document(DOC_URI, workspace, document) position = {'line': 0, 'character': len(document)} - completions = pyls_jedi_completions(config, doc, position) + completions = pylsp_jedi_completions(config, doc, position) assert completions[0]['insertText'] == 'date' document = 'from datetime import date; a = date' doc = Document(DOC_URI, workspace, document) position = {'line': 0, 'character': len(document)} - completions = pyls_jedi_completions(config, doc, position) + completions = pylsp_jedi_completions(config, doc, position) assert completions[0]['insertText'] == 'date(${1:year}, ${2:month}, ${3:day})$0' @@ -295,16 +297,16 @@ def spam(): # After 'foo.s' without extra paths com_position = {'line': 1, 'character': 5} - completions = pyls_jedi_completions(doc._config, doc, com_position) + completions = pylsp_jedi_completions(doc._config, doc, com_position) assert completions is None # Update config extra paths - settings = {'pyls': {'plugins': {'jedi': {'extra_paths': extra_paths}}}} + settings = {'pylsp': {'plugins': {'jedi': {'extra_paths': extra_paths}}}} doc.update_config(settings) # After 'foo.s' with extra paths com_position = {'line': 1, 'character': 5} - completions = pyls_jedi_completions(doc._config, doc, com_position) + completions = pylsp_jedi_completions(doc._config, doc, com_position) assert completions[0]['label'] == 'spam()' @@ -320,18 +322,18 @@ def test_jedi_completion_environment(workspace): assert os.path.isdir('/tmp/pyenv/') - settings = {'pyls': {'plugins': {'jedi': {'environment': None}}}} + settings = {'pylsp': {'plugins': {'jedi': {'environment': None}}}} doc.update_config(settings) - completions = pyls_jedi_completions(doc._config, doc, com_position) + completions = pylsp_jedi_completions(doc._config, doc, com_position) assert completions is None # Update config extra environment env_path = '/tmp/pyenv/bin/python' - settings = {'pyls': {'plugins': {'jedi': {'environment': env_path}}}} + settings = {'pylsp': {'plugins': {'jedi': {'environment': env_path}}}} doc.update_config(settings) # After 'import logh' with new environment - completions = pyls_jedi_completions(doc._config, doc, com_position) + completions = pylsp_jedi_completions(doc._config, doc, com_position) assert completions[0]['label'] == 'loghub' assert 'changelog generator' in completions[0]['documentation'].lower() @@ -355,5 +357,5 @@ def foo(): doc = Document(doc_uri, workspace_other_root_path, doc_content) com_position = {'line': 1, 'character': 10} - completions = pyls_jedi_completions(doc._config, doc, com_position) + completions = pylsp_jedi_completions(doc._config, doc, com_position) assert completions[0]['label'] == 'foo()' diff --git a/test/plugins/test_definitions.py b/test/plugins/test_definitions.py index 660741f6..f24b6c7f 100644 --- a/test/plugins/test_definitions.py +++ b/test/plugins/test_definitions.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. -from pyls import uris -from pyls.plugins.definition import pyls_definitions -from pyls.workspace import Document +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + +from pylsp import uris +from pylsp.plugins.definition import pylsp_definitions +from pylsp.workspace import Document DOC_URI = uris.from_fs_path(__file__) @@ -31,7 +33,7 @@ def test_definitions(config, workspace): } doc = Document(DOC_URI, workspace, DOC) - assert [{'uri': DOC_URI, 'range': def_range}] == pyls_definitions(config, doc, cursor_pos) + assert [{'uri': DOC_URI, 'range': def_range}] == pylsp_definitions(config, doc, cursor_pos) def test_builtin_definition(config, workspace): @@ -40,7 +42,7 @@ def test_builtin_definition(config, workspace): # No go-to def for builtins doc = Document(DOC_URI, workspace, DOC) - assert not pyls_definitions(config, doc, cursor_pos) + assert not pylsp_definitions(config, doc, cursor_pos) def test_assignment(config, workspace): @@ -54,4 +56,4 @@ def test_assignment(config, workspace): } doc = Document(DOC_URI, workspace, DOC) - assert [{'uri': DOC_URI, 'range': def_range}] == pyls_definitions(config, doc, cursor_pos) + assert [{'uri': DOC_URI, 'range': def_range}] == pylsp_definitions(config, doc, cursor_pos) diff --git a/test/plugins/test_flake8_lint.py b/test/plugins/test_flake8_lint.py index 75adf4ea..eaabd403 100644 --- a/test/plugins/test_flake8_lint.py +++ b/test/plugins/test_flake8_lint.py @@ -1,14 +1,16 @@ -# Copyright 2019 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import tempfile import os -from mock import patch -from pyls import lsp, uris -from pyls.plugins import flake8_lint -from pyls.workspace import Document +from unittest.mock import patch +from pylsp import lsp, uris +from pylsp.plugins import flake8_lint +from pylsp.workspace import Document DOC_URI = uris.from_fs_path(__file__) -DOC = """import pyls +DOC = """import pylsp t = "TEST" @@ -30,7 +32,7 @@ def temp_document(doc_text, workspace): def test_flake8_unsaved(workspace): doc = Document('', workspace, DOC) - diags = flake8_lint.pyls_lint(workspace, doc) + diags = flake8_lint.pylsp_lint(workspace, doc) msg = 'F841 local variable \'a\' is assigned to but never used' unused_var = [d for d in diags if d['message'] == msg][0] @@ -44,7 +46,7 @@ def test_flake8_unsaved(workspace): def test_flake8_lint(workspace): try: name, doc = temp_document(DOC, workspace) - diags = flake8_lint.pyls_lint(workspace, doc) + diags = flake8_lint.pylsp_lint(workspace, doc) msg = 'F841 local variable \'a\' is assigned to but never used' unused_var = [d for d in diags if d['message'] == msg][0] @@ -59,20 +61,20 @@ def test_flake8_lint(workspace): def test_flake8_config_param(workspace): - with patch('pyls.plugins.flake8_lint.Popen') as popen_mock: + with patch('pylsp.plugins.flake8_lint.Popen') as popen_mock: mock_instance = popen_mock.return_value mock_instance.communicate.return_value = [bytes(), bytes()] flake8_conf = '/tmp/some.cfg' workspace._config.update({'plugins': {'flake8': {'config': flake8_conf}}}) _name, doc = temp_document(DOC, workspace) - flake8_lint.pyls_lint(workspace, doc) - call_args = popen_mock.call_args.args[0] + flake8_lint.pylsp_lint(workspace, doc) + (call_args,) = popen_mock.call_args[0] assert 'flake8' in call_args assert '--config={}'.format(flake8_conf) in call_args def test_flake8_executable_param(workspace): - with patch('pyls.plugins.flake8_lint.Popen') as popen_mock: + with patch('pylsp.plugins.flake8_lint.Popen') as popen_mock: mock_instance = popen_mock.return_value mock_instance.communicate.return_value = [bytes(), bytes()] @@ -80,7 +82,7 @@ def test_flake8_executable_param(workspace): workspace._config.update({'plugins': {'flake8': {'executable': flake8_executable}}}) _name, doc = temp_document(DOC, workspace) - flake8_lint.pyls_lint(workspace, doc) + flake8_lint.pylsp_lint(workspace, doc) - call_args = popen_mock.call_args.args[0] + (call_args,) = popen_mock.call_args[0] assert flake8_executable in call_args diff --git a/test/plugins/test_folding.py b/test/plugins/test_folding.py index 91ac0f3b..57d6e2e9 100644 --- a/test/plugins/test_folding.py +++ b/test/plugins/test_folding.py @@ -1,11 +1,12 @@ -# Copyright 2019 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. import sys from textwrap import dedent -from pyls import uris -from pyls.plugins.folding import pyls_folding_range -from pyls.workspace import Document +from pylsp import uris +from pylsp.plugins.folding import pylsp_folding_range +from pylsp.workspace import Document DOC_URI = uris.from_fs_path(__file__) DOC = dedent(""" @@ -113,7 +114,7 @@ class A(: def test_folding(workspace): doc = Document(DOC_URI, workspace, DOC) - ranges = pyls_folding_range(doc) + ranges = pylsp_folding_range(doc) expected = [{'startLine': 1, 'endLine': 6}, {'startLine': 2, 'endLine': 3}, {'startLine': 5, 'endLine': 6}, @@ -155,7 +156,7 @@ def test_folding(workspace): def test_folding_syntax_error(workspace): doc = Document(DOC_URI, workspace, SYNTAX_ERR) - ranges = pyls_folding_range(doc) + ranges = pylsp_folding_range(doc) expected = [{'startLine': 1, 'endLine': 6}, {'startLine': 2, 'endLine': 3}, {'startLine': 5, 'endLine': 6}, diff --git a/test/plugins/test_highlight.py b/test/plugins/test_highlight.py index 40bf52f2..b1baa008 100644 --- a/test/plugins/test_highlight.py +++ b/test/plugins/test_highlight.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. -from pyls import lsp, uris -from pyls.workspace import Document -from pyls.plugins.highlight import pyls_document_highlight +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + +from pylsp import lsp, uris +from pylsp.workspace import Document +from pylsp.plugins.highlight import pylsp_document_highlight DOC_URI = uris.from_fs_path(__file__) @@ -15,7 +17,7 @@ def test_highlight(workspace): cursor_pos = {'line': 1, 'character': 0} doc = Document(DOC_URI, workspace, DOC) - assert pyls_document_highlight(doc, cursor_pos) == [{ + assert pylsp_document_highlight(doc, cursor_pos) == [{ 'range': { 'start': {'line': 0, 'character': 0}, 'end': {'line': 0, 'character': 1}, @@ -41,7 +43,7 @@ def test_sys_highlight(workspace): cursor_pos = {'line': 0, 'character': 8} doc = Document(DOC_URI, workspace, SYS_DOC) - assert pyls_document_highlight(doc, cursor_pos) == [{ + assert pylsp_document_highlight(doc, cursor_pos) == [{ 'range': { 'start': {'line': 0, 'character': 7}, 'end': {'line': 0, 'character': 10} diff --git a/test/plugins/test_hover.py b/test/plugins/test_hover.py index f36bcb29..b78cbe89 100644 --- a/test/plugins/test_hover.py +++ b/test/plugins/test_hover.py @@ -1,8 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. -from pyls import uris -from pyls.plugins.hover import pyls_hover -from pyls.workspace import Document +from pylsp import uris +from pylsp.plugins.hover import pylsp_hover +from pylsp.workspace import Document DOC_URI = uris.from_fs_path(__file__) DOC = """ @@ -35,23 +36,24 @@ def test_numpy_hover(workspace): doc = Document(DOC_URI, workspace, NUMPY_DOC) contents = '' - assert contents in pyls_hover(doc, no_hov_position)['contents'] + assert contents in pylsp_hover(doc, no_hov_position)['contents'] contents = 'NumPy\n=====\n\nProvides\n' - assert contents in pyls_hover(doc, numpy_hov_position_1)['contents'][0] + assert contents in pylsp_hover(doc, numpy_hov_position_1)['contents'][0] contents = 'NumPy\n=====\n\nProvides\n' - assert contents in pyls_hover(doc, numpy_hov_position_2)['contents'][0] + assert contents in pylsp_hover(doc, numpy_hov_position_2)['contents'][0] contents = 'NumPy\n=====\n\nProvides\n' - assert contents in pyls_hover(doc, numpy_hov_position_3)['contents'][0] + assert contents in pylsp_hover(doc, numpy_hov_position_3)['contents'][0] # https://github.com/davidhalter/jedi/issues/1746 + # pylint: disable=import-outside-toplevel import numpy as np if np.lib.NumpyVersion(np.__version__) < '1.20.0': contents = 'Trigonometric sine, element-wise.\n\n' - assert contents in pyls_hover( + assert contents in pylsp_hover( doc, numpy_sin_hov_position)['contents'][0] @@ -67,6 +69,6 @@ def test_hover(workspace): assert { 'contents': contents - } == pyls_hover(doc, hov_position) + } == pylsp_hover(doc, hov_position) - assert {'contents': ''} == pyls_hover(doc, no_hov_position) + assert {'contents': ''} == pylsp_hover(doc, no_hov_position) diff --git a/test/plugins/test_jedi_rename.py b/test/plugins/test_jedi_rename.py index 034f4a18..fb2f97f1 100644 --- a/test/plugins/test_jedi_rename.py +++ b/test/plugins/test_jedi_rename.py @@ -1,11 +1,13 @@ -# Copyright 2020 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import os import sys import pytest -from pyls import uris -from pyls.plugins.jedi_rename import pyls_rename -from pyls.workspace import Document +from pylsp import uris +from pylsp.plugins.jedi_rename import pylsp_rename +from pylsp.workspace import Document LT_PY36 = sys.version_info.major < 3 or (sys.version_info.major == 3 and sys.version_info.minor < 6) @@ -38,7 +40,7 @@ def test_jedi_rename(tmp_workspace, config): # pylint: disable=redefined-outer- DOC_URI = uris.from_fs_path(os.path.join(tmp_workspace.root_path, DOC_NAME)) doc = Document(DOC_URI, tmp_workspace) - result = pyls_rename(config, tmp_workspace, doc, position, 'ShouldBeRenamed') + result = pylsp_rename(config, tmp_workspace, doc, position, 'ShouldBeRenamed') assert len(result.keys()) == 1 changes = result.get('documentChanges') diff --git a/test/plugins/test_mccabe_lint.py b/test/plugins/test_mccabe_lint.py index 6fa4f0bf..c85a9965 100644 --- a/test/plugins/test_mccabe_lint.py +++ b/test/plugins/test_mccabe_lint.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. -from pyls import lsp, uris -from pyls.workspace import Document -from pyls.plugins import mccabe_lint +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + +from pylsp import lsp, uris +from pylsp.workspace import Document +from pylsp.plugins import mccabe_lint DOC_URI = uris.from_fs_path(__file__) DOC = """def hello(): @@ -17,9 +19,9 @@ def test_mccabe(config, workspace): try: config.update({'plugins': {'mccabe': {'threshold': 1}}}) doc = Document(DOC_URI, workspace, DOC) - diags = mccabe_lint.pyls_lint(config, doc) + diags = mccabe_lint.pylsp_lint(config, doc) - assert all([d['source'] == 'mccabe' for d in diags]) + assert all(d['source'] == 'mccabe' for d in diags) # One we're expecting is: msg = 'Cyclomatic complexity too high: 1 (threshold 1)' @@ -34,4 +36,4 @@ def test_mccabe(config, workspace): def test_mccabe_syntax_error(config, workspace): doc = Document(DOC_URI, workspace, DOC_SYNTAX_ERR) - assert mccabe_lint.pyls_lint(config, doc) is None + assert mccabe_lint.pylsp_lint(config, doc) is None diff --git a/test/plugins/test_pycodestyle_lint.py b/test/plugins/test_pycodestyle_lint.py index 2e9aebae..c0d1d7e5 100644 --- a/test/plugins/test_pycodestyle_lint.py +++ b/test/plugins/test_pycodestyle_lint.py @@ -1,8 +1,10 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import os -from pyls import lsp, uris -from pyls.workspace import Document -from pyls.plugins import pycodestyle_lint +from pylsp import lsp, uris +from pylsp.workspace import Document +from pylsp.plugins import pycodestyle_lint DOC_URI = uris.from_fs_path(__file__) DOC = """import sys @@ -21,9 +23,9 @@ def hello( ): def test_pycodestyle(workspace): doc = Document(DOC_URI, workspace, DOC) - diags = pycodestyle_lint.pyls_lint(workspace, doc) + diags = pycodestyle_lint.pylsp_lint(workspace, doc) - assert all([d['source'] == 'pycodestyle' for d in diags]) + assert all(d['source'] == 'pycodestyle' for d in diags) # One we're expecting is: msg = 'W191 indentation contains tabs' @@ -79,7 +81,7 @@ def test_pycodestyle_config(workspace): doc = workspace.get_document(doc_uri) # Make sure we get a warning for 'indentation contains tabs' - diags = pycodestyle_lint.pyls_lint(workspace, doc) + diags = pycodestyle_lint.pylsp_lint(workspace, doc) assert [d for d in diags if d['code'] == 'W191'] content = { @@ -94,7 +96,7 @@ def test_pycodestyle_config(workspace): workspace._config.settings.cache_clear() # And make sure we don't get any warnings - diags = pycodestyle_lint.pyls_lint(workspace, doc) + diags = pycodestyle_lint.pylsp_lint(workspace, doc) assert len([d for d in diags if d['code'] == 'W191']) == (0 if working else 1) assert len([d for d in diags if d['code'] == 'E201']) == (0 if working else 1) assert [d for d in diags if d['code'] == 'W391'] @@ -104,7 +106,7 @@ def test_pycodestyle_config(workspace): # Make sure we can ignore via the PYLS config as well workspace._config.update({'plugins': {'pycodestyle': {'ignore': ['W191', 'E201']}}}) # And make sure we only get one warning - diags = pycodestyle_lint.pyls_lint(workspace, doc) + diags = pycodestyle_lint.pylsp_lint(workspace, doc) assert not [d for d in diags if d['code'] == 'W191'] assert not [d for d in diags if d['code'] == 'E201'] assert [d for d in diags if d['code'] == 'W391'] diff --git a/test/plugins/test_pydocstyle_lint.py b/test/plugins/test_pydocstyle_lint.py index 9ee7b289..c6d8fa11 100644 --- a/test/plugins/test_pydocstyle_lint.py +++ b/test/plugins/test_pydocstyle_lint.py @@ -1,8 +1,10 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import os -from pyls import lsp, uris -from pyls.workspace import Document -from pyls.plugins import pydocstyle_lint +from pylsp import lsp, uris +from pylsp.workspace import Document +from pylsp.plugins import pydocstyle_lint DOC_URI = uris.from_fs_path(os.path.join(os.path.dirname(__file__), "pydocstyle.py")) TEST_DOC_URI = uris.from_fs_path(__file__) @@ -18,9 +20,9 @@ def hello(): def test_pydocstyle(config, workspace): doc = Document(DOC_URI, workspace, DOC) - diags = pydocstyle_lint.pyls_lint(config, doc) + diags = pydocstyle_lint.pylsp_lint(config, doc) - assert all([d['source'] == 'pydocstyle' for d in diags]) + assert all(d['source'] == 'pydocstyle' for d in diags) # One we're expecting is: assert diags[0] == { @@ -38,19 +40,19 @@ def test_pydocstyle(config, workspace): def test_pydocstyle_test_document(config, workspace): # The default --match argument excludes test_* documents. doc = Document(TEST_DOC_URI, workspace, "") - diags = pydocstyle_lint.pyls_lint(config, doc) + diags = pydocstyle_lint.pylsp_lint(config, doc) assert not diags def test_pydocstyle_empty_source(config, workspace): doc = Document(DOC_URI, workspace, "") - diags = pydocstyle_lint.pyls_lint(config, doc) + diags = pydocstyle_lint.pylsp_lint(config, doc) assert diags[0]['message'] == 'D100: Missing docstring in public module' assert len(diags) == 1 def test_pydocstyle_invalid_source(config, workspace): doc = Document(DOC_URI, workspace, "bad syntax") - diags = pydocstyle_lint.pyls_lint(config, doc) + diags = pydocstyle_lint.pylsp_lint(config, doc) # We're unable to parse the file, so can't get any pydocstyle diagnostics assert not diags diff --git a/test/plugins/test_pyflakes_lint.py b/test/plugins/test_pyflakes_lint.py index aa968265..494cb631 100644 --- a/test/plugins/test_pyflakes_lint.py +++ b/test/plugins/test_pyflakes_lint.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. -from pyls import lsp, uris -from pyls.workspace import Document -from pyls.plugins import pyflakes_lint +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + +from pylsp import lsp, uris +from pylsp.workspace import Document +from pylsp.plugins import pyflakes_lint DOC_URI = uris.from_fs_path(__file__) DOC = """import sys @@ -26,7 +28,7 @@ def hello(): def test_pyflakes(workspace): doc = Document(DOC_URI, workspace, DOC) - diags = pyflakes_lint.pyls_lint(doc) + diags = pyflakes_lint.pylsp_lint(doc) # One we're expecting is: msg = '\'sys\' imported but unused' @@ -38,7 +40,7 @@ def test_pyflakes(workspace): def test_syntax_error_pyflakes(workspace): doc = Document(DOC_URI, workspace, DOC_SYNTAX_ERR) - diag = pyflakes_lint.pyls_lint(doc)[0] + diag = pyflakes_lint.pylsp_lint(doc)[0] assert diag['message'] == 'invalid syntax' assert diag['range']['start'] == {'line': 0, 'character': 12} @@ -47,7 +49,7 @@ def test_syntax_error_pyflakes(workspace): def test_undefined_name_pyflakes(workspace): doc = Document(DOC_URI, workspace, DOC_UNDEFINED_NAME_ERR) - diag = pyflakes_lint.pyls_lint(doc)[0] + diag = pyflakes_lint.pylsp_lint(doc)[0] assert diag['message'] == 'undefined name \'b\'' assert diag['range']['start'] == {'line': 0, 'character': 4} @@ -56,7 +58,7 @@ def test_undefined_name_pyflakes(workspace): def test_unicode_encoding(workspace): doc = Document(DOC_URI, workspace, DOC_ENCODING) - diags = pyflakes_lint.pyls_lint(doc) + diags = pyflakes_lint.pylsp_lint(doc) assert len(diags) == 1 assert diags[0]['message'] == '\'sys\' imported but unused' diff --git a/test/plugins/test_pylint_lint.py b/test/plugins/test_pylint_lint.py index c2968ab8..f83e7542 100644 --- a/test/plugins/test_pylint_lint.py +++ b/test/plugins/test_pylint_lint.py @@ -1,12 +1,15 @@ # Copyright 2018 Google LLC. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import contextlib import os import tempfile from test import py2_only, py3_only, IS_PY3 -from pyls import lsp, uris -from pyls.workspace import Document -from pyls.plugins import pylint_lint +from pylsp import lsp, uris +from pylsp.workspace import Document +from pylsp.plugins import pylint_lint DOC_URI = uris.from_fs_path(__file__) DOC = """import sys @@ -41,7 +44,7 @@ def write_temp_doc(document, contents): def test_pylint(config, workspace): with temp_document(DOC, workspace) as doc: - diags = pylint_lint.pyls_lint(config, doc, True) + diags = pylint_lint.pylsp_lint(config, doc, True) msg = '[unused-import] Unused import sys' unused_import = [d for d in diags if d['message'] == msg][0] @@ -52,7 +55,7 @@ def test_pylint(config, workspace): if IS_PY3: # test running pylint in stdin config.plugin_settings('pylint')['executable'] = 'pylint' - diags = pylint_lint.pyls_lint(config, doc, True) + diags = pylint_lint.pylsp_lint(config, doc, True) msg = 'Unused import sys (unused-import)' unused_import = [d for d in diags if d['message'] == msg][0] @@ -67,7 +70,7 @@ def test_pylint(config, workspace): @py3_only def test_syntax_error_pylint_py3(config, workspace): with temp_document(DOC_SYNTAX_ERR, workspace) as doc: - diag = pylint_lint.pyls_lint(config, doc, True)[0] + diag = pylint_lint.pylsp_lint(config, doc, True)[0] assert diag['message'].startswith('[syntax-error] invalid syntax') # Pylint doesn't give column numbers for invalid syntax. @@ -76,7 +79,7 @@ def test_syntax_error_pylint_py3(config, workspace): # test running pylint in stdin config.plugin_settings('pylint')['executable'] = 'pylint' - diag = pylint_lint.pyls_lint(config, doc, True)[0] + diag = pylint_lint.pylsp_lint(config, doc, True)[0] assert diag['message'].startswith('invalid syntax') # Pylint doesn't give column numbers for invalid syntax. @@ -87,7 +90,7 @@ def test_syntax_error_pylint_py3(config, workspace): @py2_only def test_syntax_error_pylint_py2(config, workspace): with temp_document(DOC_SYNTAX_ERR, workspace) as doc: - diag = pylint_lint.pyls_lint(config, doc, True)[0] + diag = pylint_lint.pylsp_lint(config, doc, True)[0] assert diag['message'].startswith('[syntax-error] invalid syntax') # Pylint doesn't give column numbers for invalid syntax. @@ -99,7 +102,7 @@ def test_lint_free_pylint(config, workspace): # Can't use temp_document because it might give us a file that doesn't # match pylint's naming requirements. We should be keeping this file clean # though, so it works for a test of an empty lint. - assert not pylint_lint.pyls_lint( + assert not pylint_lint.pylsp_lint( config, Document(uris.from_fs_path(__file__), workspace), True) @@ -108,7 +111,7 @@ def test_lint_caching(workspace): # diagnostics after a run so we can continue displaying them until the file # is saved again. # - # We use PylintLinter.lint directly here rather than pyls_lint so we can + # We use PylintLinter.lint directly here rather than pylsp_lint so we can # pass --disable=invalid-name to pylint, since we want a temporary file but # need to ensure that pylint doesn't give us invalid-name when our temp # file has capital letters in its name. @@ -134,7 +137,7 @@ def test_lint_caching(workspace): def test_per_file_caching(config, workspace): # Ensure that diagnostics are cached per-file. with temp_document(DOC, workspace) as doc: - assert pylint_lint.pyls_lint(config, doc, True) + assert pylint_lint.pylsp_lint(config, doc, True) - assert not pylint_lint.pyls_lint( + assert not pylint_lint.pylsp_lint( config, Document(uris.from_fs_path(__file__), workspace), False) diff --git a/test/plugins/test_references.py b/test/plugins/test_references.py index c9688d3a..c1df037b 100644 --- a/test/plugins/test_references.py +++ b/test/plugins/test_references.py @@ -1,12 +1,13 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import os import pytest -from pyls import uris -from pyls.workspace import Document -from pyls.plugins.references import pyls_references -from pyls._utils import PY2 +from pylsp import uris +from pylsp.workspace import Document +from pylsp.plugins.references import pylsp_references DOC1_NAME = 'test1.py' @@ -39,13 +40,13 @@ def test_references(tmp_workspace): # pylint: disable=redefined-outer-name DOC1_URI = uris.from_fs_path(os.path.join(tmp_workspace.root_path, DOC1_NAME)) doc1 = Document(DOC1_URI, tmp_workspace) - refs = pyls_references(doc1, position) + refs = pylsp_references(doc1, position) # Definition, the import and the instantiation assert len(refs) == 3 # Briefly check excluding the definitions (also excludes imports, only counts uses) - no_def_refs = pyls_references(doc1, position, exclude_declaration=True) + no_def_refs = pylsp_references(doc1, position, exclude_declaration=True) assert len(no_def_refs) == 1 # Make sure our definition is correctly located @@ -63,15 +64,13 @@ def test_references(tmp_workspace): # pylint: disable=redefined-outer-name assert doc2_usage_ref['range']['end'] == {'line': 3, 'character': 9} -@pytest.mark.skipif(PY2, reason="Jedi sometimes fails while checking pylint " - "example files in the modules path") def test_references_builtin(tmp_workspace): # pylint: disable=redefined-outer-name # Over 'UnicodeError': position = {'line': 4, 'character': 7} doc2_uri = uris.from_fs_path(os.path.join(str(tmp_workspace.root_path), DOC2_NAME)) doc2 = Document(doc2_uri, tmp_workspace) - refs = pyls_references(doc2, position) + refs = pylsp_references(doc2, position) assert len(refs) >= 1 expected = {'start': {'line': 4, 'character': 7}, diff --git a/test/plugins/test_rope_rename.py b/test/plugins/test_rope_rename.py index 1fc32226..285a565e 100644 --- a/test/plugins/test_rope_rename.py +++ b/test/plugins/test_rope_rename.py @@ -1,9 +1,12 @@ +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import os import pytest -from pyls import uris -from pyls.plugins.rope_rename import pyls_rename -from pyls.workspace import Document +from pylsp import uris +from pylsp.plugins.rope_rename import pylsp_rename +from pylsp.workspace import Document DOC_NAME = "test1.py" DOC = """class Test1(): @@ -24,7 +27,7 @@ def test_rope_rename(tmp_workspace, config): # pylint: disable=redefined-outer- DOC_URI = uris.from_fs_path(os.path.join(tmp_workspace.root_path, DOC_NAME)) doc = Document(DOC_URI, tmp_workspace) - result = pyls_rename(config, tmp_workspace, doc, position, "ShouldBeRenamed") + result = pylsp_rename(config, tmp_workspace, doc, position, "ShouldBeRenamed") assert len(result.keys()) == 1 changes = result.get("documentChanges") diff --git a/test/plugins/test_signature.py b/test/plugins/test_signature.py index b6b5111a..51cecb56 100644 --- a/test/plugins/test_signature.py +++ b/test/plugins/test_signature.py @@ -1,8 +1,10 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import pytest -from pyls import uris -from pyls.plugins import signature -from pyls.workspace import Document +from pylsp import uris +from pylsp.plugins import signature +from pylsp.workspace import Document DOC_URI = uris.from_fs_path(__file__) DOC = """import sys @@ -44,7 +46,7 @@ def test_no_signature(workspace): sig_position = {'line': 9, 'character': 0} doc = Document(DOC_URI, workspace, DOC) - sigs = signature.pyls_signature_help(doc, sig_position)['signatures'] + sigs = signature.pylsp_signature_help(doc, sig_position)['signatures'] assert not sigs @@ -53,7 +55,7 @@ def test_signature(workspace): sig_position = {'line': 10, 'character': 5} doc = Document(DOC_URI, workspace, DOC) - sig_info = signature.pyls_signature_help(doc, sig_position) + sig_info = signature.pylsp_signature_help(doc, sig_position) sigs = sig_info['signatures'] assert len(sigs) == 1 @@ -69,7 +71,7 @@ def test_multi_line_signature(workspace): sig_position = {'line': 17, 'character': 5} doc = Document(DOC_URI, workspace, MULTI_LINE_DOC) - sig_info = signature.pyls_signature_help(doc, sig_position) + sig_info = signature.pylsp_signature_help(doc, sig_position) sigs = sig_info['signatures'] assert len(sigs) == 1 diff --git a/test/plugins/test_symbols.py b/test/plugins/test_symbols.py index a03c1fc9..a25f5621 100644 --- a/test/plugins/test_symbols.py +++ b/test/plugins/test_symbols.py @@ -1,13 +1,15 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import os import sys import pytest -from pyls import uris -from pyls.plugins.symbols import pyls_document_symbols -from pyls.lsp import SymbolKind -from pyls.workspace import Document +from pylsp import uris +from pylsp.plugins.symbols import pylsp_document_symbols +from pylsp.lsp import SymbolKind +from pylsp.workspace import Document PY2 = sys.version[0] == '2' @@ -50,7 +52,7 @@ def sym(name): def test_symbols(config, workspace): doc = Document(DOC_URI, workspace, DOC) config.update({'plugins': {'jedi_symbols': {'all_scopes': False}}}) - symbols = pyls_document_symbols(config, doc) + symbols = pylsp_document_symbols(config, doc) # All four symbols (import sys, a, B, main) # y is not in the root scope, it shouldn't be returned @@ -74,7 +76,7 @@ def sym(name): def test_symbols_all_scopes(config, workspace): doc = Document(DOC_URI, workspace, DOC) - symbols = pyls_document_symbols(config, doc) + symbols = pylsp_document_symbols(config, doc) helper_check_symbols_all_scope(symbols) @@ -84,7 +86,7 @@ def test_symbols_all_scopes_with_jedi_environment(workspace): # Update config extra environment env_path = '/tmp/pyenv/bin/python' - settings = {'pyls': {'plugins': {'jedi': {'environment': env_path}}}} + settings = {'pylsp': {'plugins': {'jedi': {'environment': env_path}}}} doc.update_config(settings) - symbols = pyls_document_symbols(doc._config, doc) + symbols = pylsp_document_symbols(doc._config, doc) helper_check_symbols_all_scope(symbols) diff --git a/test/plugins/test_yapf_format.py b/test/plugins/test_yapf_format.py index e3e198e6..90410432 100644 --- a/test/plugins/test_yapf_format.py +++ b/test/plugins/test_yapf_format.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. -from pyls import uris -from pyls.plugins.yapf_format import pyls_format_document, pyls_format_range -from pyls.workspace import Document +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + +from pylsp import uris +from pylsp.plugins.yapf_format import pylsp_format_document, pylsp_format_range +from pylsp.workspace import Document DOC_URI = uris.from_fs_path(__file__) DOC = """A = [ @@ -21,7 +23,7 @@ def test_format(workspace): doc = Document(DOC_URI, workspace, DOC) - res = pyls_format_document(doc) + res = pylsp_format_document(doc) assert len(res) == 1 assert res[0]['newText'] == "A = ['h', 'w', 'a']\n\nB = ['h', 'w']\n" @@ -34,7 +36,7 @@ def test_range_format(workspace): 'start': {'line': 0, 'character': 0}, 'end': {'line': 4, 'character': 10} } - res = pyls_format_range(doc, def_range) + res = pylsp_format_range(doc, def_range) assert len(res) == 1 @@ -44,7 +46,7 @@ def test_range_format(workspace): def test_no_change(workspace): doc = Document(DOC_URI, workspace, GOOD_DOC) - assert not pyls_format_document(doc) + assert not pylsp_format_document(doc) def test_config_file(tmpdir, workspace): @@ -55,4 +57,4 @@ def test_config_file(tmpdir, workspace): doc = Document(uris.from_fs_path(src.strpath), workspace, DOC) # A was split on multiple lines because of column_limit from config file - assert pyls_format_document(doc)[0]['newText'] == "A = [\n 'h', 'w',\n 'a'\n]\n\nB = ['h', 'w']\n" + assert pylsp_format_document(doc)[0]['newText'] == "A = [\n 'h', 'w',\n 'a'\n]\n\nB = ['h', 'w']\n" diff --git a/test/test_document.py b/test/test_document.py index dc54613a..b543a408 100644 --- a/test/test_document.py +++ b/test/test_document.py @@ -1,6 +1,8 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + from test.fixtures import DOC_URI, DOC -from pyls.workspace import Document +from pylsp.workspace import Document def test_document_props(doc): diff --git a/test/test_language_server.py b/test/test_language_server.py index 6cfe0678..dc1cffca 100644 --- a/test/test_language_server.py +++ b/test/test_language_server.py @@ -1,4 +1,6 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import os import time import multiprocessing @@ -8,7 +10,7 @@ from pyls_jsonrpc.exceptions import JsonRpcMethodNotFound import pytest -from pyls.python_ls import start_io_lang_server, PythonLanguageServer +from pylsp.python_lsp import start_io_lang_server, PythonLSPServer CALL_TIMEOUT = 10 PY2 = sys.version_info[0] == 2 @@ -19,7 +21,7 @@ def start_client(client): client.start() -class _ClientServer(object): +class _ClientServer: """ A class to setup a client/server pair """ def __init__(self, check_parent_process=False): # Client to Server pipe @@ -31,16 +33,16 @@ def __init__(self, check_parent_process=False): ParallelKind = Thread else: if sys.version_info[:2] >= (3, 8): - ParallelKind = multiprocessing.get_context("fork").Process # pylint: disable=no-member + ParallelKind = multiprocessing.get_context("fork").Process else: ParallelKind = multiprocessing.Process self.process = ParallelKind(target=start_io_lang_server, args=( - os.fdopen(csr, 'rb'), os.fdopen(scw, 'wb'), check_parent_process, PythonLanguageServer + os.fdopen(csr, 'rb'), os.fdopen(scw, 'wb'), check_parent_process, PythonLSPServer )) self.process.start() - self.client = PythonLanguageServer(os.fdopen(scr, 'rb'), os.fdopen(csw, 'wb'), start_io_lang_server) + self.client = PythonLSPServer(os.fdopen(scr, 'rb'), os.fdopen(csw, 'wb'), start_io_lang_server) self.client_thread = Thread(target=start_client, args=[self.client]) self.client_thread.daemon = True self.client_thread.start() diff --git a/test/test_uris.py b/test/test_uris.py index d4e177e6..ad83c090 100644 --- a/test/test_uris.py +++ b/test/test_uris.py @@ -1,7 +1,9 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + from test import unix_only, windows_only import pytest -from pyls import uris +from pylsp import uris @unix_only diff --git a/test/test_utils.py b/test/test_utils.py index 04a91d30..0ce6d9dd 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,10 +1,12 @@ -# Copyright 2017 Palantir Technologies, Inc. +# Copyright 2017-2020 Palantir Technologies, Inc. +# Copyright 2021- Python Language Server Contributors. + import time -import mock +import unittest.mock as mock from flaky import flaky -from pyls import _utils +from pylsp import _utils @flaky diff --git a/test/test_workspace.py b/test/test_workspace.py index 45549b0d..e8851e05 100644 --- a/test/test_workspace.py +++ b/test/test_workspace.py @@ -1,17 +1,9 @@ # Copyright 2017 Palantir Technologies, Inc. import os -import sys +import pathlib import pytest - -from pyls import uris - -PY2 = sys.version_info.major == 2 - -if PY2: - import pathlib2 as pathlib -else: - import pathlib +from pylsp import uris DOC_URI = uris.from_fs_path(__file__) @@ -21,39 +13,39 @@ def path_as_uri(path): return pathlib.Path(os.path.abspath(path)).as_uri() -def test_local(pyls): +def test_local(pylsp): """ Since the workspace points to the test directory """ - assert pyls.workspace.is_local() + assert pylsp.workspace.is_local() -def test_put_document(pyls): - pyls.workspace.put_document(DOC_URI, 'content') - assert DOC_URI in pyls.workspace._docs +def test_put_document(pylsp): + pylsp.workspace.put_document(DOC_URI, 'content') + assert DOC_URI in pylsp.workspace._docs -def test_get_document(pyls): - pyls.workspace.put_document(DOC_URI, 'TEXT') - assert pyls.workspace.get_document(DOC_URI).source == 'TEXT' +def test_get_document(pylsp): + pylsp.workspace.put_document(DOC_URI, 'TEXT') + assert pylsp.workspace.get_document(DOC_URI).source == 'TEXT' -def test_get_missing_document(tmpdir, pyls): +def test_get_missing_document(tmpdir, pylsp): source = 'TEXT' doc_path = tmpdir.join("test_document.py") doc_path.write(source) doc_uri = uris.from_fs_path(str(doc_path)) - assert pyls.workspace.get_document(doc_uri).source == 'TEXT' + assert pylsp.workspace.get_document(doc_uri).source == 'TEXT' -def test_rm_document(pyls): - pyls.workspace.put_document(DOC_URI, 'TEXT') - assert pyls.workspace.get_document(DOC_URI).source == 'TEXT' - pyls.workspace.rm_document(DOC_URI) - assert pyls.workspace.get_document(DOC_URI)._source is None +def test_rm_document(pylsp): + pylsp.workspace.put_document(DOC_URI, 'TEXT') + assert pylsp.workspace.get_document(DOC_URI).source == 'TEXT' + pylsp.workspace.rm_document(DOC_URI) + assert pylsp.workspace.get_document(DOC_URI)._source is None @pytest.mark.parametrize('metafiles', [('setup.py',), ('pyproject.toml',), ('setup.py', 'pyproject.toml')]) -def test_non_root_project(pyls, metafiles): - repo_root = os.path.join(pyls.workspace.root_path, 'repo-root') +def test_non_root_project(pylsp, metafiles): + repo_root = os.path.join(pylsp.workspace.root_path, 'repo-root') os.mkdir(repo_root) project_root = os.path.join(repo_root, 'project-root') os.mkdir(project_root) @@ -63,21 +55,21 @@ def test_non_root_project(pyls, metafiles): f.write('# ' + metafile) test_uri = uris.from_fs_path(os.path.join(project_root, 'hello/test.py')) - pyls.workspace.put_document(test_uri, 'assert True') - test_doc = pyls.workspace.get_document(test_uri) + pylsp.workspace.put_document(test_uri, 'assert True') + test_doc = pylsp.workspace.get_document(test_uri) assert project_root in test_doc.sys_path() -def test_root_project_with_no_setup_py(pyls): +def test_root_project_with_no_setup_py(pylsp): """Default to workspace root.""" - workspace_root = pyls.workspace.root_path + workspace_root = pylsp.workspace.root_path test_uri = uris.from_fs_path(os.path.join(workspace_root, 'hello/test.py')) - pyls.workspace.put_document(test_uri, 'assert True') - test_doc = pyls.workspace.get_document(test_uri) + pylsp.workspace.put_document(test_uri, 'assert True') + test_doc = pylsp.workspace.get_document(test_uri) assert workspace_root in test_doc.sys_path() -def test_multiple_workspaces(tmpdir, pyls): +def test_multiple_workspaces(tmpdir, pylsp): workspace1_dir = tmpdir.mkdir('workspace1') workspace2_dir = tmpdir.mkdir('workspace2') file1 = workspace1_dir.join('file1.py') @@ -91,119 +83,119 @@ def test_multiple_workspaces(tmpdir, pyls): 'text': 'import os' } - pyls.m_text_document__did_open(textDocument=msg) - assert msg['uri'] in pyls.workspace._docs + pylsp.m_text_document__did_open(textDocument=msg) + assert msg['uri'] in pylsp.workspace._docs added_workspaces = [{'uri': path_as_uri(str(x))} for x in (workspace1_dir, workspace2_dir)] event = {'added': added_workspaces, 'removed': []} - pyls.m_workspace__did_change_workspace_folders(event) + pylsp.m_workspace__did_change_workspace_folders(event) for workspace in added_workspaces: - assert workspace['uri'] in pyls.workspaces + assert workspace['uri'] in pylsp.workspaces workspace1_uri = added_workspaces[0]['uri'] - assert msg['uri'] not in pyls.workspace._docs - assert msg['uri'] in pyls.workspaces[workspace1_uri]._docs + assert msg['uri'] not in pylsp.workspace._docs + assert msg['uri'] in pylsp.workspaces[workspace1_uri]._docs msg = { 'uri': path_as_uri(str(file2)), 'version': 1, 'text': 'import sys' } - pyls.m_text_document__did_open(textDocument=msg) + pylsp.m_text_document__did_open(textDocument=msg) workspace2_uri = added_workspaces[1]['uri'] - assert msg['uri'] in pyls.workspaces[workspace2_uri]._docs + assert msg['uri'] in pylsp.workspaces[workspace2_uri]._docs event = {'added': [], 'removed': [added_workspaces[0]]} - pyls.m_workspace__did_change_workspace_folders(event) - assert workspace1_uri not in pyls.workspaces + pylsp.m_workspace__did_change_workspace_folders(event) + assert workspace1_uri not in pylsp.workspaces -def test_multiple_workspaces_wrong_removed_uri(pyls, tmpdir): +def test_multiple_workspaces_wrong_removed_uri(pylsp, tmpdir): workspace = {'uri': str(tmpdir.mkdir('Test123'))} event = {'added': [], 'removed': [workspace]} - pyls.m_workspace__did_change_workspace_folders(event) - assert workspace['uri'] not in pyls.workspaces + pylsp.m_workspace__did_change_workspace_folders(event) + assert workspace['uri'] not in pylsp.workspaces -def test_root_workspace_changed(pyls, tmpdir): +def test_root_workspace_changed(pylsp, tmpdir): test_uri = str(tmpdir.mkdir('Test123')) - pyls.root_uri = test_uri - pyls.workspace._root_uri = test_uri + pylsp.root_uri = test_uri + pylsp.workspace._root_uri = test_uri workspace1 = {'uri': test_uri} workspace2 = {'uri': str(tmpdir.mkdir('NewTest456'))} event = {'added': [workspace2], 'removed': [workspace1]} - pyls.m_workspace__did_change_workspace_folders(event) + pylsp.m_workspace__did_change_workspace_folders(event) - assert workspace2['uri'] == pyls.workspace._root_uri - assert workspace2['uri'] == pyls.root_uri + assert workspace2['uri'] == pylsp.workspace._root_uri + assert workspace2['uri'] == pylsp.root_uri -def test_root_workspace_not_changed(pyls, tmpdir): +def test_root_workspace_not_changed(pylsp, tmpdir): # removed uri != root_uri test_uri_1 = str(tmpdir.mkdir('Test12')) - pyls.root_uri = test_uri_1 - pyls.workspace._root_uri = test_uri_1 + pylsp.root_uri = test_uri_1 + pylsp.workspace._root_uri = test_uri_1 workspace1 = {'uri': str(tmpdir.mkdir('Test1234'))} workspace2 = {'uri': str(tmpdir.mkdir('NewTest456'))} event = {'added': [workspace2], 'removed': [workspace1]} - pyls.m_workspace__did_change_workspace_folders(event) - assert test_uri_1 == pyls.workspace._root_uri - assert test_uri_1 == pyls.root_uri + pylsp.m_workspace__did_change_workspace_folders(event) + assert test_uri_1 == pylsp.workspace._root_uri + assert test_uri_1 == pylsp.root_uri # empty 'added' list test_uri_2 = str(tmpdir.mkdir('Test123')) new_root_uri = workspace2['uri'] - pyls.root_uri = test_uri_2 - pyls.workspace._root_uri = test_uri_2 + pylsp.root_uri = test_uri_2 + pylsp.workspace._root_uri = test_uri_2 workspace1 = {'uri': test_uri_2} event = {'added': [], 'removed': [workspace1]} - pyls.m_workspace__did_change_workspace_folders(event) - assert new_root_uri == pyls.workspace._root_uri - assert new_root_uri == pyls.root_uri + pylsp.m_workspace__did_change_workspace_folders(event) + assert new_root_uri == pylsp.workspace._root_uri + assert new_root_uri == pylsp.root_uri # empty 'removed' list event = {'added': [workspace1], 'removed': []} - pyls.m_workspace__did_change_workspace_folders(event) - assert new_root_uri == pyls.workspace._root_uri - assert new_root_uri == pyls.root_uri + pylsp.m_workspace__did_change_workspace_folders(event) + assert new_root_uri == pylsp.workspace._root_uri + assert new_root_uri == pylsp.root_uri # 'added' list has no 'uri' workspace2 = {'TESTuri': 'Test1234'} event = {'added': [workspace2], 'removed': [workspace1]} - pyls.m_workspace__did_change_workspace_folders(event) - assert new_root_uri == pyls.workspace._root_uri - assert new_root_uri == pyls.root_uri + pylsp.m_workspace__did_change_workspace_folders(event) + assert new_root_uri == pylsp.workspace._root_uri + assert new_root_uri == pylsp.root_uri -def test_root_workspace_removed(tmpdir, pyls): +def test_root_workspace_removed(tmpdir, pylsp): workspace1_dir = tmpdir.mkdir('workspace1') workspace2_dir = tmpdir.mkdir('workspace2') - root_uri = pyls.root_uri + root_uri = pylsp.root_uri - # Add workspaces to the pyls + # Add workspaces to the pylsp added_workspaces = [{'uri': path_as_uri(str(x))} for x in (workspace1_dir, workspace2_dir)] event = {'added': added_workspaces, 'removed': []} - pyls.m_workspace__did_change_workspace_folders(event) + pylsp.m_workspace__did_change_workspace_folders(event) # Remove the root workspace removed_workspaces = [{'uri': root_uri}] event = {'added': [], 'removed': removed_workspaces} - pyls.m_workspace__did_change_workspace_folders(event) + pylsp.m_workspace__did_change_workspace_folders(event) # Assert that the first of the workspaces (in alphabetical order) is now # the root workspace - assert pyls.root_uri == path_as_uri(str(workspace1_dir)) - assert pyls.workspace._root_uri == path_as_uri(str(workspace1_dir)) + assert pylsp.root_uri == path_as_uri(str(workspace1_dir)) + assert pylsp.workspace._root_uri == path_as_uri(str(workspace1_dir)) @pytest.mark.skipif(os.name == 'nt', reason="Fails on Windows") -def test_workspace_loads_pycodestyle_config(pyls, tmpdir): +def test_workspace_loads_pycodestyle_config(pylsp, tmpdir): workspace1_dir = tmpdir.mkdir('Test123') - pyls.root_uri = str(workspace1_dir) - pyls.workspace._root_uri = str(workspace1_dir) + pylsp.root_uri = str(workspace1_dir) + pylsp.workspace._root_uri = str(workspace1_dir) # Test that project settings are loaded workspace2_dir = tmpdir.mkdir('NewTest456') @@ -217,14 +209,14 @@ def test_workspace_loads_pycodestyle_config(pyls, tmpdir): workspace2 = {'uri': str(workspace2_dir)} event = {'added': [workspace2], 'removed': [workspace1]} - pyls.m_workspace__did_change_workspace_folders(event) + pylsp.m_workspace__did_change_workspace_folders(event) - seetings = pyls.workspaces[str(workspace2_dir)]._config.settings() + seetings = pylsp.workspaces[str(workspace2_dir)]._config.settings() assert seetings['plugins']['pycodestyle']['maxLineLength'] == 1000 # Test that project settings prevail over server ones. - server_settings = {'pyls': {'plugins': {'pycodestyle': {'maxLineLength': 10}}}} - pyls.m_workspace__did_change_configuration(server_settings) + server_settings = {'pylsp': {'plugins': {'pycodestyle': {'maxLineLength': 10}}}} + pylsp.m_workspace__did_change_configuration(server_settings) assert seetings['plugins']['pycodestyle']['maxLineLength'] == 1000 # Test switching to another workspace with different settings @@ -238,27 +230,27 @@ def test_workspace_loads_pycodestyle_config(pyls, tmpdir): workspace3 = {'uri': str(workspace3_dir)} event = {'added': [workspace3], 'removed': [workspace2]} - pyls.m_workspace__did_change_workspace_folders(event) + pylsp.m_workspace__did_change_workspace_folders(event) - seetings = pyls.workspaces[str(workspace3_dir)]._config.settings() + seetings = pylsp.workspaces[str(workspace3_dir)]._config.settings() assert seetings['plugins']['pycodestyle']['maxLineLength'] == 20 -def test_settings_of_added_workspace(pyls, tmpdir): +def test_settings_of_added_workspace(pylsp, tmpdir): test_uri = str(tmpdir.mkdir('Test123')) - pyls.root_uri = test_uri - pyls.workspace._root_uri = test_uri + pylsp.root_uri = test_uri + pylsp.workspace._root_uri = test_uri # Set some settings for the server. - server_settings = {'pyls': {'plugins': {'jedi': {'environment': '/usr/bin/python3'}}}} - pyls.m_workspace__did_change_configuration(server_settings) + server_settings = {'pylsp': {'plugins': {'jedi': {'environment': '/usr/bin/python3'}}}} + pylsp.m_workspace__did_change_configuration(server_settings) # Create a new workspace. workspace1 = {'uri': str(tmpdir.mkdir('NewTest456'))} event = {'added': [workspace1]} - pyls.m_workspace__did_change_workspace_folders(event) + pylsp.m_workspace__did_change_workspace_folders(event) # Assert settings are inherited from the server config. - workspace1_object = pyls.workspaces[workspace1['uri']] + workspace1_object = pylsp.workspaces[workspace1['uri']] workspace1_jedi_settings = workspace1_object._config.plugin_settings('jedi') - assert workspace1_jedi_settings == server_settings['pyls']['plugins']['jedi'] + assert workspace1_jedi_settings == server_settings['pylsp']['plugins']['jedi'] diff --git a/versioneer.py b/versioneer.py deleted file mode 100644 index 64fea1c8..00000000 --- a/versioneer.py +++ /dev/null @@ -1,1822 +0,0 @@ - -# Version: 0.18 - -"""The Versioneer - like a rocketeer, but for versions. - -The Versioneer -============== - -* like a rocketeer, but for versions! -* https://github.com/warner/python-versioneer -* Brian Warner -* License: Public Domain -* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy -* [![Latest Version] -(https://pypip.in/version/versioneer/badge.svg?style=flat) -](https://pypi.python.org/pypi/versioneer/) -* [![Build Status] -(https://travis-ci.org/warner/python-versioneer.png?branch=master) -](https://travis-ci.org/warner/python-versioneer) - -This is a tool for managing a recorded version number in distutils-based -python projects. The goal is to remove the tedious and error-prone "update -the embedded version string" step from your release process. Making a new -release should be as easy as recording a new tag in your version-control -system, and maybe making new tarballs. - - -## Quick Install - -* `pip install versioneer` to somewhere to your $PATH -* add a `[versioneer]` section to your setup.cfg (see below) -* run `versioneer install` in your source tree, commit the results - -## Version Identifiers - -Source trees come from a variety of places: - -* a version-control system checkout (mostly used by developers) -* a nightly tarball, produced by build automation -* a snapshot tarball, produced by a web-based VCS browser, like github's - "tarball from tag" feature -* a release tarball, produced by "setup.py sdist", distributed through PyPI - -Within each source tree, the version identifier (either a string or a number, -this tool is format-agnostic) can come from a variety of places: - -* ask the VCS tool itself, e.g. "git describe" (for checkouts), which knows - about recent "tags" and an absolute revision-id -* the name of the directory into which the tarball was unpacked -* an expanded VCS keyword ($Id$, etc) -* a `_version.py` created by some earlier build step - -For released software, the version identifier is closely related to a VCS -tag. Some projects use tag names that include more than just the version -string (e.g. "myproject-1.2" instead of just "1.2"), in which case the tool -needs to strip the tag prefix to extract the version identifier. For -unreleased software (between tags), the version identifier should provide -enough information to help developers recreate the same tree, while also -giving them an idea of roughly how old the tree is (after version 1.2, before -version 1.3). Many VCS systems can report a description that captures this, -for example `git describe --tags --dirty --always` reports things like -"0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the -0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has -uncommitted changes. - -The version identifier is used for multiple purposes: - -* to allow the module to self-identify its version: `myproject.__version__` -* to choose a name and prefix for a 'setup.py sdist' tarball - -## Theory of Operation - -Versioneer works by adding a special `_version.py` file into your source -tree, where your `__init__.py` can import it. This `_version.py` knows how to -dynamically ask the VCS tool for version information at import time. - -`_version.py` also contains `$Revision$` markers, and the installation -process marks `_version.py` to have this marker rewritten with a tag name -during the `git archive` command. As a result, generated tarballs will -contain enough information to get the proper version. - -To allow `setup.py` to compute a version too, a `versioneer.py` is added to -the top level of your source tree, next to `setup.py` and the `setup.cfg` -that configures it. This overrides several distutils/setuptools commands to -compute the version when invoked, and changes `setup.py build` and `setup.py -sdist` to replace `_version.py` with a small static file that contains just -the generated version data. - -## Installation - -See [INSTALL.md](./INSTALL.md) for detailed installation instructions. - -## Version-String Flavors - -Code which uses Versioneer can learn about its version string at runtime by -importing `_version` from your main `__init__.py` file and running the -`get_versions()` function. From the "outside" (e.g. in `setup.py`), you can -import the top-level `versioneer.py` and run `get_versions()`. - -Both functions return a dictionary with different flavors of version -information: - -* `['version']`: A condensed version string, rendered using the selected - style. This is the most commonly used value for the project's version - string. The default "pep440" style yields strings like `0.11`, - `0.11+2.g1076c97`, or `0.11+2.g1076c97.dirty`. See the "Styles" section - below for alternative styles. - -* `['full-revisionid']`: detailed revision identifier. For Git, this is the - full SHA1 commit id, e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac". - -* `['date']`: Date and time of the latest `HEAD` commit. For Git, it is the - commit date in ISO 8601 format. This will be None if the date is not - available. - -* `['dirty']`: a boolean, True if the tree has uncommitted changes. Note that - this is only accurate if run in a VCS checkout, otherwise it is likely to - be False or None - -* `['error']`: if the version string could not be computed, this will be set - to a string describing the problem, otherwise it will be None. It may be - useful to throw an exception in setup.py if this is set, to avoid e.g. - creating tarballs with a version string of "unknown". - -Some variants are more useful than others. Including `full-revisionid` in a -bug report should allow developers to reconstruct the exact code being tested -(or indicate the presence of local changes that should be shared with the -developers). `version` is suitable for display in an "about" box or a CLI -`--version` output: it can be easily compared against release notes and lists -of bugs fixed in various releases. - -The installer adds the following text to your `__init__.py` to place a basic -version in `YOURPROJECT.__version__`: - - from ._version import get_versions - __version__ = get_versions()['version'] - del get_versions - -## Styles - -The setup.cfg `style=` configuration controls how the VCS information is -rendered into a version string. - -The default style, "pep440", produces a PEP440-compliant string, equal to the -un-prefixed tag name for actual releases, and containing an additional "local -version" section with more detail for in-between builds. For Git, this is -TAG[+DISTANCE.gHEX[.dirty]] , using information from `git describe --tags ---dirty --always`. For example "0.11+2.g1076c97.dirty" indicates that the -tree is like the "1076c97" commit but has uncommitted changes (".dirty"), and -that this commit is two revisions ("+2") beyond the "0.11" tag. For released -software (exactly equal to a known tag), the identifier will only contain the -stripped tag, e.g. "0.11". - -Other styles are available. See [details.md](details.md) in the Versioneer -source tree for descriptions. - -## Debugging - -Versioneer tries to avoid fatal errors: if something goes wrong, it will tend -to return a version of "0+unknown". To investigate the problem, run `setup.py -version`, which will run the version-lookup code in a verbose mode, and will -display the full contents of `get_versions()` (including the `error` string, -which may help identify what went wrong). - -## Known Limitations - -Some situations are known to cause problems for Versioneer. This details the -most significant ones. More can be found on Github -[issues page](https://github.com/warner/python-versioneer/issues). - -### Subprojects - -Versioneer has limited support for source trees in which `setup.py` is not in -the root directory (e.g. `setup.py` and `.git/` are *not* siblings). The are -two common reasons why `setup.py` might not be in the root: - -* Source trees which contain multiple subprojects, such as - [Buildbot](https://github.com/buildbot/buildbot), which contains both - "master" and "slave" subprojects, each with their own `setup.py`, - `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI - distributions (and upload multiple independently-installable tarballs). -* Source trees whose main purpose is to contain a C library, but which also - provide bindings to Python (and perhaps other langauges) in subdirectories. - -Versioneer will look for `.git` in parent directories, and most operations -should get the right version string. However `pip` and `setuptools` have bugs -and implementation details which frequently cause `pip install .` from a -subproject directory to fail to find a correct version string (so it usually -defaults to `0+unknown`). - -`pip install --editable .` should work correctly. `setup.py install` might -work too. - -Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in -some later version. - -[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking -this issue. The discussion in -[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the -issue from the Versioneer side in more detail. -[pip PR#3176](https://github.com/pypa/pip/pull/3176) and -[pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve -pip to let Versioneer work correctly. - -Versioneer-0.16 and earlier only looked for a `.git` directory next to the -`setup.cfg`, so subprojects were completely unsupported with those releases. - -### Editable installs with setuptools <= 18.5 - -`setup.py develop` and `pip install --editable .` allow you to install a -project into a virtualenv once, then continue editing the source code (and -test) without re-installing after every change. - -"Entry-point scripts" (`setup(entry_points={"console_scripts": ..})`) are a -convenient way to specify executable scripts that should be installed along -with the python package. - -These both work as expected when using modern setuptools. When using -setuptools-18.5 or earlier, however, certain operations will cause -`pkg_resources.DistributionNotFound` errors when running the entrypoint -script, which must be resolved by re-installing the package. This happens -when the install happens with one version, then the egg_info data is -regenerated while a different version is checked out. Many setup.py commands -cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into -a different virtualenv), so this can be surprising. - -[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes -this one, but upgrading to a newer version of setuptools should probably -resolve it. - -### Unicode version strings - -While Versioneer works (and is continually tested) with both Python 2 and -Python 3, it is not entirely consistent with bytes-vs-unicode distinctions. -Newer releases probably generate unicode version strings on py2. It's not -clear that this is wrong, but it may be surprising for applications when then -write these strings to a network connection or include them in bytes-oriented -APIs like cryptographic checksums. - -[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates -this question. - - -## Updating Versioneer - -To upgrade your project to a new release of Versioneer, do the following: - -* install the new Versioneer (`pip install -U versioneer` or equivalent) -* edit `setup.cfg`, if necessary, to include any new configuration settings - indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details. -* re-run `versioneer install` in your source tree, to replace - `SRC/_version.py` -* commit any changed files - -## Future Directions - -This tool is designed to make it easily extended to other version-control -systems: all VCS-specific components are in separate directories like -src/git/ . The top-level `versioneer.py` script is assembled from these -components by running make-versioneer.py . In the future, make-versioneer.py -will take a VCS name as an argument, and will construct a version of -`versioneer.py` that is specific to the given VCS. It might also take the -configuration arguments that are currently provided manually during -installation by editing setup.py . Alternatively, it might go the other -direction and include code from all supported VCS systems, reducing the -number of intermediate scripts. - - -## License - -To make Versioneer easier to embed, all its code is dedicated to the public -domain. The `_version.py` that it creates is also in the public domain. -Specifically, both are released under the Creative Commons "Public Domain -Dedication" license (CC0-1.0), as described in -https://creativecommons.org/publicdomain/zero/1.0/ . - -""" - -from __future__ import print_function -try: - import configparser -except ImportError: - import ConfigParser as configparser -import errno -import json -import os -import re -import subprocess -import sys - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_root(): - """Get the project root directory. - - We require that all commands are run from the project root, i.e. the - directory that contains setup.py, setup.cfg, and versioneer.py . - """ - root = os.path.realpath(os.path.abspath(os.getcwd())) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - # allow 'python path/to/setup.py COMMAND' - root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - err = ("Versioneer was unable to run the project root directory. " - "Versioneer requires setup.py to be executed from " - "its immediate directory (like 'python setup.py COMMAND'), " - "or in a way that lets it use sys.argv[0] to find the root " - "(like 'python path/to/setup.py COMMAND').") - raise VersioneerBadRootError(err) - try: - # Certain runtime workflows (setup.py install/develop in a setuptools - # tree) execute all dependencies in a single python process, so - # "versioneer" may be imported multiple times, and python's shared - # module-import table will cache the first one. So we can't use - # os.path.dirname(__file__), as that will find whichever - # versioneer.py was first imported, even in later projects. - me = os.path.realpath(os.path.abspath(__file__)) - me_dir = os.path.normcase(os.path.splitext(me)[0]) - vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) - if me_dir != vsr_dir: - print("Warning: build in %s is using versioneer.py from %s" - % (os.path.dirname(me), versioneer_py)) - except NameError: - pass - return root - - -def get_config_from_root(root): - """Read the project setup.cfg file to determine Versioneer config.""" - # This might raise EnvironmentError (if setup.cfg is missing), or - # configparser.NoSectionError (if it lacks a [versioneer] section), or - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . - setup_cfg = os.path.join(root, "setup.cfg") - parser = configparser.SafeConfigParser() - with open(setup_cfg, "r") as f: - parser.readfp(f) - VCS = parser.get("versioneer", "VCS") # mandatory - - def get(parser, name): - if parser.has_option("versioneer", name): - return parser.get("versioneer", name) - return None - cfg = VersioneerConfig() - cfg.VCS = VCS - cfg.style = get(parser, "style") or "" - cfg.versionfile_source = get(parser, "versionfile_source") - cfg.versionfile_build = get(parser, "versionfile_build") - cfg.tag_prefix = get(parser, "tag_prefix") - if cfg.tag_prefix in ("''", '""'): - cfg.tag_prefix = "" - cfg.parentdir_prefix = get(parser, "parentdir_prefix") - cfg.verbose = get(parser, "verbose") - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -# these dictionaries contain VCS-specific tools -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -LONG_VERSION_PY['git'] = ''' -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.18 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s" - git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s" - git_date = "%(DOLLAR)sFormat:%%ci%(DOLLAR)s" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "%(STYLE)s" - cfg.tag_prefix = "%(TAG_PREFIX)s" - cfg.parentdir_prefix = "%(PARENTDIR_PREFIX)s" - cfg.versionfile_source = "%(VERSIONFILE_SOURCE)s" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %%s" %% dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %%s" %% (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %%s (error)" %% dispcmd) - print("stdout was %%s" %% stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %%s but none started with prefix %%s" %% - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %%d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%%s', no digits" %% ",".join(refs - tags)) - if verbose: - print("likely tags: %%s" %% ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %%s" %% r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %%s not under git control" %% root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%%s*" %% tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%%s'" - %% describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%%s' doesn't start with prefix '%%s'" - print(fmt %% (full_tag, tag_prefix)) - pieces["error"] = ("tag '%%s' doesn't start with prefix '%%s'" - %% (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%%d.g%%s" %% (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%%d" %% pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%%d" %% pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%%s" %% pieces["short"] - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%%s" %% pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%%s'" %% style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, - verbose) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None} - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", "date": None} -''' - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %s" % r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%s*" % tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%s'" - % describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" - % (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def do_vcs_install(manifest_in, versionfile_source, ipy): - """Git-specific installation logic for Versioneer. - - For Git, this means creating/changing .gitattributes to mark _version.py - for export-subst keyword substitution. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - files = [manifest_in, versionfile_source] - if ipy: - files.append(ipy) - try: - me = __file__ - if me.endswith(".pyc") or me.endswith(".pyo"): - me = os.path.splitext(me)[0] + ".py" - versioneer_file = os.path.relpath(me) - except NameError: - versioneer_file = "versioneer.py" - files.append(versioneer_file) - present = False - try: - f = open(".gitattributes", "r") - for line in f.readlines(): - if line.strip().startswith(versionfile_source): - if "export-subst" in line.strip().split()[1:]: - present = True - f.close() - except EnvironmentError: - pass - if not present: - f = open(".gitattributes", "a+") - f.write("%s export-subst\n" % versionfile_source) - f.close() - files.append(".gitattributes") - run_command(GITS, ["add", "--"] + files) - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %s but none started with prefix %s" % - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -SHORT_VERSION_PY = """ -# This file was generated by 'versioneer.py' (0.18) from -# revision-control system data, or from the parent directory name of an -# unpacked source archive. Distribution tarballs contain a pre-generated copy -# of this file. - -import json - -version_json = ''' -%s -''' # END VERSION_JSON - - -def get_versions(): - return json.loads(version_json) -""" - - -def versions_from_file(filename): - """Try to determine the version from _version.py if present.""" - try: - with open(filename) as f: - contents = f.read() - except EnvironmentError: - raise NotThisMethod("unable to read _version.py") - mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", - contents, re.M | re.S) - if not mo: - mo = re.search(r"version_json = '''\r\n(.*)''' # END VERSION_JSON", - contents, re.M | re.S) - if not mo: - raise NotThisMethod("no version_json in _version.py") - return json.loads(mo.group(1)) - - -def write_to_version_file(filename, versions): - """Write the given version number to the given _version.py file.""" - os.unlink(filename) - contents = json.dumps(versions, sort_keys=True, - indent=1, separators=(",", ": ")) - with open(filename, "w") as f: - f.write(SHORT_VERSION_PY % contents) - - print("set %s to '%s'" % (filename, versions["version"])) - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -class VersioneerBadRootError(Exception): - """The project root directory is unknown or missing key files.""" - - -def get_versions(verbose=False): - """Get the project version from whatever source is available. - - Returns dict with two keys: 'version' and 'full'. - """ - if "versioneer" in sys.modules: - # see the discussion in cmdclass.py:get_cmdclass() - del sys.modules["versioneer"] - - root = get_root() - cfg = get_config_from_root(root) - - assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" - handlers = HANDLERS.get(cfg.VCS) - assert handlers, "unrecognized VCS '%s'" % cfg.VCS - verbose = verbose or cfg.verbose - assert cfg.versionfile_source is not None, \ - "please set versioneer.versionfile_source" - assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" - - versionfile_abs = os.path.join(root, cfg.versionfile_source) - - # extract version from first of: _version.py, VCS command (e.g. 'git - # describe'), parentdir. This is meant to work for developers using a - # source checkout, for users of a tarball created by 'setup.py sdist', - # and for users of a tarball/zipball created by 'git archive' or github's - # download-from-tag feature or the equivalent in other VCSes. - - get_keywords_f = handlers.get("get_keywords") - from_keywords_f = handlers.get("keywords") - if get_keywords_f and from_keywords_f: - try: - keywords = get_keywords_f(versionfile_abs) - ver = from_keywords_f(keywords, cfg.tag_prefix, verbose) - if verbose: - print("got version from expanded keyword %s" % ver) - return ver - except NotThisMethod: - pass - - try: - ver = versions_from_file(versionfile_abs) - if verbose: - print("got version from file %s %s" % (versionfile_abs, ver)) - return ver - except NotThisMethod: - pass - - from_vcs_f = handlers.get("pieces_from_vcs") - if from_vcs_f: - try: - pieces = from_vcs_f(cfg.tag_prefix, root, verbose) - ver = render(pieces, cfg.style) - if verbose: - print("got version from VCS %s" % ver) - return ver - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - ver = versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - if verbose: - print("got version from parentdir %s" % ver) - return ver - except NotThisMethod: - pass - - if verbose: - print("unable to compute version") - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, "error": "unable to compute version", - "date": None} - - -def get_version(): - """Get the short version string for this project.""" - return get_versions()["version"] - - -def get_cmdclass(): - """Get the custom setuptools/distutils subclasses used by Versioneer.""" - if "versioneer" in sys.modules: - del sys.modules["versioneer"] - # this fixes the "python setup.py develop" case (also 'install' and - # 'easy_install .'), in which subdependencies of the main project are - # built (using setup.py bdist_egg) in the same python process. Assume - # a main project A and a dependency B, which use different versions - # of Versioneer. A's setup.py imports A's Versioneer, leaving it in - # sys.modules by the time B's setup.py is executed, causing B to run - # with the wrong versioneer. Setuptools wraps the sub-dep builds in a - # sandbox that restores sys.modules to it's pre-build state, so the - # parent is protected against the child's "import versioneer". By - # removing ourselves from sys.modules here, before the child build - # happens, we protect the child from the parent's versioneer too. - # Also see https://github.com/warner/python-versioneer/issues/52 - - cmds = {} - - # we add "version" to both distutils and setuptools - from distutils.core import Command - - class cmd_version(Command): - description = "report generated version string" - user_options = [] - boolean_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - vers = get_versions(verbose=True) - print("Version: %s" % vers["version"]) - print(" full-revisionid: %s" % vers.get("full-revisionid")) - print(" dirty: %s" % vers.get("dirty")) - print(" date: %s" % vers.get("date")) - if vers["error"]: - print(" error: %s" % vers["error"]) - cmds["version"] = cmd_version - - # we override "build_py" in both distutils and setuptools - # - # most invocation pathways end up running build_py: - # distutils/build -> build_py - # distutils/install -> distutils/build ->.. - # setuptools/bdist_wheel -> distutils/install ->.. - # setuptools/bdist_egg -> distutils/install_lib -> build_py - # setuptools/install -> bdist_egg ->.. - # setuptools/develop -> ? - # pip install: - # copies source tree to a tempdir before running egg_info/etc - # if .git isn't copied too, 'git describe' will fail - # then does setup.py bdist_wheel, or sometimes setup.py install - # setup.py egg_info -> ? - - # we override different "build_py" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.build_py import build_py as _build_py - else: - from distutils.command.build_py import build_py as _build_py - - class cmd_build_py(_build_py): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - _build_py.run(self) - # now locate _version.py in the new build/ directory and replace - # it with an updated value - if cfg.versionfile_build: - target_versionfile = os.path.join(self.build_lib, - cfg.versionfile_build) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - cmds["build_py"] = cmd_build_py - - if "cx_Freeze" in sys.modules: # cx_freeze enabled? - from cx_Freeze.dist import build_exe as _build_exe - # nczeczulin reports that py2exe won't like the pep440-style string - # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. - # setup(console=[{ - # "version": versioneer.get_version().split("+", 1)[0], # FILEVERSION - # "product_version": versioneer.get_version(), - # ... - - class cmd_build_exe(_build_exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _build_exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % - {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - cmds["build_exe"] = cmd_build_exe - del cmds["build_py"] - - if 'py2exe' in sys.modules: # py2exe enabled? - try: - from py2exe.distutils_buildexe import py2exe as _py2exe # py3 - except ImportError: - from py2exe.build_exe import py2exe as _py2exe # py2 - - class cmd_py2exe(_py2exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _py2exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % - {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - cmds["py2exe"] = cmd_py2exe - - # we override different "sdist" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.sdist import sdist as _sdist - else: - from distutils.command.sdist import sdist as _sdist - - class cmd_sdist(_sdist): - def run(self): - versions = get_versions() - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old - # version - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - - def make_release_tree(self, base_dir, files): - root = get_root() - cfg = get_config_from_root(root) - _sdist.make_release_tree(self, base_dir, files) - # now locate _version.py in the new base_dir directory - # (remembering that it may be a hardlink) and replace it with an - # updated value - target_versionfile = os.path.join(base_dir, cfg.versionfile_source) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, - self._versioneer_generated_versions) - cmds["sdist"] = cmd_sdist - - return cmds - - -CONFIG_ERROR = """ -setup.cfg is missing the necessary Versioneer configuration. You need -a section like: - - [versioneer] - VCS = git - style = pep440 - versionfile_source = src/myproject/_version.py - versionfile_build = myproject/_version.py - tag_prefix = - parentdir_prefix = myproject- - -You will also need to edit your setup.py to use the results: - - import versioneer - setup(version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), ...) - -Please read the docstring in ./versioneer.py for configuration instructions, -edit setup.cfg, and re-run the installer or 'python versioneer.py setup'. -""" - -SAMPLE_CONFIG = """ -# See the docstring in versioneer.py for instructions. Note that you must -# re-run 'versioneer.py setup' after changing this section, and commit the -# resulting files. - -[versioneer] -#VCS = git -#style = pep440 -#versionfile_source = -#versionfile_build = -#tag_prefix = -#parentdir_prefix = - -""" - -INIT_PY_SNIPPET = """ -from ._version import get_versions -__version__ = get_versions()['version'] -del get_versions -""" - - -def do_setup(): - """Main VCS-independent setup function for installing Versioneer.""" - root = get_root() - try: - cfg = get_config_from_root(root) - except (EnvironmentError, configparser.NoSectionError, - configparser.NoOptionError) as e: - if isinstance(e, (EnvironmentError, configparser.NoSectionError)): - print("Adding sample versioneer config to setup.cfg", - file=sys.stderr) - with open(os.path.join(root, "setup.cfg"), "a") as f: - f.write(SAMPLE_CONFIG) - print(CONFIG_ERROR, file=sys.stderr) - return 1 - - print(" creating %s" % cfg.versionfile_source) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - - ipy = os.path.join(os.path.dirname(cfg.versionfile_source), - "__init__.py") - if os.path.exists(ipy): - try: - with open(ipy, "r") as f: - old = f.read() - except EnvironmentError: - old = "" - if INIT_PY_SNIPPET not in old: - print(" appending to %s" % ipy) - with open(ipy, "a") as f: - f.write(INIT_PY_SNIPPET) - else: - print(" %s unmodified" % ipy) - else: - print(" %s doesn't exist, ok" % ipy) - ipy = None - - # Make sure both the top-level "versioneer.py" and versionfile_source - # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so - # they'll be copied into source distributions. Pip won't be able to - # install the package without this. - manifest_in = os.path.join(root, "MANIFEST.in") - simple_includes = set() - try: - with open(manifest_in, "r") as f: - for line in f: - if line.startswith("include "): - for include in line.split()[1:]: - simple_includes.add(include) - except EnvironmentError: - pass - # That doesn't cover everything MANIFEST.in can do - # (http://docs.python.org/2/distutils/sourcedist.html#commands), so - # it might give some false negatives. Appending redundant 'include' - # lines is safe, though. - if "versioneer.py" not in simple_includes: - print(" appending 'versioneer.py' to MANIFEST.in") - with open(manifest_in, "a") as f: - f.write("include versioneer.py\n") - else: - print(" 'versioneer.py' already in MANIFEST.in") - if cfg.versionfile_source not in simple_includes: - print(" appending versionfile_source ('%s') to MANIFEST.in" % - cfg.versionfile_source) - with open(manifest_in, "a") as f: - f.write("include %s\n" % cfg.versionfile_source) - else: - print(" versionfile_source already in MANIFEST.in") - - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-subst keyword - # substitution. - do_vcs_install(manifest_in, cfg.versionfile_source, ipy) - return 0 - - -def scan_setup_py(): - """Validate the contents of setup.py against Versioneer's expectations.""" - found = set() - setters = False - errors = 0 - with open("setup.py", "r") as f: - for line in f.readlines(): - if "import versioneer" in line: - found.add("import") - if "versioneer.get_cmdclass()" in line: - found.add("cmdclass") - if "versioneer.get_version()" in line: - found.add("get_version") - if "versioneer.VCS" in line: - setters = True - if "versioneer.versionfile_source" in line: - setters = True - if len(found) != 3: - print("") - print("Your setup.py appears to be missing some important items") - print("(but I might be wrong). Please make sure it has something") - print("roughly like the following:") - print("") - print(" import versioneer") - print(" setup( version=versioneer.get_version(),") - print(" cmdclass=versioneer.get_cmdclass(), ...)") - print("") - errors += 1 - if setters: - print("You should remove lines like 'versioneer.VCS = ' and") - print("'versioneer.versionfile_source = ' . This configuration") - print("now lives in setup.cfg, and should be removed from setup.py") - print("") - errors += 1 - return errors - - -if __name__ == "__main__": - cmd = sys.argv[1] - if cmd == "setup": - errors = do_setup() - errors += scan_setup_py() - if errors: - sys.exit(1) diff --git a/vscode-client/.gitignore b/vscode-client/.gitignore deleted file mode 100644 index 3dc9acd2..00000000 --- a/vscode-client/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -out -server -node_modules -.vscode-dev \ No newline at end of file diff --git a/vscode-client/.vscodeignore b/vscode-client/.vscodeignore deleted file mode 100644 index 93e28ff2..00000000 --- a/vscode-client/.vscodeignore +++ /dev/null @@ -1,9 +0,0 @@ -.vscode/** -typings/** -out/test/** -test/** -src/** -**/*.map -.gitignore -tsconfig.json -vsc-extension-quickstart.md diff --git a/vscode-client/License.txt b/vscode-client/License.txt deleted file mode 100644 index 8e1db292..00000000 --- a/vscode-client/License.txt +++ /dev/null @@ -1,11 +0,0 @@ -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vscode-client/README.md b/vscode-client/README.md deleted file mode 100644 index f9f3bf4e..00000000 --- a/vscode-client/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# vscode-client - -The vscode-client extension for Visual Studio Code helps you develop -and debug language servers. It lets you run multiple language servers -at once with minimal extra configuration per language. - -## Using this extension - - -1. Follow the [Develop against VS Code instructions](/../../#develop-against-vs-code) -1. Open a `.py` file and hover over text to start using the Python language server. - -To view a language server's stderr output in VSCode, select View → Output. -To debug further, see the "Hacking on this extension" section below. - -After updating the binary for a language server (during development or after an upgrade), just kill the process (e.g., `killall pyls`). -VSCode will automatically restart and reconnect to the language server process. - -> **Note for those who use VSCode as their primary editor:** Because this extension's functionality conflicts with other VSCode extensions -(e.g., showing Python hover information), the `yarn run vscode` script launches a separate instance of VSCode and stores its config in `../.vscode-dev`. -It will still show your existing extensions in the panel (which seems to be a VSCode bug), but they won't be activated. - -## Adding a language server - -Register your language server at the bottom of [`extension.ts`](src/extension.ts). - -## Hacking on this extension - -1. Run `yarn install` in this directory (`vscode-client`). -1. Open this directory by itself in Visual Studio Code. -1. Hit F5 to open a new VSCode instance in a debugger running this extension. (This is equivalent to going to the Debug pane on the left and running the "Launch Extension" task.) - -See the [Node.js example language server tutorial](https://code.visualstudio.com/docs/extensions/example-language-server) under "To test the language server" for more information. diff --git a/vscode-client/ThirdPartyNotices.txt b/vscode-client/ThirdPartyNotices.txt deleted file mode 100644 index 80a9d602..00000000 --- a/vscode-client/ThirdPartyNotices.txt +++ /dev/null @@ -1,31 +0,0 @@ -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -For Microsoft vscode-languageserver-node-example - -This project incorporates material from the project(s) listed below (collectively, “Third Party Code”). -Microsoft is not the original author of the Third Party Code. The original copyright notice and license -under which Microsoft received such Third Party Code are set out below. This Third Party Code is licensed -to you under their original license terms set forth below. Microsoft reserves all other rights not expressly -granted, whether by implication, estoppel or otherwise. - -1. DefinitelyTyped version 0.0.1 (https://github.com/borisyankov/DefinitelyTyped) - -This project is licensed under the MIT license. -Copyrights are respective of each contributor listed at the beginning of each definition file. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/vscode-client/package.json b/vscode-client/package.json deleted file mode 100644 index f28437ca..00000000 --- a/vscode-client/package.json +++ /dev/null @@ -1,316 +0,0 @@ -{ - "name": "pyls", - "description": "Python language server", - "author": "Sourcegraph", - "repository": "https://github.com/Microsoft/vscode-languageserver-node", - "license": "MIT", - "version": "0.0.1", - "publisher": "sqs", - "engines": { - "vscode": "^1.15.0" - }, - "categories": [ - "Other" - ], - "activationEvents": [ - "*" - ], - "contributes": { - "configuration": { - "title": "Python Language Server Configuration", - "type": "object", - "properties": { - "pyls.executable": { - "type": "string", - "default": "pyls", - "description": "Language server executable" - }, - "pyls.configurationSources": { - "type": "array", - "default": ["pycodestyle"], - "description": "List of configuration sources to use.", - "items": { - "type": "string", - "enum": ["pycodestyle", "pyflakes"] - }, - "uniqueItems": true - }, - "pyls.plugins.jedi.extra_paths": { - "type": "array", - "default": [], - "description": "Define extra paths for jedi.Script." - }, - "pyls.plugins.jedi.env_vars": { - "type": "dictionary", - "default": null, - "description": "Define environment variables for jedi.Script and Jedi.names." - }, - "pyls.plugins.jedi.environment": { - "type": "string", - "default": null, - "description": "Define environment for jedi.Script and Jedi.names." - }, - "pyls.plugins.jedi_completion.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.jedi_completion.include_params": { - "type": "boolean", - "default": true, - "description": "Auto-completes methods and classes with tabstops for each parameter." - }, - "pyls.plugins.jedi_completion.include_class_objects": { - "type": "boolean", - "default": true, - "description": "Adds class objects as a separate completion item." - }, - "pyls.plugins.jedi_completion.fuzzy": { - "type": "boolean", - "default": false, - "description": "Enable fuzzy when requesting autocomplete." - }, - "pyls.plugins.jedi_definition.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.jedi_definition.follow_imports": { - "type": "boolean", - "default": true, - "description": "The goto call will follow imports." - }, - "pyls.plugins.jedi_definition.follow_builtin_imports": { - "type": "boolean", - "default": true, - "description": "If follow_imports is True will decide if it follow builtin imports." - }, - "pyls.plugins.jedi_hover.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.jedi_references.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.jedi_signature_help.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.jedi_symbols.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.jedi_symbols.all_scopes": { - "type": "boolean", - "default": true, - "description": "If True lists the names of all scopes instead of only the module namespace." - }, - "pyls.plugins.mccabe.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.mccabe.threshold": { - "type": "number", - "default": 15, - "description": "The minimum threshold that triggers warnings about cyclomatic complexity." - }, - "pyls.plugins.preload.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.preload.modules": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": true, - "description": "List of modules to import on startup" - }, - "pyls.plugins.pycodestyle.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.pycodestyle.exclude": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": true, - "description": "Exclude files or directories which match these patterns." - }, - "pyls.plugins.pycodestyle.filename": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": true, - "description": "When parsing directories, only check filenames matching these patterns." - }, - "pyls.plugins.pycodestyle.select": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": true, - "description": "Select errors and warnings" - }, - "pyls.plugins.pycodestyle.ignore": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": true, - "description": "Ignore errors and warnings" - }, - "pyls.plugins.pycodestyle.hangClosing": { - "type": "boolean", - "default": null, - "description": "Hang closing bracket instead of matching indentation of opening bracket's line." - }, - "pyls.plugins.pycodestyle.maxLineLength": { - "type": "number", - "default": null, - "description": "Set maximum allowed line length." - }, - "pyls.plugins.pydocstyle.enabled": { - "type": "boolean", - "default": false, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.pydocstyle.convention": { - "type": "string", - "default": null, - "enum": [ - "pep257", - "numpy" - ], - "description": "Choose the basic list of checked errors by specifying an existing convention." - }, - "pyls.plugins.pydocstyle.addIgnore": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": true, - "description": "Ignore errors and warnings in addition to the specified convention." - }, - "pyls.plugins.pydocstyle.addSelect": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": true, - "description": "Select errors and warnings in addition to the specified convention." - }, - "pyls.plugins.pydocstyle.ignore": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": true, - "description": "Ignore errors and warnings" - }, - "pyls.plugins.pydocstyle.select": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": true, - "description": "Select errors and warnings" - }, - "pyls.plugins.pydocstyle.match": { - "type": "string", - "default": "(?!test_).*\\.py", - "description": "Check only files that exactly match the given regular expression; default is to match files that don't start with 'test_' but end with '.py'." - }, - "pyls.plugins.pydocstyle.matchDir": { - "type": "string", - "default": "[^\\.].*", - "description": "Search only dirs that exactly match the given regular expression; default is to match dirs which do not begin with a dot." - }, - "pyls.plugins.pyflakes.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.pylint.enabled": { - "type": "boolean", - "default": false, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.pylint.args": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": false, - "description": "Arguments to pass to pylint." - }, - "pyls.plugins.pylint.executable": { - "type": "string", - "default": null, - "description": "Executable to run pylint with. Enabling this will run pylint on unsaved files via stdin. Can slow down workflow. Only works with python3." - }, - "pyls.plugins.rope_completion.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.plugins.yapf.enabled": { - "type": "boolean", - "default": true, - "description": "Enable or disable the plugin." - }, - "pyls.rope.extensionModules": { - "type": "string", - "default": null, - "description": "Builtin and c-extension modules that are allowed to be imported and inspected by rope." - }, - "pyls.rope.ropeFolder": { - "type": "array", - "default": null, - "items": { - "type": "string" - }, - "uniqueItems": true, - "description": "The name of the folder in which rope stores project configurations and data. Pass `null` for not using such a folder at all." - } - } - } - }, - "main": "./out/extension", - "scripts": { - "vscode:prepublish": "tsc -p ./", - "compile": "tsc -watch -p ./", - "postinstall": "node ./node_modules/vscode/bin/install", - "vscode": "npm run vscode:prepublish && VSCODE=$(which code-insiders || which code || echo echo ERROR: neither the code nor code-insiders vscode executable is installed); USER=dummy-dont-share-vscode-instance $VSCODE --user-data-dir=$PWD/.vscode-dev/user-data --extensionHomePath=$PWD/.vscode-dev/extensions --extensionDevelopmentPath=$PWD $*" - }, - "devDependencies": { - "typescript": "^2.3.4", - "vscode": "^1.1.4", - "mocha": "^2.3.3", - "@types/node": "^6.0.40", - "@types/mocha": "^2.2.32" - }, - "dependencies": { - "vscode-languageclient": "^3.4.5" - } -} diff --git a/vscode-client/src/extension.ts b/vscode-client/src/extension.ts deleted file mode 100644 index 5816f9df..00000000 --- a/vscode-client/src/extension.ts +++ /dev/null @@ -1,51 +0,0 @@ -/* -------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - * ------------------------------------------------------------------------------------------ */ -'use strict'; - -import * as net from 'net'; - -import { workspace, Disposable, ExtensionContext } from 'vscode'; -import { LanguageClient, LanguageClientOptions, SettingMonitor, ServerOptions, ErrorAction, ErrorHandler, CloseAction, TransportKind } from 'vscode-languageclient'; - -function startLangServer(command: string, args: string[], documentSelector: string[]): Disposable { - const serverOptions: ServerOptions = { - command, - args, - }; - const clientOptions: LanguageClientOptions = { - documentSelector: documentSelector, - synchronize: { - configurationSection: "pyls" - } - } - return new LanguageClient(command, serverOptions, clientOptions).start(); -} - -function startLangServerTCP(addr: number, documentSelector: string[]): Disposable { - const serverOptions: ServerOptions = function() { - return new Promise((resolve, reject) => { - var client = new net.Socket(); - client.connect(addr, "127.0.0.1", function() { - resolve({ - reader: client, - writer: client - }); - }); - }); - } - - const clientOptions: LanguageClientOptions = { - documentSelector: documentSelector, - } - return new LanguageClient(`tcp lang server (port ${addr})`, serverOptions, clientOptions).start(); -} - -export function activate(context: ExtensionContext) { - const executable = workspace.getConfiguration("pyls").get("executable"); - context.subscriptions.push(startLangServer(executable, ["-vv"], ["python"])); - // For TCP server needs to be started seperately - // context.subscriptions.push(startLangServerTCP(2087, ["python"])); -} - diff --git a/vscode-client/tsconfig.json b/vscode-client/tsconfig.json deleted file mode 100644 index a9142181..00000000 --- a/vscode-client/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "target": "es6", - "outDir": "out", - "lib": [ "es6" ], - "sourceMap": true - }, - "exclude": [ - "node_modules", - "server" - ] -} diff --git a/vscode-client/yarn.lock b/vscode-client/yarn.lock deleted file mode 100644 index 0c20f28e..00000000 --- a/vscode-client/yarn.lock +++ /dev/null @@ -1,1867 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@types/mocha@^2.2.32": - version "2.2.46" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.46.tgz#b04713f7759d1cf752effdaae7b3969e285ebc16" - -"@types/node@^6.0.40": - version "6.0.96" - resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.96.tgz#7bf0bf40d6ce51e93762cc47d010c8cc5ebb2179" - -ajv@^5.1.0: - version "5.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - -ansi-cyan@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873" - dependencies: - ansi-wrap "0.1.0" - -ansi-gray@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" - dependencies: - ansi-wrap "0.1.0" - -ansi-red@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c" - dependencies: - ansi-wrap "0.1.0" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -ansi-wrap@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" - -arr-diff@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a" - dependencies: - arr-flatten "^1.0.1" - array-slice "^0.2.3" - -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - dependencies: - arr-flatten "^1.0.1" - -arr-flatten@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -arr-union@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d" - -array-differ@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" - -array-slice@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" - -array-union@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - dependencies: - array-uniq "^1.0.1" - -array-uniq@^1.0.1, array-uniq@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - -arrify@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - -assert-plus@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - -aws-sign2@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - -aws4@^1.2.1, aws4@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - dependencies: - tweetnacl "^0.14.3" - -beeper@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - dependencies: - inherits "~2.0.0" - -boom@2.x.x: - version "2.10.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" - dependencies: - hoek "2.x.x" - -boom@4.x.x: - version "4.3.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" - dependencies: - hoek "4.x.x" - -boom@5.x.x: - version "5.2.0" - resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" - dependencies: - hoek "4.x.x" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -browser-stdout@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - -caseless@~0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - -chalk@^1.0.0, chalk@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -clone-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - -clone-stats@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" - -clone-stats@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - -clone@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" - -clone@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f" - -clone@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" - -cloneable-readable@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117" - dependencies: - inherits "^2.0.1" - process-nextick-args "^1.0.6" - through2 "^2.0.1" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - -color-support@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" - -combined-stream@^1.0.5, combined-stream@~1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" - dependencies: - delayed-stream "~1.0.0" - -commander@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06" - -commander@2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" - -commander@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873" - -commander@^2.9.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -convert-source-map@^1.1.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -cryptiles@2.x.x: - version "2.0.5" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" - dependencies: - boom "2.x.x" - -cryptiles@3.x.x: - version "3.1.2" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" - dependencies: - boom "5.x.x" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - dependencies: - assert-plus "^1.0.0" - -dateformat@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" - -debug@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" - dependencies: - ms "0.7.1" - -debug@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - dependencies: - ms "2.0.0" - -deep-assign@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-1.0.0.tgz#b092743be8427dc621ea0067cdec7e70dd19f37b" - dependencies: - is-obj "^1.0.0" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - -diff@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf" - -diff@3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75" - -duplexer2@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - dependencies: - readable-stream "~1.1.9" - -duplexer@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" - -duplexify@^3.2.0: - version "3.5.3" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e" - dependencies: - end-of-stream "^1.0.0" - inherits "^2.0.1" - readable-stream "^2.0.0" - stream-shift "^1.0.0" - -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - -end-of-stream@^1.0.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - dependencies: - once "^1.4.0" - -escape-string-regexp@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1" - -escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -event-stream@^3.3.1, event-stream@~3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" - dependencies: - duplexer "~0.1.1" - from "~0" - map-stream "~0.1.0" - pause-stream "0.0.11" - split "0.3" - stream-combiner "~0.0.4" - through "~2.3.1" - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - dependencies: - is-posix-bracket "^0.1.0" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - dependencies: - fill-range "^2.1.0" - -extend-shallow@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071" - dependencies: - kind-of "^1.1.0" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - dependencies: - is-extendable "^0.1.0" - -extend@^3.0.0, extend@~3.0.0, extend@~3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - dependencies: - is-extglob "^1.0.0" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -fancy-log@^1.1.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1" - dependencies: - ansi-gray "^0.1.1" - color-support "^1.1.3" - time-stamp "^1.0.0" - -fast-deep-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" - -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" - dependencies: - pend "~1.2.0" - -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - -fill-range@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^1.1.3" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -first-chunk-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" - -for-in@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - dependencies: - for-in "^1.0.1" - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - -form-data@~2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - -form-data@~2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - -from@~0: - version "0.1.7" - resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fstream@^1.0.2: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - -generate-function@^2.0.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f" - dependencies: - is-property "^1.0.2" - -generate-object-property@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0" - dependencies: - is-property "^1.0.0" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - dependencies: - assert-plus "^1.0.0" - -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - dependencies: - is-glob "^2.0.0" - -glob-parent@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob-stream@^5.3.2: - version "5.3.5" - resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22" - dependencies: - extend "^3.0.0" - glob "^5.0.3" - glob-parent "^3.0.0" - micromatch "^2.3.7" - ordered-read-streams "^0.3.0" - through2 "^0.6.0" - to-absolute-glob "^0.1.1" - unique-stream "^2.0.2" - -glob@3.2.11: - version "3.2.11" - resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d" - dependencies: - inherits "2" - minimatch "0.3" - -glob@7.1.2, glob@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^5.0.3: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.3: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glogg@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5" - dependencies: - sparkles "^1.0.0" - -graceful-fs@^4.0.0, graceful-fs@^4.1.2: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - -growl@1.10.3: - version "1.10.3" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f" - -growl@1.9.2: - version "1.9.2" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f" - -gulp-chmod@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/gulp-chmod/-/gulp-chmod-2.0.0.tgz#00c390b928a0799b251accf631aa09e01cc6299c" - dependencies: - deep-assign "^1.0.0" - stat-mode "^0.2.0" - through2 "^2.0.0" - -gulp-filter@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-5.1.0.tgz#a05e11affb07cf7dcf41a7de1cb7b63ac3783e73" - dependencies: - multimatch "^2.0.0" - plugin-error "^0.1.2" - streamfilter "^1.0.5" - -gulp-gunzip@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gulp-gunzip/-/gulp-gunzip-1.0.0.tgz#15b741145e83a9c6f50886241b57cc5871f151a9" - dependencies: - through2 "~0.6.5" - vinyl "~0.4.6" - -gulp-remote-src@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/gulp-remote-src/-/gulp-remote-src-0.4.3.tgz#5728cfd643433dd4845ddef0969f0f971a2ab4a1" - dependencies: - event-stream "~3.3.4" - node.extend "~1.1.2" - request "~2.79.0" - through2 "~2.0.3" - vinyl "~2.0.1" - -gulp-sourcemaps@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c" - dependencies: - convert-source-map "^1.1.1" - graceful-fs "^4.1.2" - strip-bom "^2.0.0" - through2 "^2.0.0" - vinyl "^1.0.0" - -gulp-symdest@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/gulp-symdest/-/gulp-symdest-1.1.0.tgz#c165320732d192ce56fd94271ffa123234bf2ae0" - dependencies: - event-stream "^3.3.1" - mkdirp "^0.5.1" - queue "^3.1.0" - vinyl-fs "^2.4.3" - -gulp-untar@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/gulp-untar/-/gulp-untar-0.0.6.tgz#d6bdefde7e9a8e054c9f162385a0782c4be74000" - dependencies: - event-stream "~3.3.4" - gulp-util "~3.0.8" - streamifier "~0.1.1" - tar "^2.2.1" - through2 "~2.0.3" - -gulp-util@~3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" - dependencies: - array-differ "^1.0.0" - array-uniq "^1.0.2" - beeper "^1.0.0" - chalk "^1.0.0" - dateformat "^2.0.0" - fancy-log "^1.1.0" - gulplog "^1.0.0" - has-gulplog "^0.1.0" - lodash._reescape "^3.0.0" - lodash._reevaluate "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.template "^3.0.0" - minimist "^1.1.0" - multipipe "^0.1.2" - object-assign "^3.0.0" - replace-ext "0.0.1" - through2 "^2.0.0" - vinyl "^0.5.0" - -gulp-vinyl-zip@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.0.tgz#24e40685dc05b7149995245099e0590263be8dad" - dependencies: - event-stream "^3.3.1" - queue "^4.2.1" - through2 "^2.0.3" - vinyl "^2.0.2" - vinyl-fs "^2.0.0" - yauzl "^2.2.1" - yazl "^2.2.1" - -gulplog@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" - dependencies: - glogg "^1.0.0" - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - -har-validator@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" - dependencies: - chalk "^1.1.1" - commander "^2.9.0" - is-my-json-valid "^2.12.4" - pinkie-promise "^2.0.0" - -har-validator@~5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" - dependencies: - ajv "^5.1.0" - har-schema "^2.0.0" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - -has-gulplog@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce" - dependencies: - sparkles "^1.0.0" - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - dependencies: - function-bind "^1.1.1" - -hawk@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" - dependencies: - boom "2.x.x" - cryptiles "2.x.x" - hoek "2.x.x" - sntp "1.x.x" - -hawk@~6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" - dependencies: - boom "4.x.x" - cryptiles "3.x.x" - hoek "4.x.x" - sntp "2.x.x" - -he@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" - -hoek@2.x.x: - version "2.16.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" - -hoek@4.x.x: - version "4.2.0" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d" - -http-signature@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" - dependencies: - assert-plus "^0.2.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - -is-extglob@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - dependencies: - is-extglob "^1.0.0" - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - dependencies: - is-extglob "^2.1.0" - -is-my-ip-valid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824" - -is-my-json-valid@^2.12.4: - version "2.20.0" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz#1345a6fca3e8daefc10d0fa77067f54cedafd59a" - dependencies: - generate-function "^2.0.0" - generate-object-property "^1.1.0" - is-my-ip-valid "^1.0.0" - jsonpointer "^4.0.0" - xtend "^4.0.0" - -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - dependencies: - kind-of "^3.0.2" - -is-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - -is-property@^1.0.0, is-property@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" - -is-stream@^1.0.1, is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - -is-utf8@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - -is-valid-glob@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe" - -is@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/is/-/is-3.3.0.tgz#61cff6dd3c4193db94a3d62582072b44e5645d79" - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -jade@0.26.3: - version "0.26.3" - resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c" - dependencies: - commander "0.6.1" - mkdirp "0.3.0" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - -json-stable-stringify@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - dependencies: - jsonify "~0.0.0" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - -jsonpointer@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -kind-of@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44" - -kind-of@^3.0.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - dependencies: - is-buffer "^1.1.5" - -lazystream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" - dependencies: - readable-stream "^2.0.5" - -lodash._basecopy@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" - -lodash._basetostring@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" - -lodash._basevalues@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" - -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - -lodash._isiterateecall@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" - -lodash._reescape@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" - -lodash._reevaluate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" - -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - -lodash._root@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" - -lodash.escape@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" - dependencies: - lodash._root "^3.0.0" - -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - -lodash.isequal@^4.0.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - -lodash.restparam@^3.0.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - -lodash.template@^3.0.0: - version "3.6.2" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" - dependencies: - lodash._basecopy "^3.0.0" - lodash._basetostring "^3.0.0" - lodash._basevalues "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - lodash.keys "^3.0.0" - lodash.restparam "^3.0.0" - lodash.templatesettings "^3.0.0" - -lodash.templatesettings@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5" - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - -lru-cache@2: - version "2.7.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" - -map-stream@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" - -merge-stream@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" - dependencies: - readable-stream "^2.0.1" - -micromatch@^2.3.7: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -mime-db@~1.30.0: - version "1.30.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01" - -mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7: - version "2.1.17" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a" - dependencies: - mime-db "~1.30.0" - -minimatch@0.3: - version "0.3.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd" - dependencies: - lru-cache "2" - sigmund "~1.0.0" - -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - -mkdirp@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e" - -mkdirp@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - dependencies: - minimist "^1.2.5" - -mocha@^2.3.3: - version "2.5.3" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58" - dependencies: - commander "2.3.0" - debug "2.2.0" - diff "1.4.0" - escape-string-regexp "1.0.2" - glob "3.2.11" - growl "1.9.2" - jade "0.26.3" - mkdirp "0.5.1" - supports-color "1.2.0" - to-iso-string "0.0.2" - -mocha@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794" - dependencies: - browser-stdout "1.3.0" - commander "2.11.0" - debug "3.1.0" - diff "3.3.1" - escape-string-regexp "1.0.5" - glob "7.1.2" - growl "1.10.3" - he "1.1.1" - mkdirp "0.5.1" - supports-color "4.4.0" - -ms@0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -multimatch@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b" - dependencies: - array-differ "^1.0.0" - array-union "^1.0.1" - arrify "^1.0.0" - minimatch "^3.0.0" - -multipipe@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" - dependencies: - duplexer2 "0.0.2" - -node.extend@~1.1.2: - version "1.1.8" - resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.8.tgz#0aab3e63789f4e6d68b42bc00073ad1881243cf0" - dependencies: - has "^1.0.3" - is "^3.2.1" - -normalize-path@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -oauth-sign@~0.8.1, oauth-sign@~0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" - -object-assign@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" - -object-assign@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -once@^1.3.0, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -ordered-read-streams@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b" - dependencies: - is-stream "^1.0.1" - readable-stream "^2.0.1" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -pause-stream@0.0.11: - version "0.0.11" - resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" - dependencies: - through "~2.3" - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - -plugin-error@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace" - dependencies: - ansi-cyan "^0.1.1" - ansi-red "^0.1.1" - arr-diff "^1.0.1" - arr-union "^2.0.1" - extend-shallow "^1.1.2" - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - -process-nextick-args@^1.0.6, process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - -qs@~6.3.0: - version "6.3.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" - -qs@~6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" - -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" - -queue@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/queue/-/queue-3.1.0.tgz#6c49d01f009e2256788789f2bffac6b8b9990585" - dependencies: - inherits "~2.0.0" - -queue@^4.2.1: - version "4.4.2" - resolved "https://registry.yarnpkg.com/queue/-/queue-4.4.2.tgz#5a9733d9a8b8bd1b36e934bc9c55ab89b28e29c7" - dependencies: - inherits "~2.0.0" - -randomatic@^1.1.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -"readable-stream@>=1.0.33-1 <1.1.0-0": - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.5: - version "2.3.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - dependencies: - is-equal-shallow "^0.1.3" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -replace-ext@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" - -replace-ext@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" - -request@^2.83.0: - version "2.83.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.6.0" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.1" - forever-agent "~0.6.1" - form-data "~2.3.1" - har-validator "~5.0.3" - hawk "~6.0.2" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.17" - oauth-sign "~0.8.2" - performance-now "^2.1.0" - qs "~6.5.1" - safe-buffer "^5.1.1" - stringstream "~0.0.5" - tough-cookie "~2.3.3" - tunnel-agent "^0.6.0" - uuid "^3.1.0" - -request@~2.79.0: - version "2.79.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.11.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~2.0.6" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - qs "~6.3.0" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "~0.4.1" - uuid "^3.0.0" - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - -rimraf@2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - dependencies: - glob "^7.1.3" - -safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - -safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - -semver@^5.4.1: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -sigmund@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" - -sntp@1.x.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" - dependencies: - hoek "2.x.x" - -sntp@2.x.x: - version "2.1.0" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" - dependencies: - hoek "4.x.x" - -source-map-support@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.2.tgz#1a6297fd5b2e762b39688c7fc91233b60984f0a5" - dependencies: - source-map "^0.6.0" - -source-map@^0.6.0: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - -sparkles@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3" - -split@0.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" - dependencies: - through "2" - -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - -stat-mode@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502" - -stream-combiner@~0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" - dependencies: - duplexer "~0.1.1" - -stream-shift@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" - -streamfilter@^1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-1.0.7.tgz#ae3e64522aa5a35c061fd17f67620c7653c643c9" - dependencies: - readable-stream "^2.0.2" - -streamifier@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - dependencies: - safe-buffer "~5.1.0" - -stringstream@~0.0.4, stringstream@~0.0.5: - version "0.0.6" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72" - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-bom-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee" - dependencies: - first-chunk-stream "^1.0.0" - strip-bom "^2.0.0" - -strip-bom@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - dependencies: - is-utf8 "^0.2.0" - -supports-color@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e" - -supports-color@4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e" - dependencies: - has-flag "^2.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -tar@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - -through2-filter@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec" - dependencies: - through2 "~2.0.0" - xtend "~4.0.0" - -through2@^0.6.0, through2@~0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - -through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0, through2@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" - dependencies: - readable-stream "^2.1.5" - xtend "~4.0.1" - -through@2, through@~2.3, through@~2.3.1: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - -time-stamp@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" - -to-absolute-glob@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f" - dependencies: - extend-shallow "^2.0.1" - -to-iso-string@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1" - -tough-cookie@~2.3.0, tough-cookie@~2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" - dependencies: - punycode "^1.4.1" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tunnel-agent@~0.4.1: - version "0.4.3" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -typescript@^2.3.4: - version "2.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" - -unique-stream@^2.0.2: - version "2.2.1" - resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369" - dependencies: - json-stable-stringify "^1.0.0" - through2-filter "^2.0.0" - -url-parse@^1.1.9: - version "1.4.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -uuid@^3.0.0, uuid@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" - -vali-date@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -vinyl-fs@^2.0.0, vinyl-fs@^2.4.3: - version "2.4.4" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239" - dependencies: - duplexify "^3.2.0" - glob-stream "^5.3.2" - graceful-fs "^4.0.0" - gulp-sourcemaps "1.6.0" - is-valid-glob "^0.3.0" - lazystream "^1.0.0" - lodash.isequal "^4.0.0" - merge-stream "^1.0.0" - mkdirp "^0.5.0" - object-assign "^4.0.0" - readable-stream "^2.0.4" - strip-bom "^2.0.0" - strip-bom-stream "^1.0.0" - through2 "^2.0.0" - through2-filter "^2.0.0" - vali-date "^1.0.0" - vinyl "^1.0.0" - -vinyl-source-stream@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-1.1.2.tgz#62b53a135610a896e98ca96bee3a87f008a8e780" - dependencies: - through2 "^2.0.3" - vinyl "^0.4.3" - -vinyl@^0.4.3, vinyl@~0.4.6: - version "0.4.6" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847" - dependencies: - clone "^0.2.0" - clone-stats "^0.0.1" - -vinyl@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde" - dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" - -vinyl@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" - dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" - -vinyl@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c" - dependencies: - clone "^2.1.1" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - -vinyl@~2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c" - dependencies: - clone "^1.0.0" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - is-stream "^1.1.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - -vscode-jsonrpc@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa" - -vscode-languageclient@^3.4.5: - version "3.5.0" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-3.5.0.tgz#36d02cc186a8365a4467719a290fb200a9ae490a" - dependencies: - vscode-languageserver-protocol "^3.5.0" - -vscode-languageserver-protocol@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz#067c5cbe27709795398d119692c97ebba1452209" - dependencies: - vscode-jsonrpc "^3.5.0" - vscode-languageserver-types "^3.5.0" - -vscode-languageserver-types@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374" - -vscode@^1.1.4: - version "1.1.10" - resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.10.tgz#d1cba378ab24f1d3ddf9cd470d242ee1472dd35b" - dependencies: - glob "^7.1.2" - gulp-chmod "^2.0.0" - gulp-filter "^5.0.1" - gulp-gunzip "1.0.0" - gulp-remote-src "^0.4.3" - gulp-symdest "^1.1.0" - gulp-untar "^0.0.6" - gulp-vinyl-zip "^2.1.0" - mocha "^4.0.1" - request "^2.83.0" - semver "^5.4.1" - source-map-support "^0.5.0" - url-parse "^1.1.9" - vinyl-source-stream "^1.1.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - -yauzl@^2.2.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f" - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.0.1" - -yazl@^2.2.1: - version "2.4.3" - resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071" - dependencies: - buffer-crc32 "~0.2.3"