Merge pull request python-poetry#3 from python-poetry/namespace

Use a namespaced package (poetry.core) instead of poetry-core
dimbleby · Mar 27, 2020 · 8044be8 · 8044be8
2 parents eb228f8 + 3ccd963
commit 8044be8
Show file tree

Hide file tree

Showing 263 changed files with 403 additions and 3,574 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,17 +3,17 @@ repos:
     rev: stable
     hooks:
       - id: black
-        exclude: ^poetry_core/_vendor
+        exclude: ^poetry/core/_vendor
 
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.7.8
     hooks:
       - id: flake8
         exclude: |
           (?x)(
-              ^poetry_core/utils/_typing.py$
-              | ^poetry_core/utils/_compat.py$
-              | ^poetry_core/_vendor
+              ^poetry/core/utils/_typing.py$
+              | ^poetry/core/utils/_compat.py$
+              | ^poetry/core/_vendor
           )
 
   - repo: https://github.com/pre-commit/mirrors-isort
@@ -24,7 +24,7 @@ repos:
         exclude: |
           (?x)(
               ^.*/?setup\.py$
-              | ^poetry_core/_vendor
+              | ^poetry/core/_vendor
           )
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -34,13 +34,13 @@ repos:
         exclude: |
           (?x)(
               ^tests/.*/fixtures/.*
-              | ^poetry_core/_vendor
+              | ^poetry/core/_vendor
           )
       - id: end-of-file-fixer
         exclude: |
           (?x)(
               ^tests/.*/fixtures/.*
-              | ^poetry_core/_vendor
+              | ^poetry/core/_vendor
           )
       - id: debug-statements
-        exclude: ^poetry_core/_vendor
+        exclude: ^poetry/core/_vendor
diff --git a/poetry/__init__.py b/poetry/__init__.py
@@ -0,0 +1,4 @@
+from pkgutil import extend_path
+
+
+__path__ = extend_path(__path__, __name__)
diff --git a/poetry_core/__init__.py → poetry/core/__init__.py b/poetry_core/__init__.py → poetry/core/__init__.py
diff --git a/poetry_core/_vendor/__init__.py → poetry/core/_vendor/__init__.py b/poetry_core/_vendor/__init__.py → poetry/core/_vendor/__init__.py
diff --git a/poetry/core/_vendor/_pyrsistent_version.py b/poetry/core/_vendor/_pyrsistent_version.py
@@ -0,0 +1 @@
+__version__ = '0.16.0'
diff --git a/poetry_core/_vendor/attr/__init__.py → poetry/core/_vendor/attr/__init__.py b/poetry_core/_vendor/attr/__init__.py → poetry/core/_vendor/attr/__init__.py
diff --git a/poetry_core/_vendor/attr/__init__.pyi → poetry/core/_vendor/attr/__init__.pyi b/poetry_core/_vendor/attr/__init__.pyi → poetry/core/_vendor/attr/__init__.pyi
diff --git a/poetry_core/_vendor/attr/_compat.py → poetry/core/_vendor/attr/_compat.py b/poetry_core/_vendor/attr/_compat.py → poetry/core/_vendor/attr/_compat.py
diff --git a/poetry_core/_vendor/attr/_config.py → poetry/core/_vendor/attr/_config.py b/poetry_core/_vendor/attr/_config.py → poetry/core/_vendor/attr/_config.py
diff --git a/poetry_core/_vendor/attr/_funcs.py → poetry/core/_vendor/attr/_funcs.py b/poetry_core/_vendor/attr/_funcs.py → poetry/core/_vendor/attr/_funcs.py
diff --git a/poetry_core/_vendor/attr/_make.py → poetry/core/_vendor/attr/_make.py b/poetry_core/_vendor/attr/_make.py → poetry/core/_vendor/attr/_make.py
diff --git a/poetry_core/_vendor/attr/_version_info.py → poetry/core/_vendor/attr/_version_info.py b/poetry_core/_vendor/attr/_version_info.py → poetry/core/_vendor/attr/_version_info.py
diff --git a/poetry_core/_vendor/attr/_version_info.pyi → poetry/core/_vendor/attr/_version_info.pyi b/poetry_core/_vendor/attr/_version_info.pyi → poetry/core/_vendor/attr/_version_info.pyi
diff --git a/poetry_core/_vendor/attr/converters.py → poetry/core/_vendor/attr/converters.py b/poetry_core/_vendor/attr/converters.py → poetry/core/_vendor/attr/converters.py
diff --git a/poetry_core/_vendor/attr/converters.pyi → poetry/core/_vendor/attr/converters.pyi b/poetry_core/_vendor/attr/converters.pyi → poetry/core/_vendor/attr/converters.pyi
diff --git a/poetry_core/_vendor/attr/exceptions.py → poetry/core/_vendor/attr/exceptions.py b/poetry_core/_vendor/attr/exceptions.py → poetry/core/_vendor/attr/exceptions.py
diff --git a/poetry_core/_vendor/attr/exceptions.pyi → poetry/core/_vendor/attr/exceptions.pyi b/poetry_core/_vendor/attr/exceptions.pyi → poetry/core/_vendor/attr/exceptions.pyi
diff --git a/poetry_core/_vendor/attr/filters.py → poetry/core/_vendor/attr/filters.py b/poetry_core/_vendor/attr/filters.py → poetry/core/_vendor/attr/filters.py
diff --git a/poetry_core/_vendor/attr/filters.pyi → poetry/core/_vendor/attr/filters.pyi b/poetry_core/_vendor/attr/filters.pyi → poetry/core/_vendor/attr/filters.pyi
diff --git a/poetry_core/_vendor/attr/py.typed → poetry/core/_vendor/attr/py.typed b/poetry_core/_vendor/attr/py.typed → poetry/core/_vendor/attr/py.typed
diff --git a/poetry_core/_vendor/attr/validators.py → poetry/core/_vendor/attr/validators.py b/poetry_core/_vendor/attr/validators.py → poetry/core/_vendor/attr/validators.py
diff --git a/poetry_core/_vendor/attr/validators.pyi → poetry/core/_vendor/attr/validators.pyi b/poetry_core/_vendor/attr/validators.pyi → poetry/core/_vendor/attr/validators.pyi
diff --git a/poetry_core/_vendor/attrs.LICENSE → poetry/core/_vendor/attrs.LICENSE b/poetry_core/_vendor/attrs.LICENSE → poetry/core/_vendor/attrs.LICENSE
diff --git a/poetry_core/_vendor/backports/__init__.py → poetry/core/_vendor/backports/__init__.py b/poetry_core/_vendor/backports/__init__.py → poetry/core/_vendor/backports/__init__.py
diff --git a/...vendor/backports/configparser/__init__.py → ...vendor/backports/configparser/__init__.py b/...vendor/backports/configparser/__init__.py → ...vendor/backports/configparser/__init__.py
@@ -159,11 +159,11 @@
 import sys
 import warnings
 
-from poetry_core._vendor.backports.configparser.helpers import OrderedDict as _default_dict
-from poetry_core._vendor.backports.configparser.helpers import ChainMap as _ChainMap
-from poetry_core._vendor.backports.configparser.helpers import from_none, open, str, PY2
-from poetry_core._vendor.backports.configparser.helpers import PathLike, fspath
-from poetry_core._vendor.backports.configparser.helpers import MutableMapping
+from poetry.core._vendor.backports.configparser.helpers import OrderedDict as _default_dict
+from poetry.core._vendor.backports.configparser.helpers import ChainMap as _ChainMap
+from poetry.core._vendor.backports.configparser.helpers import from_none, open, str, PY2
+from poetry.core._vendor.backports.configparser.helpers import PathLike, fspath
+from poetry.core._vendor.backports.configparser.helpers import MutableMapping
 
 __all__ = [
     "NoSectionError",

diff --git a/..._vendor/backports/configparser/helpers.py → ..._vendor/backports/configparser/helpers.py b/..._vendor/backports/configparser/helpers.py → ..._vendor/backports/configparser/helpers.py
diff --git a/poetry_core/_vendor/configparser.LICENSE → poetry/core/_vendor/configparser.LICENSE b/poetry_core/_vendor/configparser.LICENSE → poetry/core/_vendor/configparser.LICENSE
diff --git a/poetry_core/_vendor/configparser.py → poetry/core/_vendor/configparser.py b/poetry_core/_vendor/configparser.py → poetry/core/_vendor/configparser.py
@@ -8,7 +8,7 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from poetry_core._vendor.backports.configparser import (
+from poetry.core._vendor.backports.configparser import (
     RawConfigParser,
     ConfigParser,
     SafeConfigParser,
@@ -32,7 +32,7 @@
     MAX_INTERPOLATION_DEPTH,
 )
 
-from poetry_core._vendor.backports.configparser import Error, _UNSET, _default_dict, _ChainMap  # noqa: F401
+from poetry.core._vendor.backports.configparser import Error, _UNSET, _default_dict, _ChainMap  # noqa: F401
 
 __all__ = [
     "NoSectionError",

diff --git a/poetry_core/_vendor/contextlib2.LICENSE.txt → poetry/core/_vendor/contextlib2.LICENSE.txt b/poetry_core/_vendor/contextlib2.LICENSE.txt → poetry/core/_vendor/contextlib2.LICENSE.txt
diff --git a/poetry_core/_vendor/contextlib2.py → poetry/core/_vendor/contextlib2.py b/poetry_core/_vendor/contextlib2.py → poetry/core/_vendor/contextlib2.py
diff --git a/poetry_core/_vendor/enum/LICENSE → poetry/core/_vendor/enum/LICENSE b/poetry_core/_vendor/enum/LICENSE → poetry/core/_vendor/enum/LICENSE
diff --git a/poetry_core/_vendor/enum/README → poetry/core/_vendor/enum/README b/poetry_core/_vendor/enum/README → poetry/core/_vendor/enum/README
diff --git a/poetry_core/_vendor/enum/__init__.py → poetry/core/_vendor/enum/__init__.py b/poetry_core/_vendor/enum/__init__.py → poetry/core/_vendor/enum/__init__.py
diff --git a/poetry_core/_vendor/functools32/LICENSE → poetry/core/_vendor/functools32/LICENSE b/poetry_core/_vendor/functools32/LICENSE → poetry/core/_vendor/functools32/LICENSE
diff --git a/poetry_core/_vendor/functools32/__init__.py → poetry/core/_vendor/functools32/__init__.py b/poetry_core/_vendor/functools32/__init__.py → poetry/core/_vendor/functools32/__init__.py
diff --git a/...re/_vendor/functools32/_dummy_thread32.py → ...re/_vendor/functools32/_dummy_thread32.py b/...re/_vendor/functools32/_dummy_thread32.py → ...re/_vendor/functools32/_dummy_thread32.py
diff --git a/...y_core/_vendor/functools32/functools32.py → ...y/core/_vendor/functools32/functools32.py b/...y_core/_vendor/functools32/functools32.py → ...y/core/_vendor/functools32/functools32.py
diff --git a/poetry_core/_vendor/functools32/reprlib32.py → poetry/core/_vendor/functools32/reprlib32.py b/poetry_core/_vendor/functools32/reprlib32.py → poetry/core/_vendor/functools32/reprlib32.py
diff --git a/poetry_core/_vendor/glob2/LICENSE → poetry/core/_vendor/glob2/LICENSE b/poetry_core/_vendor/glob2/LICENSE → poetry/core/_vendor/glob2/LICENSE
diff --git a/poetry_core/_vendor/glob2/__init__.py → poetry/core/_vendor/glob2/__init__.py b/poetry_core/_vendor/glob2/__init__.py → poetry/core/_vendor/glob2/__init__.py
diff --git a/poetry_core/_vendor/glob2/compat.py → poetry/core/_vendor/glob2/compat.py b/poetry_core/_vendor/glob2/compat.py → poetry/core/_vendor/glob2/compat.py
diff --git a/poetry_core/_vendor/glob2/fnmatch.py → poetry/core/_vendor/glob2/fnmatch.py b/poetry_core/_vendor/glob2/fnmatch.py → poetry/core/_vendor/glob2/fnmatch.py
diff --git a/poetry_core/_vendor/glob2/impl.py → poetry/core/_vendor/glob2/impl.py b/poetry_core/_vendor/glob2/impl.py → poetry/core/_vendor/glob2/impl.py
diff --git a/...y_core/_vendor/importlib_metadata/LICENSE → ...y/core/_vendor/importlib_metadata/LICENSE b/...y_core/_vendor/importlib_metadata/LICENSE → ...y/core/_vendor/importlib_metadata/LICENSE
diff --git a/...re/_vendor/importlib_metadata/__init__.py → ...re/_vendor/importlib_metadata/__init__.py b/...re/_vendor/importlib_metadata/__init__.py → ...re/_vendor/importlib_metadata/__init__.py
@@ -6,7 +6,7 @@
 import abc
 import csv
 import sys
-from poetry_core._vendor import zipp
+from poetry.core._vendor import zipp
 import operator
 import functools
 import itertools

diff --git a/...ore/_vendor/importlib_metadata/_compat.py → ...ore/_vendor/importlib_metadata/_compat.py b/...ore/_vendor/importlib_metadata/_compat.py → ...ore/_vendor/importlib_metadata/_compat.py
@@ -8,17 +8,17 @@
 
 if sys.version_info > (3,):  # pragma: nocover
     import builtins
-    from poetry_core._vendor.configparser import ConfigParser
+    from poetry.core._vendor.configparser import ConfigParser
     from contextlib import suppress
     FileNotFoundError = builtins.FileNotFoundError
     IsADirectoryError = builtins.IsADirectoryError
     NotADirectoryError = builtins.NotADirectoryError
     PermissionError = builtins.PermissionError
     map = builtins.map
 else:  # pragma: nocover
-    from poetry_core._vendor.backports.configparser import ConfigParser
+    from poetry.core._vendor.backports.configparser import ConfigParser
     from itertools import imap as map  # type: ignore
-    from poetry_core._vendor.contextlib2 import suppress  # noqa
+    from poetry.core._vendor.contextlib2 import suppress  # noqa
     FileNotFoundError = IOError, OSError
     IsADirectoryError = IOError, OSError
     NotADirectoryError = IOError, OSError

diff --git a/...endor/importlib_metadata/docs/__init__.py → ...endor/importlib_metadata/docs/__init__.py b/...endor/importlib_metadata/docs/__init__.py → ...endor/importlib_metadata/docs/__init__.py
diff --git a/...dor/importlib_metadata/docs/changelog.rst → ...dor/importlib_metadata/docs/changelog.rst b/...dor/importlib_metadata/docs/changelog.rst → ...dor/importlib_metadata/docs/changelog.rst
diff --git a/...e/_vendor/importlib_metadata/docs/conf.py → ...e/_vendor/importlib_metadata/docs/conf.py b/...e/_vendor/importlib_metadata/docs/conf.py → ...e/_vendor/importlib_metadata/docs/conf.py
diff --git a/..._vendor/importlib_metadata/docs/index.rst → ..._vendor/importlib_metadata/docs/index.rst b/..._vendor/importlib_metadata/docs/index.rst → ..._vendor/importlib_metadata/docs/index.rst
diff --git a/..._vendor/importlib_metadata/docs/using.rst → ..._vendor/importlib_metadata/docs/using.rst b/..._vendor/importlib_metadata/docs/using.rst → ..._vendor/importlib_metadata/docs/using.rst
diff --git a/...ndor/importlib_metadata/tests/__init__.py → ...ndor/importlib_metadata/tests/__init__.py b/...ndor/importlib_metadata/tests/__init__.py → ...ndor/importlib_metadata/tests/__init__.py
diff --git a/...importlib_metadata/tests/data/__init__.py → ...importlib_metadata/tests/data/__init__.py b/...importlib_metadata/tests/data/__init__.py → ...importlib_metadata/tests/data/__init__.py
diff --git a/...tests/data/example-21.12-py3-none-any.whl → ...tests/data/example-21.12-py3-none-any.whl b/...tests/data/example-21.12-py3-none-any.whl → ...tests/data/example-21.12-py3-none-any.whl
diff --git a/...ndor/importlib_metadata/tests/fixtures.py → ...ndor/importlib_metadata/tests/fixtures.py b/...ndor/importlib_metadata/tests/fixtures.py → ...ndor/importlib_metadata/tests/fixtures.py
@@ -10,7 +10,7 @@
 try:
     from contextlib import ExitStack
 except ImportError:
-    from poetry_core._vendor.contextlib2 import ExitStack
+    from poetry.core._vendor.contextlib2 import ExitStack
 
 try:
     import pathlib

diff --git a/...ndor/importlib_metadata/tests/test_api.py → ...ndor/importlib_metadata/tests/test_api.py b/...ndor/importlib_metadata/tests/test_api.py → ...ndor/importlib_metadata/tests/test_api.py
diff --git a/...ortlib_metadata/tests/test_integration.py → ...ortlib_metadata/tests/test_integration.py b/...ortlib_metadata/tests/test_integration.py → ...ortlib_metadata/tests/test_integration.py
diff --git a/...dor/importlib_metadata/tests/test_main.py → ...dor/importlib_metadata/tests/test_main.py b/...dor/importlib_metadata/tests/test_main.py → ...dor/importlib_metadata/tests/test_main.py
@@ -7,7 +7,7 @@
 import textwrap
 import unittest
 import importlib
-from poetry_core._vendor import importlib_metadata
+from poetry.core._vendor import importlib_metadata
 
 from . import fixtures
 from .. import (

diff --git a/...ndor/importlib_metadata/tests/test_zip.py → ...ndor/importlib_metadata/tests/test_zip.py b/...ndor/importlib_metadata/tests/test_zip.py → ...ndor/importlib_metadata/tests/test_zip.py
@@ -11,7 +11,7 @@
 try:
     from contextlib import ExitStack
 except ImportError:
-    from poetry_core._vendor.contextlib2 import ExitStack
+    from poetry.core._vendor.contextlib2 import ExitStack
 
 
 class TestZip(unittest.TestCase):

diff --git a/poetry_core/_vendor/jsonschema/COPYING → poetry/core/_vendor/jsonschema/COPYING b/poetry_core/_vendor/jsonschema/COPYING → poetry/core/_vendor/jsonschema/COPYING
diff --git a/poetry_core/_vendor/jsonschema/__init__.py → poetry/core/_vendor/jsonschema/__init__.py b/poetry_core/_vendor/jsonschema/__init__.py → poetry/core/_vendor/jsonschema/__init__.py
@@ -8,18 +8,18 @@
 instance under a schema, and will create a validator for you.
 """
 
-from poetry_core._vendor.jsonschema.exceptions import (
+from poetry.core._vendor.jsonschema.exceptions import (
     ErrorTree, FormatError, RefResolutionError, SchemaError, ValidationError
 )
-from poetry_core._vendor.jsonschema._format import (
+from poetry.core._vendor.jsonschema._format import (
     FormatChecker,
     draft3_format_checker,
     draft4_format_checker,
     draft6_format_checker,
     draft7_format_checker,
 )
-from poetry_core._vendor.jsonschema._types import TypeChecker
-from poetry_core._vendor.jsonschema.validators import (
+from poetry.core._vendor.jsonschema._types import TypeChecker
+from poetry.core._vendor.jsonschema.validators import (
     Draft3Validator,
     Draft4Validator,
     Draft6Validator,

diff --git a/poetry/core/_vendor/jsonschema/__main__.py b/poetry/core/_vendor/jsonschema/__main__.py
@@ -0,0 +1,2 @@
+from poetry.core._vendor.jsonschema.cli import main
+main()
diff --git a/poetry_core/_vendor/jsonschema/_format.py → poetry/core/_vendor/jsonschema/_format.py b/poetry_core/_vendor/jsonschema/_format.py → poetry/core/_vendor/jsonschema/_format.py
@@ -3,8 +3,8 @@
 import socket
 import struct
 
-from poetry_core._vendor.jsonschema.compat import str_types
-from poetry_core._vendor.jsonschema.exceptions import FormatError
+from poetry.core._vendor.jsonschema.compat import str_types
+from poetry.core._vendor.jsonschema.exceptions import FormatError
 
 
 class FormatChecker(object):

diff --git a/.../_vendor/jsonschema/_legacy_validators.py → .../_vendor/jsonschema/_legacy_validators.py b/.../_vendor/jsonschema/_legacy_validators.py → .../_vendor/jsonschema/_legacy_validators.py
@@ -1,6 +1,6 @@
-from poetry_core._vendor.jsonschema import _utils
-from poetry_core._vendor.jsonschema.compat import iteritems
-from poetry_core._vendor.jsonschema.exceptions import ValidationError
+from poetry.core._vendor.jsonschema import _utils
+from poetry.core._vendor.jsonschema.compat import iteritems
+from poetry.core._vendor.jsonschema.exceptions import ValidationError
 
 
 def dependencies_draft3(validator, dependencies, instance, schema):

diff --git a/poetry_core/_vendor/jsonschema/_reflect.py → poetry/core/_vendor/jsonschema/_reflect.py b/poetry_core/_vendor/jsonschema/_reflect.py → poetry/core/_vendor/jsonschema/_reflect.py
@@ -9,7 +9,7 @@
 
 import sys
 
-from poetry_core._vendor.jsonschema.compat import PY3
+from poetry.core._vendor.jsonschema.compat import PY3
 
 
 class _NoModuleFound(Exception):

diff --git a/poetry_core/_vendor/jsonschema/_types.py → poetry/core/_vendor/jsonschema/_types.py b/poetry_core/_vendor/jsonschema/_types.py → poetry/core/_vendor/jsonschema/_types.py
@@ -1,10 +1,10 @@
 import numbers
 
-from poetry_core._vendor.pyrsistent import pmap
-from poetry_core._vendor import attr
+from poetry.core._vendor.pyrsistent import pmap
+from poetry.core._vendor import attr
 
-from poetry_core._vendor.jsonschema.compat import int_types, str_types
-from poetry_core._vendor.jsonschema.exceptions import UndefinedTypeCheck
+from poetry.core._vendor.jsonschema.compat import int_types, str_types
+from poetry.core._vendor.jsonschema.exceptions import UndefinedTypeCheck
 
 
 def is_array(checker, instance):

diff --git a/poetry_core/_vendor/jsonschema/_utils.py → poetry/core/_vendor/jsonschema/_utils.py b/poetry_core/_vendor/jsonschema/_utils.py → poetry/core/_vendor/jsonschema/_utils.py
@@ -3,7 +3,7 @@
 import os
 import re
 
-from poetry_core._vendor.jsonschema.compat import MutableMapping, str_types, urlsplit
+from poetry.core._vendor.jsonschema.compat import MutableMapping, str_types, urlsplit
 
 
 class URIDict(MutableMapping):

diff --git a/...ry_core/_vendor/jsonschema/_validators.py → ...ry/core/_vendor/jsonschema/_validators.py b/...ry_core/_vendor/jsonschema/_validators.py → ...ry/core/_vendor/jsonschema/_validators.py
@@ -1,6 +1,6 @@
 import re
 
-from poetry_core._vendor.jsonschema._utils import (
+from poetry.core._vendor.jsonschema._utils import (
     ensure_list,
     equal,
     extras_msg,
@@ -9,8 +9,8 @@
     unbool,
     uniq,
 )
-from poetry_core._vendor.jsonschema.exceptions import FormatError, ValidationError
-from poetry_core._vendor.jsonschema.compat import iteritems
+from poetry.core._vendor.jsonschema.exceptions import FormatError, ValidationError
+from poetry.core._vendor.jsonschema.compat import iteritems
 
 
 def patternProperties(validator, patternProperties, instance, schema):

diff --git a/..._vendor/jsonschema/benchmarks/__init__.py → ..._vendor/jsonschema/benchmarks/__init__.py b/..._vendor/jsonschema/benchmarks/__init__.py → ..._vendor/jsonschema/benchmarks/__init__.py
diff --git a/..._vendor/jsonschema/benchmarks/issue232.py → ..._vendor/jsonschema/benchmarks/issue232.py b/..._vendor/jsonschema/benchmarks/issue232.py → ..._vendor/jsonschema/benchmarks/issue232.py
@@ -6,10 +6,10 @@
 """
 from twisted.python.filepath import FilePath
 from pyperf import Runner
-from poetry_core._vendor.pyrsistent import m
+from poetry.core._vendor.pyrsistent import m
 
-from poetry_core._vendor.jsonschema.tests._suite import Version
-from poetry_core._vendor import jsonschema
+from poetry.core._vendor.jsonschema.tests._suite import Version
+from poetry.core._vendor import jsonschema
 
 
 issue232 = Version(

diff --git a/...hema/benchmarks/json_schema_test_suite.py → ...hema/benchmarks/json_schema_test_suite.py b/...hema/benchmarks/json_schema_test_suite.py → ...hema/benchmarks/json_schema_test_suite.py
@@ -7,7 +7,7 @@
 """
 from pyperf import Runner
 
-from poetry_core._vendor.jsonschema.tests._suite import Suite
+from poetry.core._vendor.jsonschema.tests._suite import Suite
 
 
 if __name__ == "__main__":

diff --git a/poetry_core/_vendor/jsonschema/cli.py → poetry/core/_vendor/jsonschema/cli.py b/poetry_core/_vendor/jsonschema/cli.py → poetry/core/_vendor/jsonschema/cli.py
@@ -6,9 +6,9 @@
 import json
 import sys
 
-from poetry_core._vendor.jsonschema import __version__
-from poetry_core._vendor.jsonschema._reflect import namedAny
-from poetry_core._vendor.jsonschema.validators import validator_for
+from poetry.core._vendor.jsonschema import __version__
+from poetry.core._vendor.jsonschema._reflect import namedAny
+from poetry.core._vendor.jsonschema.validators import validator_for
 
 
 def _namedAnyWithDefault(name):

diff --git a/poetry_core/_vendor/jsonschema/compat.py → poetry/core/_vendor/jsonschema/compat.py b/poetry_core/_vendor/jsonschema/compat.py → poetry/core/_vendor/jsonschema/compat.py
@@ -39,7 +39,7 @@ def urlopen(*args, **kwargs):
     int_types = int, long
     iteritems = operator.methodcaller("iteritems")
 
-    from poetry_core._vendor.functools32 import lru_cache
+    from poetry.core._vendor.functools32 import lru_cache
 
 
 def urldefrag(url):

diff --git a/poetry_core/_vendor/jsonschema/exceptions.py → poetry/core/_vendor/jsonschema/exceptions.py b/poetry_core/_vendor/jsonschema/exceptions.py → poetry/core/_vendor/jsonschema/exceptions.py
@@ -6,10 +6,10 @@
 import pprint
 import textwrap
 
-from poetry_core._vendor import attr
+from poetry.core._vendor import attr
 
-from poetry_core._vendor.jsonschema import _utils
-from poetry_core._vendor.jsonschema.compat import PY3, iteritems
+from poetry.core._vendor.jsonschema import _utils
+from poetry.core._vendor.jsonschema.compat import PY3, iteritems
 
 
 WEAK_MATCHES = frozenset(["anyOf", "oneOf"])

diff --git a/...re/_vendor/jsonschema/schemas/draft3.json → ...re/_vendor/jsonschema/schemas/draft3.json b/...re/_vendor/jsonschema/schemas/draft3.json → ...re/_vendor/jsonschema/schemas/draft3.json
diff --git a/...re/_vendor/jsonschema/schemas/draft4.json → ...re/_vendor/jsonschema/schemas/draft4.json b/...re/_vendor/jsonschema/schemas/draft4.json → ...re/_vendor/jsonschema/schemas/draft4.json
diff --git a/...re/_vendor/jsonschema/schemas/draft6.json → ...re/_vendor/jsonschema/schemas/draft6.json b/...re/_vendor/jsonschema/schemas/draft6.json → ...re/_vendor/jsonschema/schemas/draft6.json
diff --git a/...re/_vendor/jsonschema/schemas/draft7.json → ...re/_vendor/jsonschema/schemas/draft7.json b/...re/_vendor/jsonschema/schemas/draft7.json → ...re/_vendor/jsonschema/schemas/draft7.json
diff --git a/poetry_core/_vendor/jsonschema/validators.py → poetry/core/_vendor/jsonschema/validators.py b/poetry_core/_vendor/jsonschema/validators.py → poetry/core/_vendor/jsonschema/validators.py
@@ -8,16 +8,16 @@
 import json
 import numbers
 
-from poetry_core._vendor.six import add_metaclass
+from poetry.core._vendor.six import add_metaclass
 
-from poetry_core._vendor.jsonschema import (
+from poetry.core._vendor.jsonschema import (
     _legacy_validators,
     _types,
     _utils,
     _validators,
     exceptions,
 )
-from poetry_core._vendor.jsonschema.compat import (
+from poetry.core._vendor.jsonschema.compat import (
     Sequence,
     int_types,
     iteritems,
@@ -33,7 +33,7 @@
 # Sigh. https://gitlab.com/pycqa/flake8/issues/280
 #       https://github.com/pyga/ebb-lint/issues/7
 # Imported for backwards compatibility.
-from poetry_core._vendor.jsonschema.exceptions import ErrorTree
+from poetry.core._vendor.jsonschema.exceptions import ErrorTree
 ErrorTree
 
 

diff --git a/poetry_core/_vendor/packaging/LICENSE → poetry/core/_vendor/packaging/LICENSE b/poetry_core/_vendor/packaging/LICENSE → poetry/core/_vendor/packaging/LICENSE
diff --git a/poetry_core/_vendor/packaging/LICENSE.APACHE → poetry/core/_vendor/packaging/LICENSE.APACHE b/poetry_core/_vendor/packaging/LICENSE.APACHE → poetry/core/_vendor/packaging/LICENSE.APACHE
diff --git a/poetry_core/_vendor/packaging/LICENSE.BSD → poetry/core/_vendor/packaging/LICENSE.BSD b/poetry_core/_vendor/packaging/LICENSE.BSD → poetry/core/_vendor/packaging/LICENSE.BSD
diff --git a/poetry_core/_vendor/packaging/__about__.py → poetry/core/_vendor/packaging/__about__.py b/poetry_core/_vendor/packaging/__about__.py → poetry/core/_vendor/packaging/__about__.py
diff --git a/poetry_core/_vendor/packaging/__init__.py → poetry/core/_vendor/packaging/__init__.py b/poetry_core/_vendor/packaging/__init__.py → poetry/core/_vendor/packaging/__init__.py
diff --git a/poetry_core/_vendor/packaging/_compat.py → poetry/core/_vendor/packaging/_compat.py b/poetry_core/_vendor/packaging/_compat.py → poetry/core/_vendor/packaging/_compat.py
diff --git a/poetry_core/_vendor/packaging/_structures.py → poetry/core/_vendor/packaging/_structures.py b/poetry_core/_vendor/packaging/_structures.py → poetry/core/_vendor/packaging/_structures.py
diff --git a/poetry_core/_vendor/packaging/_typing.py → poetry/core/_vendor/packaging/_typing.py b/poetry_core/_vendor/packaging/_typing.py → poetry/core/_vendor/packaging/_typing.py
@@ -18,7 +18,7 @@
 
 In packaging, all static-typing related imports should be guarded as follows:
 
-    from poetry_core._vendor.packaging._typing import MYPY_CHECK_RUNNING
+    from poetry.core._vendor.packaging._typing import MYPY_CHECK_RUNNING
 
     if MYPY_CHECK_RUNNING:
         from typing import ...

diff --git a/poetry_core/_vendor/packaging/markers.py → poetry/core/_vendor/packaging/markers.py b/poetry_core/_vendor/packaging/markers.py → poetry/core/_vendor/packaging/markers.py
@@ -8,9 +8,9 @@
 import platform
 import sys
 
-from poetry_core._vendor.pyparsing import ParseException, ParseResults, stringStart, stringEnd
-from poetry_core._vendor.pyparsing import ZeroOrMore, Group, Forward, QuotedString
-from poetry_core._vendor.pyparsing import Literal as L  # noqa
+from poetry.core._vendor.pyparsing import ParseException, ParseResults, stringStart, stringEnd
+from poetry.core._vendor.pyparsing import ZeroOrMore, Group, Forward, QuotedString
+from poetry.core._vendor.pyparsing import Literal as L  # noqa
 
 from ._compat import string_types
 from ._typing import MYPY_CHECK_RUNNING

diff --git a/poetry_core/_vendor/packaging/py.typed → poetry/core/_vendor/packaging/py.typed b/poetry_core/_vendor/packaging/py.typed → poetry/core/_vendor/packaging/py.typed
diff --git a/...ry_core/_vendor/packaging/requirements.py → ...ry/core/_vendor/packaging/requirements.py b/...ry_core/_vendor/packaging/requirements.py → ...ry/core/_vendor/packaging/requirements.py
@@ -6,10 +6,10 @@
 import string
 import re
 
-from poetry_core._vendor.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
-from poetry_core._vendor.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
-from poetry_core._vendor.pyparsing import Literal as L  # noqa
-from poetry_core._vendor.six.moves.urllib import parse as urlparse
+from poetry.core._vendor.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
+from poetry.core._vendor.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
+from poetry.core._vendor.pyparsing import Literal as L  # noqa
+from poetry.core._vendor.six.moves.urllib import parse as urlparse
 
 from ._typing import MYPY_CHECK_RUNNING
 from .markers import MARKER_EXPR, Marker

diff --git a/poetry_core/_vendor/packaging/specifiers.py → poetry/core/_vendor/packaging/specifiers.py b/poetry_core/_vendor/packaging/specifiers.py → poetry/core/_vendor/packaging/specifiers.py
diff --git a/poetry_core/_vendor/packaging/tags.py → poetry/core/_vendor/packaging/tags.py b/poetry_core/_vendor/packaging/tags.py → poetry/core/_vendor/packaging/tags.py
diff --git a/poetry_core/_vendor/packaging/utils.py → poetry/core/_vendor/packaging/utils.py b/poetry_core/_vendor/packaging/utils.py → poetry/core/_vendor/packaging/utils.py
diff --git a/poetry_core/_vendor/packaging/version.py → poetry/core/_vendor/packaging/version.py b/poetry_core/_vendor/packaging/version.py → poetry/core/_vendor/packaging/version.py
diff --git a/poetry_core/_vendor/pathlib2/LICENSE.rst → poetry/core/_vendor/pathlib2/LICENSE.rst b/poetry_core/_vendor/pathlib2/LICENSE.rst → poetry/core/_vendor/pathlib2/LICENSE.rst
diff --git a/poetry_core/_vendor/pathlib2/__init__.py → poetry/core/_vendor/pathlib2/__init__.py b/poetry_core/_vendor/pathlib2/__init__.py → poetry/core/_vendor/pathlib2/__init__.py
@@ -10,7 +10,7 @@
 import os
 import posixpath
 import re
-from poetry_core._vendor import six
+from poetry.core._vendor import six
 import sys
 
 from errno import EINVAL, ENOENT, ENOTDIR, EBADF
@@ -49,7 +49,7 @@
 try:
     from os import scandir as os_scandir
 except ImportError:
-    from poetry_core._vendor.scandir import scandir as os_scandir
+    from poetry.core._vendor.scandir import scandir as os_scandir
 
 __all__ = [
     "PurePath", "PurePosixPath", "PureWindowsPath",

diff --git a/poetry_core/_vendor/pkginfo/LICENSE.txt → poetry/core/_vendor/pkginfo/LICENSE.txt b/poetry_core/_vendor/pkginfo/LICENSE.txt → poetry/core/_vendor/pkginfo/LICENSE.txt
diff --git a/poetry_core/_vendor/pkginfo/__init__.py → poetry/core/_vendor/pkginfo/__init__.py b/poetry_core/_vendor/pkginfo/__init__.py → poetry/core/_vendor/pkginfo/__init__.py
diff --git a/poetry_core/_vendor/pkginfo/_compat.py → poetry/core/_vendor/pkginfo/_compat.py b/poetry_core/_vendor/pkginfo/_compat.py → poetry/core/_vendor/pkginfo/_compat.py
diff --git a/poetry_core/_vendor/pkginfo/bdist.py → poetry/core/_vendor/pkginfo/bdist.py b/poetry_core/_vendor/pkginfo/bdist.py → poetry/core/_vendor/pkginfo/bdist.py
diff --git a/poetry_core/_vendor/pkginfo/commandline.py → poetry/core/_vendor/pkginfo/commandline.py b/poetry_core/_vendor/pkginfo/commandline.py → poetry/core/_vendor/pkginfo/commandline.py
@@ -17,7 +17,7 @@
   of the package.
 """
 try:
-    from poetry_core._vendor.configparser import ConfigParser
+    from poetry.core._vendor.configparser import ConfigParser
 except ImportError:  # pragma: NO COVER
     from ConfigParser import ConfigParser
 from collections import OrderedDict

diff --git a/poetry_core/_vendor/pkginfo/develop.py → poetry/core/_vendor/pkginfo/develop.py b/poetry_core/_vendor/pkginfo/develop.py → poetry/core/_vendor/pkginfo/develop.py
diff --git a/poetry_core/_vendor/pkginfo/distribution.py → poetry/core/_vendor/pkginfo/distribution.py b/poetry_core/_vendor/pkginfo/distribution.py → poetry/core/_vendor/pkginfo/distribution.py
diff --git a/poetry_core/_vendor/pkginfo/index.py → poetry/core/_vendor/pkginfo/index.py b/poetry_core/_vendor/pkginfo/index.py → poetry/core/_vendor/pkginfo/index.py
diff --git a/poetry_core/_vendor/pkginfo/installed.py → poetry/core/_vendor/pkginfo/installed.py b/poetry_core/_vendor/pkginfo/installed.py → poetry/core/_vendor/pkginfo/installed.py
diff --git a/poetry_core/_vendor/pkginfo/sdist.py → poetry/core/_vendor/pkginfo/sdist.py b/poetry_core/_vendor/pkginfo/sdist.py → poetry/core/_vendor/pkginfo/sdist.py
diff --git a/...ry_core/_vendor/pkginfo/tests/__init__.py → ...ry/core/_vendor/pkginfo/tests/__init__.py b/...ry_core/_vendor/pkginfo/tests/__init__.py → ...ry/core/_vendor/pkginfo/tests/__init__.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		from pkgutil import extend_path


		__path__ = extend_path(__path__, __name__)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		from poetry.core._vendor.jsonschema.cli import main
		main()