chore: update poetry-core to 1.3 and fix deprecations

radoering · neersighted · commit 67c505d860cd · 2022-10-06T15:31:41.000-06:00
(cherry picked from commit 1215ba8)
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -44,7 +44,7 @@ generate-setup-file = false
 [tool.poetry.dependencies]
 python = "^3.7"
 
-poetry-core = "1.2.0"
+poetry-core = "1.3.1"
 poetry-plugin-export = "^1.1.1"
 "backports.cached-property" = { version = "^1.0.2", python = "<3.8" }
 cachecontrol = { version = "^0.12.9", extras = ["filecache"] }
@@ -77,8 +77,6 @@ tox = "^3.18"
 pre-commit = "^2.6"
 
 [tool.poetry.group.test.dependencies]
-# TODO: remove when bumping poetry-core to 1.3
-poetry-core = { git = "https://github.com/finswimmer/core.git", branch = "fix/available-pythons" }
 deepdiff = "^5.0"
 flatdict = "^4.0.1"
 httpretty = "^1.0"
diff --git a/src/poetry/console/commands/add.py b/src/poetry/console/commands/add.py
@@ -95,7 +95,7 @@ class AddCommand(InstallerCommand, InitCommand):
     loggers = ["poetry.repositories.pypi_repository", "poetry.inspection.info"]
 
     def handle(self) -> int:
-        from poetry.core.semver.helpers import parse_constraint
+        from poetry.core.constraints.version import parse_constraint
         from tomlkit import inline_table
         from tomlkit import parse as parse_toml
         from tomlkit import table
diff --git a/src/poetry/console/commands/self/add.py b/src/poetry/console/commands/self/add.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 
 from poetry.__version__ import __version__
 from poetry.console.commands.add import AddCommand
diff --git a/src/poetry/console/commands/show.py b/src/poetry/console/commands/show.py
@@ -516,7 +516,7 @@ def find_latest_package(
         return selector.find_best_candidate(name, f">={package.pretty_version}")
 
     def get_update_status(self, latest: Package, package: Package) -> str:
-        from poetry.core.semver.helpers import parse_constraint
+        from poetry.core.constraints.version import parse_constraint
 
         if latest.full_pretty_version == package.full_pretty_version:
             return "up-to-date"
diff --git a/src/poetry/console/commands/version.py b/src/poetry/console/commands/version.py
@@ -11,7 +11,7 @@
 
 
 if TYPE_CHECKING:
-    from poetry.core.semver.version import Version
+    from poetry.core.constraints.version import Version
 
 
 class VersionCommand(Command):
@@ -91,7 +91,7 @@ def handle(self) -> int:
         return 0
 
     def increment_version(self, version: str, rule: str) -> Version:
-        from poetry.core.semver.version import Version
+        from poetry.core.constraints.version import Version
 
         try:
             parsed = Version.parse(version)
diff --git a/src/poetry/installation/chooser.py b/src/poetry/installation/chooser.py
@@ -14,9 +14,9 @@
 
 
 if TYPE_CHECKING:
+    from poetry.core.constraints.version import Version
     from poetry.core.packages.package import Package
     from poetry.core.packages.utils.link import Link
-    from poetry.core.semver.version import Version
 
     from poetry.repositories.pool import Pool
     from poetry.utils.env import Env
diff --git a/src/poetry/installation/pip_installer.py b/src/poetry/installation/pip_installer.py
@@ -9,8 +9,8 @@
 from typing import TYPE_CHECKING
 from typing import Any
 
+from poetry.core.constraints.version import Version
 from poetry.core.pyproject.toml import PyProjectTOML
-from poetry.core.semver.version import Version
 
 from poetry.installation.base_installer import BaseInstaller
 from poetry.repositories.http import HTTPRepository
diff --git a/src/poetry/masonry/builders/editable.py b/src/poetry/masonry/builders/editable.py
@@ -10,10 +10,10 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from poetry.core.constraints.version import Version
 from poetry.core.masonry.builders.builder import Builder
 from poetry.core.masonry.builders.sdist import SdistBuilder
 from poetry.core.masonry.utils.package_include import PackageInclude
-from poetry.core.semver.version import Version
 
 from poetry.utils._compat import WINDOWS
 from poetry.utils._compat import decode
diff --git a/src/poetry/mixology/failure.py b/src/poetry/mixology/failure.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 from typing import cast
 
-from poetry.core.semver.helpers import parse_constraint
+from poetry.core.constraints.version import parse_constraint
 
 from poetry.mixology.incompatibility_cause import ConflictCause
 from poetry.mixology.incompatibility_cause import PythonCause
diff --git a/src/poetry/mixology/solutions/solutions/python_requirement_solution.py b/src/poetry/mixology/solutions/solutions/python_requirement_solution.py
@@ -12,7 +12,7 @@
 
 class PythonRequirementSolution(Solution):  # type: ignore[misc]
     def __init__(self, exception: SolverProblemError) -> None:
-        from poetry.core.semver.helpers import parse_constraint
+        from poetry.core.constraints.version import parse_constraint
 
         from poetry.mixology.incompatibility_cause import PythonCause
 
diff --git a/src/poetry/mixology/term.py b/src/poetry/mixology/term.py
@@ -8,8 +8,8 @@
 
 
 if TYPE_CHECKING:
+    from poetry.core.constraints.version import VersionConstraint
     from poetry.core.packages.dependency import Dependency
-    from poetry.core.semver.version_constraint import VersionConstraint
 
 
 class Term:
diff --git a/src/poetry/packages/locker.py b/src/poetry/packages/locker.py
@@ -12,10 +12,10 @@
 from typing import cast
 
 from packaging.utils import canonicalize_name
+from poetry.core.constraints.version import Version
+from poetry.core.constraints.version import parse_constraint
 from poetry.core.packages.dependency import Dependency
 from poetry.core.packages.package import Package
-from poetry.core.semver.helpers import parse_constraint
-from poetry.core.semver.version import Version
 from poetry.core.toml.file import TOMLFile
 from poetry.core.version.markers import parse_marker
 from poetry.core.version.requirements import InvalidRequirement
diff --git a/src/poetry/publishing/uploader.py b/src/poetry/publishing/uploader.py
@@ -10,7 +10,7 @@
 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 distribution_name
 from requests import adapters
 from requests.exceptions import ConnectionError
 from requests.exceptions import HTTPError
@@ -79,9 +79,11 @@ def files(self) -> list[Path]:
         version = self._package.version.to_string()
 
         wheels = list(
-            dist.glob(f"{escape_name(self._package.pretty_name)}-{version}-*.whl")
+            dist.glob(f"{distribution_name(self._package.name)}-{version}-*.whl")
+        )
+        tars = list(
+            dist.glob(f"{distribution_name(self._package.name)}-{version}.tar.gz")
         )
-        tars = list(dist.glob(f"{self._package.pretty_name}-{version}.tar.gz"))
 
         return sorted(wheels + tars)
 
diff --git a/src/poetry/puzzle/provider.py b/src/poetry/puzzle/provider.py
@@ -15,9 +15,9 @@
 from typing import cast
 
 from cleo.ui.progress_indicator import ProgressIndicator
+from poetry.core.constraints.version import EmptyConstraint
+from poetry.core.constraints.version import Version
 from poetry.core.packages.utils.utils import get_python_constraint_from_marker
-from poetry.core.semver.empty_constraint import EmptyConstraint
-from poetry.core.semver.version import Version
 from poetry.core.version.markers import AnyMarker
 from poetry.core.version.markers import MarkerUnion
 
@@ -41,13 +41,13 @@
     from collections.abc import Iterator
 
     from cleo.io.io import IO
+    from poetry.core.constraints.version import VersionConstraint
     from poetry.core.packages.dependency import Dependency
     from poetry.core.packages.directory_dependency import DirectoryDependency
     from poetry.core.packages.file_dependency import FileDependency
     from poetry.core.packages.package import Package
     from poetry.core.packages.url_dependency import URLDependency
     from poetry.core.packages.vcs_dependency import VCSDependency
-    from poetry.core.semver.version_constraint import VersionConstraint
     from poetry.core.version.markers import BaseMarker
 
     from poetry.repositories import Pool
diff --git a/src/poetry/repositories/cached.py b/src/poetry/repositories/cached.py
@@ -7,16 +7,16 @@
 
 from cachy import CacheManager
 from packaging.utils import canonicalize_name
-from poetry.core.semver.helpers import parse_constraint
+from poetry.core.constraints.version import parse_constraint
 
 from poetry.config.config import Config
 from poetry.repositories.repository import Repository
 
 
 if TYPE_CHECKING:
     from packaging.utils import NormalizedName
+    from poetry.core.constraints.version import Version
     from poetry.core.packages.package import Package
-    from poetry.core.semver.version import Version
 
     from poetry.inspection.info import PackageInfo
 
diff --git a/src/poetry/repositories/http.py b/src/poetry/repositories/http.py
@@ -13,9 +13,9 @@
 
 import requests
 
+from poetry.core.constraints.version import parse_constraint
 from poetry.core.packages.dependency import Dependency
 from poetry.core.packages.utils.link import Link
-from poetry.core.semver.helpers import parse_constraint
 from poetry.core.utils.helpers import temporary_directory
 from poetry.core.version.markers import parse_marker
 
diff --git a/src/poetry/repositories/legacy_repository.py b/src/poetry/repositories/legacy_repository.py
@@ -13,9 +13,9 @@
 
 if TYPE_CHECKING:
     from packaging.utils import NormalizedName
+    from poetry.core.constraints.version import Version
+    from poetry.core.constraints.version import VersionConstraint
     from poetry.core.packages.utils.link import Link
-    from poetry.core.semver.version import Version
-    from poetry.core.semver.version_constraint import VersionConstraint
 
     from poetry.config.config import Config
 
diff --git a/src/poetry/repositories/link_sources/base.py b/src/poetry/repositories/link_sources/base.py
@@ -8,8 +8,8 @@
 from typing import List
 
 from packaging.utils import canonicalize_name
+from poetry.core.constraints.version import Version
 from poetry.core.packages.package import Package
-from poetry.core.semver.version import Version
 
 from poetry.utils._compat import cached_property
 from poetry.utils.patterns import sdist_file_re
diff --git a/src/poetry/repositories/pool.py b/src/poetry/repositories/pool.py
@@ -7,9 +7,9 @@
 
 
 if TYPE_CHECKING:
+    from poetry.core.constraints.version import Version
     from poetry.core.packages.dependency import Dependency
     from poetry.core.packages.package import Package
-    from poetry.core.semver.version import Version
 
 
 class Pool(Repository):
diff --git a/src/poetry/repositories/pypi_repository.py b/src/poetry/repositories/pypi_repository.py
@@ -27,8 +27,8 @@
 
 if TYPE_CHECKING:
     from packaging.utils import NormalizedName
-    from poetry.core.semver.version import Version
-    from poetry.core.semver.version_constraint import VersionConstraint
+    from poetry.core.constraints.version import Version
+    from poetry.core.constraints.version import VersionConstraint
 
 SUPPORTED_PACKAGE_TYPES = {"sdist", "bdist_wheel"}
 
diff --git a/src/poetry/repositories/repository.py b/src/poetry/repositories/repository.py
@@ -5,10 +5,10 @@
 from typing import TYPE_CHECKING
 
 from packaging.utils import canonicalize_name
-from poetry.core.semver.helpers import parse_constraint
-from poetry.core.semver.version import Version
-from poetry.core.semver.version_constraint import VersionConstraint
-from poetry.core.semver.version_range import VersionRange
+from poetry.core.constraints.version import Version
+from poetry.core.constraints.version import VersionConstraint
+from poetry.core.constraints.version import VersionRange
+from poetry.core.constraints.version import parse_constraint
 
 from poetry.repositories.exceptions import PackageNotFound
 
diff --git a/src/poetry/utils/env.py b/src/poetry/utils/env.py
@@ -30,8 +30,8 @@
 from packaging.tags import interpreter_name
 from packaging.tags import interpreter_version
 from packaging.tags import sys_tags
-from poetry.core.semver.helpers import parse_constraint
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
+from poetry.core.constraints.version import parse_constraint
 from poetry.core.toml.file import TOMLFile
 from poetry.core.utils.helpers import temporary_directory
 from virtualenv.seed.wheels.embed import get_embed_wheel
diff --git a/src/poetry/utils/setup_reader.py b/src/poetry/utils/setup_reader.py
@@ -6,7 +6,7 @@
 from pathlib import Path
 from typing import Any
 
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 
 
 class SetupReader:
diff --git a/src/poetry/version/version_selector.py b/src/poetry/version/version_selector.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 
 
 if TYPE_CHECKING:
diff --git a/tests/console/commands/env/helpers.py b/tests/console/commands/env/helpers.py
@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 from typing import Any
 
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 
 
 if TYPE_CHECKING:
diff --git a/tests/console/commands/env/test_remove.py b/tests/console/commands/env/test_remove.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 
 from tests.console.commands.env.helpers import check_output_wrapper
 
diff --git a/tests/console/commands/env/test_use.py b/tests/console/commands/env/test_use.py
@@ -8,7 +8,7 @@
 import pytest
 import tomlkit
 
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 from poetry.core.toml.file import TOMLFile
 
 from poetry.utils.env import MockEnv
diff --git a/tests/console/commands/self/test_update.py b/tests/console/commands/self/test_update.py
@@ -5,8 +5,8 @@
 
 import pytest
 
+from poetry.core.constraints.version import Version
 from poetry.core.packages.package import Package
-from poetry.core.semver.version import Version
 
 from poetry.__version__ import __version__
 from poetry.factory import Factory
diff --git a/tests/console/commands/test_add.py b/tests/console/commands/test_add.py
@@ -7,7 +7,7 @@
 
 import pytest
 
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 
 from poetry.repositories.legacy_repository import LegacyRepository
 from tests.helpers import get_dependency
diff --git a/tests/console/commands/test_publish.py b/tests/console/commands/test_publish.py
diff --git a/tests/fixtures/simple_project/dist/simple_project-1.2.3.tar.gz b/tests/fixtures/simple_project/dist/simple_project-1.2.3.tar.gz
diff --git a/tests/helpers.py b/tests/helpers.py
diff --git a/tests/masonry/builders/test_editable_builder.py b/tests/masonry/builders/test_editable_builder.py
diff --git a/tests/packages/test_locker.py b/tests/packages/test_locker.py
diff --git a/tests/repositories/link_sources/test_base.py b/tests/repositories/link_sources/test_base.py
diff --git a/tests/repositories/link_sources/test_html.py b/tests/repositories/link_sources/test_html.py
diff --git a/tests/repositories/test_legacy_repository.py b/tests/repositories/test_legacy_repository.py
diff --git a/tests/repositories/test_pool.py b/tests/repositories/test_pool.py
diff --git a/tests/repositories/test_pypi_repository.py b/tests/repositories/test_pypi_repository.py
diff --git a/tests/repositories/test_repository.py b/tests/repositories/test_repository.py
diff --git a/tests/test_factory.py b/tests/test_factory.py
diff --git a/tests/utils/test_env.py b/tests/utils/test_env.py
