From b8c48a0f022cddcf22c7309a0cf4db691d2e04e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Eustace?= Date: Fri, 27 Mar 2020 14:06:46 +0100 Subject: [PATCH] Use the latest version of poetry-core --- docs/docs/faq.md | 2 +- docs/docs/pyproject.md | 2 +- get-poetry.py | 5 +++++ poetry.lock | 13 ++++-------- poetry/__init__.py | 14 ++----------- poetry/console/application.py | 2 +- poetry/console/commands/add.py | 2 +- poetry/console/commands/build.py | 2 +- poetry/console/commands/debug/resolve.py | 2 +- poetry/console/commands/init.py | 10 +++++----- poetry/console/commands/install.py | 2 +- poetry/console/commands/new.py | 4 ++-- poetry/console/commands/self/update.py | 2 +- poetry/console/commands/show.py | 4 ++-- poetry/console/commands/version.py | 2 +- poetry/factory.py | 5 +++-- poetry/installation/installer.py | 4 ++-- poetry/installation/pip_installer.py | 6 +++--- poetry/layouts/layout.py | 6 +++--- poetry/masonry/api.py | 10 +++++----- poetry/masonry/builders/editable.py | 7 +++---- poetry/mixology/partial_solution.py | 4 ++-- poetry/mixology/term.py | 2 +- poetry/mixology/version_solver.py | 11 +++++----- poetry/packages/locker.py | 6 +++--- poetry/poetry.py | 4 ++-- poetry/publishing/uploader.py | 6 +++--- poetry/puzzle/provider.py | 20 +++++++++---------- poetry/puzzle/solver.py | 9 ++++----- poetry/repositories/installed_repository.py | 11 +++++----- poetry/repositories/legacy_repository.py | 16 +++++++-------- poetry/repositories/pypi_repository.py | 18 ++++++++--------- poetry/repositories/repository.py | 6 +++--- poetry/utils/env.py | 6 +++--- poetry/utils/exporter.py | 8 ++++---- poetry/utils/extras.py | 3 +-- poetry/utils/helpers.py | 3 +-- poetry/version/version_selector.py | 8 ++++---- pyproject.toml | 6 +++--- sonnet | 5 ++--- tests/conftest.py | 6 +++--- tests/console/commands/env/test_use.py | 2 +- tests/console/commands/test_add.py | 2 +- tests/console/conftest.py | 6 +++--- tests/helpers.py | 7 +++---- tests/installation/test_installer.py | 2 +- tests/installation/test_pip_installer.py | 3 +-- tests/mixology/helpers.py | 3 +-- tests/mixology/version_solver/conftest.py | 2 +- tests/packages/test_locker.py | 3 +-- tests/puzzle/conftest.py | 6 +++--- tests/puzzle/test_provider.py | 8 ++++---- tests/puzzle/test_solver.py | 6 +++--- .../repositories/test_installed_repository.py | 8 +++----- tests/repositories/test_legacy_repository.py | 3 +-- tests/repositories/test_pypi_repository.py | 2 +- tests/utils/test_env.py | 2 +- tests/utils/test_extras.py | 3 +-- 58 files changed, 155 insertions(+), 177 deletions(-) diff --git a/docs/docs/faq.md b/docs/docs/faq.md index 26e4c0a981a..4d464d7ebc0 100644 --- a/docs/docs/faq.md +++ b/docs/docs/faq.md @@ -43,7 +43,7 @@ So, in your `pyproject.toml` file, add this section if it does not already exist ```toml [build-system] requires = ["poetry-core>=1.0.0"] -build-backend = "poetry_core.masonry.api" +build-backend = "poetry.core.masonry.api" ``` And use a `tox.ini` configuration file similar to this: diff --git a/docs/docs/pyproject.md b/docs/docs/pyproject.md index 1bec5940345..004fa5c1b22 100644 --- a/docs/docs/pyproject.md +++ b/docs/docs/pyproject.md @@ -281,7 +281,7 @@ it in the `build-system` section of the `pyproject.toml` file like so: ```toml [build-system] requires = ["poetry_core>=1.0.0"] -build-backend = "poetry_core.masonry.api" +build-backend = "poetry.core.masonry.api" ``` !!!note diff --git a/get-poetry.py b/get-poetry.py index 7a2b18d3997..03408d96c6b 100644 --- a/get-poetry.py +++ b/get-poetry.py @@ -204,8 +204,13 @@ def expanduser(path): import os lib = os.path.normpath(os.path.join(os.path.realpath(__file__), "../..", "lib")) +vendors = os.path.join(lib, "poetry", "_vendor") +current_vendors = os.path.join( + vendors, "py{}".format(".".join(str(v) for v in sys.version_info[:2])) +) sys.path.insert(0, lib) +sys.path.insert(0, current_vendors) if __name__ == "__main__": from poetry.console import main diff --git a/poetry.lock b/poetry.lock index 3edefc30fef..2bd0b2f81ae 100644 --- a/poetry.lock +++ b/poetry.lock @@ -801,7 +801,7 @@ description = "Core utilities for Poetry" name = "poetry-core" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "1.0.0a3" +version = "1.0.0a5" [package.dependencies] [package.dependencies.typing] @@ -1322,7 +1322,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"] [metadata] -content-hash = "33c3d3a5301b038a4e04fe83f885e35f05d6a1b127d3d63479f3d97a862b8e14" +content-hash = "35617c80a428d8f081214fcbe428540df288e67e5596531cba40415f19438d57" python-versions = "~2.7 || ^3.5" [metadata.files] @@ -1600,11 +1600,6 @@ markupsafe = [ {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, ] mkdocs = [ @@ -1684,8 +1679,8 @@ pluggy = [ {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, ] poetry-core = [ - {file = "poetry-core-1.0.0a3.tar.gz", hash = "sha256:02d1bfed4a53dbe8570c6bc94164d7a5e1b01630f74174f03bc932e8b334be5a"}, - {file = "poetry_core-1.0.0a3-py2.py3-none-any.whl", hash = "sha256:2351a1e3a8e18414236f1c7db31c0c7d19bd240c27b5540abf9d81156a10da4c"}, + {file = "poetry-core-1.0.0a5.tar.gz", hash = "sha256:afac65874baf2030328f43df840cec2b5a17bcdad0a04c55b0f830e444ef1120"}, + {file = "poetry_core-1.0.0a5-py2.py3-none-any.whl", hash = "sha256:ffbd0512d80affce937ce53db2d35bf28ea52d287bae61da5b5d63058618d6b9"}, ] pre-commit = [ {file = "pre_commit-1.21.0-py2.py3-none-any.whl", hash = "sha256:f92a359477f3252452ae2e8d3029de77aec59415c16ae4189bcfba40b757e029"}, diff --git a/poetry/__init__.py b/poetry/__init__.py index 6d7492fe6c1..26cfe4052b1 100644 --- a/poetry/__init__.py +++ b/poetry/__init__.py @@ -1,14 +1,4 @@ -import os -import sys +from pkgutil import extend_path -from .__version__ import __version__ # noqa - -_ROOT = os.path.dirname(os.path.realpath(__file__)) -_VENDOR = os.path.join(_ROOT, "_vendor") -_CURRENT_VENDOR = os.path.join( - _VENDOR, "py{}".format(".".join(str(v) for v in sys.version_info[:2])) -) - -# Add vendored dependencies to path. -sys.path.insert(0, _CURRENT_VENDOR) +__path__ = extend_path(__path__, __name__) diff --git a/poetry/console/application.py b/poetry/console/application.py index 1e6df4fa361..72f293124f8 100644 --- a/poetry/console/application.py +++ b/poetry/console/application.py @@ -1,6 +1,6 @@ from cleo import Application as BaseApplication -from poetry import __version__ +from poetry.__version__ import __version__ from .commands.about import AboutCommand from .commands.add import AddCommand diff --git a/poetry/console/commands/add.py b/poetry/console/commands/add.py index 269b3acb0e1..8f0c3a9a914 100644 --- a/poetry/console/commands/add.py +++ b/poetry/console/commands/add.py @@ -56,7 +56,7 @@ class AddCommand(EnvCommand, InitCommand): def handle(self): from poetry.installation.installer import Installer - from poetry_core.semver import parse_constraint + from poetry.core.semver import parse_constraint from tomlkit import inline_table packages = self.argument("name") diff --git a/poetry/console/commands/build.py b/poetry/console/commands/build.py index 3dcd71afbd5..3d450fb3194 100644 --- a/poetry/console/commands/build.py +++ b/poetry/console/commands/build.py @@ -13,7 +13,7 @@ class BuildCommand(EnvCommand): ] def handle(self): - from poetry_core.masonry import Builder + from poetry.core.masonry import Builder fmt = "all" if self.option("format"): diff --git a/poetry/console/commands/debug/resolve.py b/poetry/console/commands/debug/resolve.py index f353d02cea3..806de5a2a00 100644 --- a/poetry/console/commands/debug/resolve.py +++ b/poetry/console/commands/debug/resolve.py @@ -29,7 +29,7 @@ class DebugResolveCommand(InitCommand): def handle(self): from poetry.io.null_io import NullIO - from poetry_core.packages import ProjectPackage + from poetry.core.packages import ProjectPackage from poetry.puzzle import Solver from poetry.repositories.pool import Pool from poetry.repositories.repository import Repository diff --git a/poetry/console/commands/init.py b/poetry/console/commands/init.py index fb5d2e186e8..3af482b8818 100644 --- a/poetry/console/commands/init.py +++ b/poetry/console/commands/init.py @@ -64,7 +64,7 @@ def handle(self): from poetry.layouts import layout from poetry.utils._compat import Path from poetry.utils.env import SystemEnv - from poetry_core.vcs.git import GitConfig + from poetry.core.vcs.git import GitConfig if (Path.cwd() / "pyproject.toml").exists(): self.line("A pyproject.toml file already exists.") @@ -367,8 +367,8 @@ def _parse_requirements( if url_parsed.scheme and url_parsed.netloc: # Url if url_parsed.scheme in ["git+https", "git+ssh"]: - from poetry_core.vcs.git import Git - from poetry_core.vcs.git import ParsedUrl + from poetry.core.vcs.git import Git + from poetry.core.vcs.git import ParsedUrl parsed = ParsedUrl.parse(requirement) url = Git.normalize_url(requirement) @@ -481,7 +481,7 @@ def _format_requirements( return requires def _validate_author(self, author, default): - from poetry_core.packages.package import AUTHOR_REGEX + from poetry.core.packages.package import AUTHOR_REGEX author = author or default @@ -498,7 +498,7 @@ def _validate_author(self, author, default): return author def _validate_license(self, license): - from poetry_core.spdx import license_by_id + from poetry.core.spdx import license_by_id if license: license_by_id(license) diff --git a/poetry/console/commands/install.py b/poetry/console/commands/install.py index 940f98f51f3..82585afe96f 100644 --- a/poetry/console/commands/install.py +++ b/poetry/console/commands/install.py @@ -42,7 +42,7 @@ def handle(self): from clikit.io import NullIO from poetry.installation.installer import Installer from poetry.masonry.builders import EditableBuilder - from poetry_core.masonry.utils.module import ModuleOrPackageNotFound + from poetry.core.masonry.utils.module import ModuleOrPackageNotFound installer = Installer( self.io, self.env, self.poetry.package, self.poetry.locker, self.poetry.pool diff --git a/poetry/console/commands/new.py b/poetry/console/commands/new.py index 433e4d520e6..53e61702f90 100644 --- a/poetry/console/commands/new.py +++ b/poetry/console/commands/new.py @@ -21,10 +21,10 @@ class NewCommand(Command): def handle(self): from poetry.layouts import layout - from poetry_core.semver import parse_constraint + from poetry.core.semver import parse_constraint from poetry.utils._compat import Path from poetry.utils.env import SystemEnv - from poetry_core.vcs.git import GitConfig + from poetry.core.vcs.git import GitConfig if self.option("src"): layout_ = layout("src") diff --git a/poetry/console/commands/self/update.py b/poetry/console/commands/self/update.py index 797c64c4fec..663e1e1eb0b 100644 --- a/poetry/console/commands/self/update.py +++ b/poetry/console/commands/self/update.py @@ -54,7 +54,7 @@ def lib_backup(self): def handle(self): from poetry.__version__ import __version__ from poetry.repositories.pypi_repository import PyPiRepository - from poetry_core.semver import Version + from poetry.core.semver import Version from poetry.utils._compat import Path current = Path(__file__) diff --git a/poetry/console/commands/show.py b/poetry/console/commands/show.py index 9148496f00d..24caae800bf 100644 --- a/poetry/console/commands/show.py +++ b/poetry/console/commands/show.py @@ -35,7 +35,7 @@ class ShowCommand(EnvCommand): def handle(self): from clikit.utils.terminal import Terminal from poetry.repositories.installed_repository import InstalledRepository - from poetry_core.semver import Version + from poetry.core.semver import Version package = self.argument("package") @@ -347,7 +347,7 @@ def find_latest_package(self, package, include_dev): return selector.find_best_candidate(name, ">={}".format(package.pretty_version)) def get_update_status(self, latest, package): - from poetry_core.semver import parse_constraint + from poetry.core.semver import parse_constraint if latest.full_pretty_version == package.full_pretty_version: return "up-to-date" diff --git a/poetry/console/commands/version.py b/poetry/console/commands/version.py index b6f15c9bbe3..d188f90f634 100644 --- a/poetry/console/commands/version.py +++ b/poetry/console/commands/version.py @@ -65,7 +65,7 @@ def handle(self): ) def increment_version(self, version, rule): - from poetry_core.semver import Version + from poetry.core.semver import Version try: version = Version.parse(version) diff --git a/poetry/factory.py b/poetry/factory.py index aee7bcff14b..48cac9809da 100644 --- a/poetry/factory.py +++ b/poetry/factory.py @@ -5,8 +5,9 @@ from typing import Optional from clikit.api.io.io import IO -from poetry_core.factory import Factory as BaseFactory -from poetry_core.utils.toml_file import TomlFile + +from poetry.core.factory import Factory as BaseFactory +from poetry.core.utils.toml_file import TomlFile from .config.config import Config from .config.file_config_source import FileConfigSource diff --git a/poetry/installation/installer.py b/poetry/installation/installer.py index e68cdd4d48b..f506e111949 100644 --- a/poetry/installation/installer.py +++ b/poetry/installation/installer.py @@ -3,9 +3,9 @@ from clikit.api.io import IO from clikit.io import NullIO -from poetry_core.packages.package import Package -from poetry_core.semver import parse_constraint +from poetry.core.packages.package import Package +from poetry.core.semver import parse_constraint from poetry.packages import Locker from poetry.puzzle import Solver from poetry.puzzle.operations import Install diff --git a/poetry/installation/pip_installer.py b/poetry/installation/pip_installer.py index 999cf39e735..f075ee3b564 100644 --- a/poetry/installation/pip_installer.py +++ b/poetry/installation/pip_installer.py @@ -176,7 +176,7 @@ def create_temporary_requirement(self, package): return name def install_directory(self, package): - from poetry_core.masonry.builder import SdistBuilder + from poetry.core.masonry.builder import SdistBuilder from poetry.factory import Factory from poetry.utils._compat import decode from poetry.utils.env import NullEnv @@ -229,8 +229,8 @@ def install_directory(self, package): os.remove(setup) def install_git(self, package): - from poetry_core.packages import Package - from poetry_core.vcs import Git + from poetry.core.packages import Package + from poetry.core.vcs import Git src_dir = self._env.path / "src" / package.name if src_dir.exists(): diff --git a/poetry/layouts/layout.py b/poetry/layouts/layout.py index 804583388d9..a7378c67c4c 100644 --- a/poetry/layouts/layout.py +++ b/poetry/layouts/layout.py @@ -38,7 +38,7 @@ def test_version(): [tool.poetry.dev-dependencies] """ -BUILD_SYSTEM_MIN_VERSION = "1.0.0" +BUILD_SYSTEM_MIN_VERSION = "1.0.0a5" BUILD_SYSTEM_MAX_VERSION = None @@ -109,8 +109,8 @@ def generate_poetry_content(self): if BUILD_SYSTEM_MAX_VERSION is not None: build_system_version += ",<" + BUILD_SYSTEM_MAX_VERSION - build_system.add("requires", ["poetry_core" + build_system_version]) - build_system.add("build-backend", "poetry_core.masonry.api") + build_system.add("requires", ["poetry-core" + build_system_version]) + build_system.add("build-backend", "poetry.core.masonry.api") content.add("build-system", build_system) diff --git a/poetry/masonry/api.py b/poetry/masonry/api.py index 9239d91ba9e..417def2c834 100644 --- a/poetry/masonry/api.py +++ b/poetry/masonry/api.py @@ -1,8 +1,8 @@ -from poetry_core.masonry.api import build_sdist -from poetry_core.masonry.api import build_wheel -from poetry_core.masonry.api import get_requires_for_build_sdist -from poetry_core.masonry.api import get_requires_for_build_wheel -from poetry_core.masonry.api import prepare_metadata_for_build_wheel +from poetry.core.masonry.api import build_sdist +from poetry.core.masonry.api import build_wheel +from poetry.core.masonry.api import get_requires_for_build_sdist +from poetry.core.masonry.api import get_requires_for_build_wheel +from poetry.core.masonry.api import prepare_metadata_for_build_wheel __all__ = [ diff --git a/poetry/masonry/builders/editable.py b/poetry/masonry/builders/editable.py index 515f35ae187..e6924c574ff 100644 --- a/poetry/masonry/builders/editable.py +++ b/poetry/masonry/builders/editable.py @@ -5,10 +5,9 @@ from collections import defaultdict -from poetry_core.masonry.builders.builder import Builder -from poetry_core.masonry.builders.sdist import SdistBuilder -from poetry_core.semver.version import Version - +from poetry.core.masonry.builders.builder import Builder +from poetry.core.masonry.builders.sdist import SdistBuilder +from poetry.core.semver.version import Version from poetry.utils._compat import decode diff --git a/poetry/mixology/partial_solution.py b/poetry/mixology/partial_solution.py index f29ef392c09..34c3231e2bc 100644 --- a/poetry/mixology/partial_solution.py +++ b/poetry/mixology/partial_solution.py @@ -2,8 +2,8 @@ from typing import Dict from typing import List -from poetry_core.packages import Dependency -from poetry_core.packages import Package +from poetry.core.packages import Dependency +from poetry.core.packages import Package from .assignment import Assignment from .incompatibility import Incompatibility diff --git a/poetry/mixology/term.py b/poetry/mixology/term.py index 1378b1056b8..346c9431abb 100644 --- a/poetry/mixology/term.py +++ b/poetry/mixology/term.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from typing import Union -from poetry_core.packages import Dependency +from poetry.core.packages import Dependency from .set_relation import SetRelation diff --git a/poetry/mixology/version_solver.py b/poetry/mixology/version_solver.py index 594e1dd78f1..bd6d5c73f01 100644 --- a/poetry/mixology/version_solver.py +++ b/poetry/mixology/version_solver.py @@ -6,12 +6,11 @@ from typing import List from typing import Union -from poetry_core.packages import Dependency -from poetry_core.packages import Package -from poetry_core.packages import ProjectPackage -from poetry_core.semver import Version -from poetry_core.semver import VersionRange - +from poetry.core.packages import Dependency +from poetry.core.packages import Package +from poetry.core.packages import ProjectPackage +from poetry.core.semver import Version +from poetry.core.semver import VersionRange from poetry.puzzle.provider import Provider from .failure import SolveFailure diff --git a/poetry/packages/locker.py b/poetry/packages/locker.py index 929ea2c1f10..aa18310f1ec 100644 --- a/poetry/packages/locker.py +++ b/poetry/packages/locker.py @@ -4,9 +4,6 @@ from hashlib import sha256 from typing import List -from poetry_core.packages.package import Dependency -from poetry_core.packages.package import Package -from poetry_core.version.markers import parse_marker from tomlkit import document from tomlkit import inline_table from tomlkit import item @@ -15,6 +12,9 @@ import poetry.repositories +from poetry.core.packages.package import Dependency +from poetry.core.packages.package import Package +from poetry.core.version.markers import parse_marker from poetry.utils._compat import Path from poetry.utils.toml_file import TomlFile diff --git a/poetry/poetry.py b/poetry/poetry.py index bb610da78db..4878f0a22aa 100644 --- a/poetry/poetry.py +++ b/poetry/poetry.py @@ -1,8 +1,8 @@ from __future__ import absolute_import from __future__ import unicode_literals -from poetry_core.packages import ProjectPackage -from poetry_core.poetry import Poetry as BasePoetry +from poetry.core.packages import ProjectPackage +from poetry.core.poetry import Poetry as BasePoetry from .__version__ import __version__ from .config.config import Config diff --git a/poetry/publishing/uploader.py b/poetry/publishing/uploader.py index abe3919cd76..5c5ffad912f 100644 --- a/poetry/publishing/uploader.py +++ b/poetry/publishing/uploader.py @@ -7,9 +7,6 @@ import requests -from poetry_core.masonry.metadata import Metadata -from poetry_core.masonry.utils.helpers import escape_name -from poetry_core.masonry.utils.helpers import escape_version from requests import adapters from requests.exceptions import HTTPError from requests.packages.urllib3 import util @@ -18,6 +15,9 @@ from requests_toolbelt.multipart import MultipartEncoderMonitor from poetry.__version__ import __version__ +from poetry.core.masonry.metadata import Metadata +from poetry.core.masonry.utils.helpers import escape_name +from poetry.core.masonry.utils.helpers import escape_version from poetry.utils._compat import Path from poetry.utils.helpers import normalize_version from poetry.utils.patterns import wheel_file_re diff --git a/poetry/puzzle/provider.py b/poetry/puzzle/provider.py index 9a02c59d06e..fa87f2ef09f 100644 --- a/poetry/puzzle/provider.py +++ b/poetry/puzzle/provider.py @@ -13,17 +13,17 @@ import pkginfo from clikit.ui.components import ProgressIndicator -from poetry_core.packages import Dependency -from poetry_core.packages import DirectoryDependency -from poetry_core.packages import FileDependency -from poetry_core.packages import Package -from poetry_core.packages import URLDependency -from poetry_core.packages import VCSDependency -from poetry_core.packages import dependency_from_pep_508 -from poetry_core.packages.utils.utils import get_python_constraint_from_marker -from poetry_core.vcs.git import Git -from poetry_core.version.markers import MarkerUnion +from poetry.core.packages import Dependency +from poetry.core.packages import DirectoryDependency +from poetry.core.packages import FileDependency +from poetry.core.packages import Package +from poetry.core.packages import URLDependency +from poetry.core.packages import VCSDependency +from poetry.core.packages import dependency_from_pep_508 +from poetry.core.packages.utils.utils import get_python_constraint_from_marker +from poetry.core.vcs.git import Git +from poetry.core.version.markers import MarkerUnion from poetry.factory import Factory from poetry.mixology.incompatibility import Incompatibility from poetry.mixology.incompatibility_cause import DependencyCause diff --git a/poetry/puzzle/solver.py b/poetry/puzzle/solver.py index 1835d46c5ec..1429ea55bba 100644 --- a/poetry/puzzle/solver.py +++ b/poetry/puzzle/solver.py @@ -4,10 +4,9 @@ from typing import Dict from typing import List -from poetry_core.packages import Package -from poetry_core.semver import parse_constraint -from poetry_core.version.markers import AnyMarker - +from poetry.core.packages import Package +from poetry.core.semver import parse_constraint +from poetry.core.version.markers import AnyMarker from poetry.mixology import resolve_version from poetry.mixology.failure import SolveFailure from poetry.packages import DependencyPackage @@ -57,7 +56,7 @@ def solve(self, use_latest=None): # type: (...) -> List[Operation] installed = True if pkg.source_type == "git" and package.source_type == "git": - from poetry_core.vcs.git import Git + from poetry.core.vcs.git import Git # Trying to find the currently installed version pkg_source_url = Git.normalize_url(pkg.source_url) diff --git a/poetry/repositories/installed_repository.py b/poetry/repositories/installed_repository.py index 3f29d7f9788..74a6af5cce6 100644 --- a/poetry/repositories/installed_repository.py +++ b/poetry/repositories/installed_repository.py @@ -1,6 +1,4 @@ -from poetry_core.packages import Package - -from poetry import _CURRENT_VENDOR +from poetry.core.packages import Package from poetry.utils._compat import Path from poetry.utils._compat import metadata from poetry.utils.env import Env @@ -8,6 +6,9 @@ from .repository import Repository +_VENDORS = Path(__file__).parent.parent.joinpath("_vendor") + + class InstalledRepository(Repository): @classmethod def load(cls, env): # type: (Env) -> InstalledRepository @@ -33,7 +34,7 @@ def load(cls, env): # type: (Env) -> InstalledRepository continue try: - path.relative_to(_CURRENT_VENDOR) + path.relative_to(_VENDORS) except ValueError: pass else: @@ -59,7 +60,7 @@ def load(cls, env): # type: (Env) -> InstalledRepository try: path.relative_to(src_path) - from poetry_core.vcs.git import Git + from poetry.core.vcs.git import Git git = Git() revision = git.rev_parse("HEAD", src_path / package.name).strip() diff --git a/poetry/repositories/legacy_repository.py b/poetry/repositories/legacy_repository.py index 2f5232d4501..c441d17817c 100644 --- a/poetry/repositories/legacy_repository.py +++ b/poetry/repositories/legacy_repository.py @@ -12,15 +12,15 @@ from cachecontrol import CacheControl from cachecontrol.caches.file_cache import FileCache from cachy import CacheManager -from poetry_core.packages import Package -from poetry_core.packages import dependency_from_pep_508 -from poetry_core.packages.utils.link import Link -from poetry_core.semver import Version -from poetry_core.semver import VersionConstraint -from poetry_core.semver import VersionRange -from poetry_core.semver import parse_constraint -from poetry_core.version.markers import InvalidMarker +from poetry.core.packages import Package +from poetry.core.packages import dependency_from_pep_508 +from poetry.core.packages.utils.link import Link +from poetry.core.semver import Version +from poetry.core.semver import VersionConstraint +from poetry.core.semver import VersionRange +from poetry.core.semver import parse_constraint +from poetry.core.version.markers import InvalidMarker from poetry.locations import REPOSITORY_CACHE_DIR from poetry.utils._compat import Path from poetry.utils.helpers import canonicalize_name diff --git a/poetry/repositories/pypi_repository.py b/poetry/repositories/pypi_repository.py index 5590c35395e..76b37daf5bb 100644 --- a/poetry/repositories/pypi_repository.py +++ b/poetry/repositories/pypi_repository.py @@ -11,19 +11,19 @@ from cachecontrol.controller import logger as cache_control_logger from cachy import CacheManager from html5lib.html5parser import parse -from poetry_core.packages import Package -from poetry_core.packages import dependency_from_pep_508 -from poetry_core.packages.utils.link import Link -from poetry_core.semver import VersionConstraint -from poetry_core.semver import VersionRange -from poetry_core.semver import parse_constraint -from poetry_core.semver.exceptions import ParseVersionError -from poetry_core.version.markers import InvalidMarker -from poetry_core.version.markers import parse_marker from requests import get from requests import session from requests.exceptions import TooManyRedirects +from poetry.core.packages import Package +from poetry.core.packages import dependency_from_pep_508 +from poetry.core.packages.utils.link import Link +from poetry.core.semver import VersionConstraint +from poetry.core.semver import VersionRange +from poetry.core.semver import parse_constraint +from poetry.core.semver.exceptions import ParseVersionError +from poetry.core.version.markers import InvalidMarker +from poetry.core.version.markers import parse_marker from poetry.locations import REPOSITORY_CACHE_DIR from poetry.utils._compat import Path from poetry.utils._compat import to_str diff --git a/poetry/repositories/repository.py b/poetry/repositories/repository.py index d816c6c23ba..00b43207d62 100644 --- a/poetry/repositories/repository.py +++ b/poetry/repositories/repository.py @@ -1,6 +1,6 @@ -from poetry_core.semver import VersionConstraint -from poetry_core.semver import VersionRange -from poetry_core.semver import parse_constraint +from poetry.core.semver import VersionConstraint +from poetry.core.semver import VersionRange +from poetry.core.semver import parse_constraint from .base_repository import BaseRepository diff --git a/poetry/utils/env.py b/poetry/utils/env.py index 307639b8076..2cfe507de6e 100644 --- a/poetry/utils/env.py +++ b/poetry/utils/env.py @@ -19,10 +19,10 @@ import tomlkit from clikit.api.io import IO -from poetry_core.semver import parse_constraint -from poetry_core.semver.version import Version -from poetry_core.version.markers import BaseMarker +from poetry.core.semver import parse_constraint +from poetry.core.semver.version import Version +from poetry.core.version.markers import BaseMarker from poetry.locations import CACHE_DIR from poetry.poetry import Poetry from poetry.utils._compat import CalledProcessError diff --git a/poetry/utils/exporter.py b/poetry/utils/exporter.py index edf241d4ffe..b1ca0f8d87f 100644 --- a/poetry/utils/exporter.py +++ b/poetry/utils/exporter.py @@ -1,11 +1,11 @@ from typing import Union from clikit.api.io import IO -from poetry_core.packages.directory_dependency import DirectoryDependency -from poetry_core.packages.file_dependency import FileDependency -from poetry_core.packages.url_dependency import URLDependency -from poetry_core.packages.vcs_dependency import VCSDependency +from poetry.core.packages.directory_dependency import DirectoryDependency +from poetry.core.packages.file_dependency import FileDependency +from poetry.core.packages.url_dependency import URLDependency +from poetry.core.packages.vcs_dependency import VCSDependency from poetry.poetry import Poetry from poetry.utils._compat import Path from poetry.utils._compat import decode diff --git a/poetry/utils/extras.py b/poetry/utils/extras.py index 414691aa596..32b02ee9b00 100644 --- a/poetry/utils/extras.py +++ b/poetry/utils/extras.py @@ -3,8 +3,7 @@ from typing import Mapping from typing import Sequence -from poetry_core.packages import Package - +from poetry.core.packages import Package from poetry.utils.helpers import canonicalize_name diff --git a/poetry/utils/helpers.py b/poetry/utils/helpers.py index 15b3941be12..7b9af3814ca 100644 --- a/poetry/utils/helpers.py +++ b/poetry/utils/helpers.py @@ -8,9 +8,8 @@ from typing import List from typing import Optional -from poetry_core.version import Version - from poetry.config.config import Config +from poetry.core.version import Version from poetry.utils._compat import Path diff --git a/poetry/version/version_selector.py b/poetry/version/version_selector.py index e913e68cfec..8cf02c7cbed 100644 --- a/poetry/version/version_selector.py +++ b/poetry/version/version_selector.py @@ -1,9 +1,9 @@ from typing import Union -from poetry_core.packages import Dependency -from poetry_core.packages import Package -from poetry_core.semver import Version -from poetry_core.semver import parse_constraint +from poetry.core.packages import Dependency +from poetry.core.packages import Package +from poetry.core.semver import Version +from poetry.core.semver import parse_constraint class VersionSelector(object): diff --git a/pyproject.toml b/pyproject.toml index be6ebf8d1b0..2b1940a3f65 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ classifiers = [ # Requirements [tool.poetry.dependencies] python = "~2.7 || ^3.5" -poetry-core = "^1.0.0a3" +poetry-core = "^1.0.0a5" cleo = "^0.7.6" clikit = "^0.4.3" requests = "^2.18" @@ -75,8 +75,8 @@ poetry = "poetry.console:main" [build-system] -requires = ["poetry_core>=1.0.0a3"] -build-backend = "poetry_core.masonry.api" +requires = ["poetry-core>=1.0.0a3"] +build-backend = "poetry.core.masonry.api" [tool.isort] diff --git a/sonnet b/sonnet index 61f12ea246f..1d32cfbaa6e 100755 --- a/sonnet +++ b/sonnet @@ -25,7 +25,6 @@ class MakeReleaseCommand(Command): PYTHON = { "2.7": "python2.7", - "3.4": "python3.4", "3.5": "python3.5", "3.6": "python3.6", "3.7": "python3.7", @@ -47,7 +46,8 @@ class MakeReleaseCommand(Command): self.check_system(pythons) - from poetry import __version__ + from poetry.__version__ import __version__ + from poetry.core.vcs import get_vcs from poetry.factory import Factory from poetry.puzzle import Solver from poetry.repositories.pool import Pool @@ -59,7 +59,6 @@ class MakeReleaseCommand(Command): from poetry.utils.env import GET_BASE_PREFIX from poetry.utils.env import VirtualEnv from poetry.utils.helpers import temporary_directory - from poetry_core.vcs import get_vcs project = Factory().create_poetry(Path.cwd()) package = project.package diff --git a/tests/conftest.py b/tests/conftest.py index 96e1c73b854..c70923321b0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -87,9 +87,9 @@ def environ(): @pytest.fixture(autouse=True) def git_mock(mocker): # Patch git module to not actually clone projects - mocker.patch("poetry_core.vcs.git.Git.clone", new=mock_clone) - mocker.patch("poetry_core.vcs.git.Git.checkout", new=lambda *_: None) - p = mocker.patch("poetry_core.vcs.git.Git.rev_parse") + mocker.patch("poetry.core.vcs.git.Git.clone", new=mock_clone) + mocker.patch("poetry.core.vcs.git.Git.checkout", new=lambda *_: None) + p = mocker.patch("poetry.core.vcs.git.Git.rev_parse") p.return_value = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24" diff --git a/tests/console/commands/env/test_use.py b/tests/console/commands/env/test_use.py index 48fafb91e8f..ac042c93b05 100644 --- a/tests/console/commands/env/test_use.py +++ b/tests/console/commands/env/test_use.py @@ -5,8 +5,8 @@ import tomlkit from cleo.testers import CommandTester -from poetry_core.semver import Version +from poetry.core.semver import Version from poetry.utils._compat import Path from poetry.utils.env import EnvManager from poetry.utils.env import MockEnv diff --git a/tests/console/commands/test_add.py b/tests/console/commands/test_add.py index bfd997533b7..a0b8d3c22dd 100644 --- a/tests/console/commands/test_add.py +++ b/tests/console/commands/test_add.py @@ -3,8 +3,8 @@ import pytest from cleo.testers import CommandTester -from poetry_core.semver import Version +from poetry.core.semver import Version from poetry.repositories.legacy_repository import LegacyRepository from poetry.utils._compat import Path from tests.helpers import get_dependency diff --git a/tests/console/conftest.py b/tests/console/conftest.py index 14ab7b9852e..16555c54f2b 100644 --- a/tests/console/conftest.py +++ b/tests/console/conftest.py @@ -49,9 +49,9 @@ def setup(mocker, installer, installed, config, env): p.return_value = installed # Patch git module to not actually clone projects - mocker.patch("poetry_core.vcs.git.Git.clone", new=mock_clone) - mocker.patch("poetry_core.vcs.git.Git.checkout", new=lambda *_: None) - p = mocker.patch("poetry_core.vcs.git.Git.rev_parse") + mocker.patch("poetry.core.vcs.git.Git.clone", new=mock_clone) + mocker.patch("poetry.core.vcs.git.Git.checkout", new=lambda *_: None) + p = mocker.patch("poetry.core.vcs.git.Git.rev_parse") p.return_value = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24" # Patch download to not download anything but to just copy from fixtures diff --git a/tests/helpers.py b/tests/helpers.py index d58892a09e4..d9575be8e32 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -1,10 +1,9 @@ import os import shutil -from poetry_core.packages import Dependency -from poetry_core.packages import Package -from poetry_core.vcs.git import ParsedUrl - +from poetry.core.packages import Dependency +from poetry.core.packages import Package +from poetry.core.vcs.git import ParsedUrl from poetry.utils._compat import PY2 from poetry.utils._compat import WINDOWS from poetry.utils._compat import Path diff --git a/tests/installation/test_installer.py b/tests/installation/test_installer.py index dac1ed7ce41..dadbb6be82b 100644 --- a/tests/installation/test_installer.py +++ b/tests/installation/test_installer.py @@ -5,8 +5,8 @@ import pytest from clikit.io import NullIO -from poetry_core.packages import ProjectPackage +from poetry.core.packages import ProjectPackage from poetry.installation import Installer as BaseInstaller from poetry.installation.noop_installer import NoopInstaller from poetry.packages import Locker as BaseLocker diff --git a/tests/installation/test_pip_installer.py b/tests/installation/test_pip_installer.py index 9bdce414099..f3cf376ff39 100644 --- a/tests/installation/test_pip_installer.py +++ b/tests/installation/test_pip_installer.py @@ -1,7 +1,6 @@ import pytest -from poetry_core.packages.package import Package - +from poetry.core.packages.package import Package from poetry.installation.pip_installer import PipInstaller from poetry.io.null_io import NullIO from poetry.repositories.legacy_repository import LegacyRepository diff --git a/tests/mixology/helpers.py b/tests/mixology/helpers.py index 053909d2935..05ab493f79a 100644 --- a/tests/mixology/helpers.py +++ b/tests/mixology/helpers.py @@ -1,5 +1,4 @@ -from poetry_core.packages import Package - +from poetry.core.packages import Package from poetry.mixology.failure import SolveFailure from poetry.mixology.version_solver import VersionSolver from poetry.packages import DependencyPackage diff --git a/tests/mixology/version_solver/conftest.py b/tests/mixology/version_solver/conftest.py index 44ea83dd8f8..0b605d31f6b 100644 --- a/tests/mixology/version_solver/conftest.py +++ b/tests/mixology/version_solver/conftest.py @@ -1,8 +1,8 @@ import pytest from clikit.io import NullIO -from poetry_core.packages.project_package import ProjectPackage +from poetry.core.packages.project_package import ProjectPackage from poetry.puzzle.provider import Provider from poetry.repositories import Pool from poetry.repositories import Repository diff --git a/tests/packages/test_locker.py b/tests/packages/test_locker.py index 0d72a49bfef..7d41df3ca41 100644 --- a/tests/packages/test_locker.py +++ b/tests/packages/test_locker.py @@ -3,8 +3,7 @@ import pytest import tomlkit -from poetry_core.packages.project_package import ProjectPackage - +from poetry.core.packages.project_package import ProjectPackage from poetry.packages.locker import Locker from ..helpers import get_dependency diff --git a/tests/puzzle/conftest.py b/tests/puzzle/conftest.py index efc11ae489b..e3812530bf5 100644 --- a/tests/puzzle/conftest.py +++ b/tests/puzzle/conftest.py @@ -30,9 +30,9 @@ def mock_clone(self, source, dest): @pytest.fixture(autouse=True) def setup(mocker): # Patch git module to not actually clone projects - mocker.patch("poetry_core.vcs.git.Git.clone", new=mock_clone) - mocker.patch("poetry_core.vcs.git.Git.checkout", new=lambda *_: None) - p = mocker.patch("poetry_core.vcs.git.Git.rev_parse") + mocker.patch("poetry.core.vcs.git.Git.clone", new=mock_clone) + mocker.patch("poetry.core.vcs.git.Git.checkout", new=lambda *_: None) + p = mocker.patch("poetry.core.vcs.git.Git.rev_parse") p.return_value = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24" yield diff --git a/tests/puzzle/test_provider.py b/tests/puzzle/test_provider.py index 8e58f71402f..ebbd7a984d6 100644 --- a/tests/puzzle/test_provider.py +++ b/tests/puzzle/test_provider.py @@ -3,11 +3,11 @@ import pytest from clikit.io import NullIO -from poetry_core.packages import ProjectPackage -from poetry_core.packages.directory_dependency import DirectoryDependency -from poetry_core.packages.file_dependency import FileDependency -from poetry_core.packages.vcs_dependency import VCSDependency +from poetry.core.packages import ProjectPackage +from poetry.core.packages.directory_dependency import DirectoryDependency +from poetry.core.packages.file_dependency import FileDependency +from poetry.core.packages.vcs_dependency import VCSDependency from poetry.puzzle.provider import Provider from poetry.repositories.pool import Pool from poetry.repositories.repository import Repository diff --git a/tests/puzzle/test_solver.py b/tests/puzzle/test_solver.py index e10eadba7d8..dd5fc98a331 100644 --- a/tests/puzzle/test_solver.py +++ b/tests/puzzle/test_solver.py @@ -1,10 +1,10 @@ import pytest from clikit.io import NullIO -from poetry_core.packages import ProjectPackage -from poetry_core.packages import dependency_from_pep_508 -from poetry_core.version.markers import parse_marker +from poetry.core.packages import ProjectPackage +from poetry.core.packages import dependency_from_pep_508 +from poetry.core.version.markers import parse_marker from poetry.puzzle import Solver from poetry.puzzle.exceptions import SolverProblemError from poetry.repositories.installed_repository import InstalledRepository diff --git a/tests/repositories/test_installed_repository.py b/tests/repositories/test_installed_repository.py index 2c5b70f5a26..c35ad49df4a 100644 --- a/tests/repositories/test_installed_repository.py +++ b/tests/repositories/test_installed_repository.py @@ -32,19 +32,17 @@ def test_load(mocker): return_value=INSTALLED_RESULTS, ) mocker.patch( - "poetry_core.vcs.git.Git.rev_parse", + "poetry.core.vcs.git.Git.rev_parse", return_value="bb058f6b78b2d28ef5d9a5e759cfa179a1a713d6", ) mocker.patch( - "poetry_core.vcs.git.Git.remote_urls", + "poetry.core.vcs.git.Git.remote_urls", side_effect=[ {"remote.origin.url": "https://github.com/sdispater/pendulum.git"}, {"remote.origin.url": "git@github.com:sdispater/pendulum.git"}, ], ) - mocker.patch( - "poetry.repositories.installed_repository._CURRENT_VENDOR", str(VENDOR_DIR) - ) + mocker.patch("poetry.repositories.installed_repository._VENDORS", str(VENDOR_DIR)) repository = InstalledRepository.load(MockEnv(path=ENV_DIR)) assert len(repository.packages) == 3 diff --git a/tests/repositories/test_legacy_repository.py b/tests/repositories/test_legacy_repository.py index 00570ae2ecc..7489947fee6 100644 --- a/tests/repositories/test_legacy_repository.py +++ b/tests/repositories/test_legacy_repository.py @@ -2,8 +2,7 @@ import pytest -from poetry_core.packages import Dependency - +from poetry.core.packages import Dependency from poetry.repositories.auth import Auth from poetry.repositories.exceptions import PackageNotFound from poetry.repositories.legacy_repository import LegacyRepository diff --git a/tests/repositories/test_pypi_repository.py b/tests/repositories/test_pypi_repository.py index 0c9b5e1c989..be522bdb375 100644 --- a/tests/repositories/test_pypi_repository.py +++ b/tests/repositories/test_pypi_repository.py @@ -5,10 +5,10 @@ import pytest -from poetry_core.packages import Dependency from requests.exceptions import TooManyRedirects from requests.models import Response +from poetry.core.packages import Dependency from poetry.repositories.pypi_repository import PyPiRepository from poetry.utils._compat import PY35 from poetry.utils._compat import Path diff --git a/tests/utils/test_env.py b/tests/utils/test_env.py index ed70b6c03f8..98d8e96700e 100644 --- a/tests/utils/test_env.py +++ b/tests/utils/test_env.py @@ -6,8 +6,8 @@ import tomlkit from clikit.io import NullIO -from poetry_core.semver import Version +from poetry.core.semver import Version from poetry.factory import Factory from poetry.utils._compat import WINDOWS from poetry.utils._compat import Path diff --git a/tests/utils/test_extras.py b/tests/utils/test_extras.py index 5d6f450f8e7..424ccc5ee9e 100644 --- a/tests/utils/test_extras.py +++ b/tests/utils/test_extras.py @@ -1,7 +1,6 @@ import pytest -from poetry_core.packages import Package - +from poetry.core.packages import Package from poetry.utils.extras import get_extra_package_names