chore: update poetry-core to 1.3 and fix deprecations

poetry.lock

@@ -513,22 +513,15 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "poetry-core"
-version = "1.2.0"
+version = "1.3.1"
 description = "Poetry PEP 517 Build Backend"
 category = "main"
 optional = false
-python-versions = "^3.7"
-develop = false
+python-versions = ">=3.7,<4.0"
 
 [package.dependencies]
 importlib-metadata = {version = ">=1.7.0", markers = "python_version < \"3.8\""}
 
-[package.source]
-type = "git"
-url = "https://github.com/finswimmer/core.git"
-reference = "fix/available-pythons"
-resolved_reference = "5e133e5547949ec5e0c469dda9231cc850eb83bd"
-
 [[package]]
 name = "poetry-plugin-export"
 version = "1.1.1"
@@ -958,7 +951,7 @@ testing = ["func-timeout", "jaraco.itertools", "pytest (>=6)", "pytest-black (>=
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "c7bdae481aa10cd023f9e00b8fd737bae086a828b670f6899e98968bdd587d3c"
+content-hash = "1ebadc410b20420b0b570d94dc78220ae54ad814498b1c2fa3fb3cbd183a1413"
 
 [metadata.files]
 attrs = [
@@ -1366,7 +1359,10 @@ pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-poetry-core = []
+poetry-core = [
+    {file = "poetry-core-1.3.1.tar.gz", hash = "sha256:f4e68f596ba7560d41f67c705e160a0ed1a061c564cc1f989a5829aa64ea6279"},
+    {file = "poetry_core-1.3.1-py3-none-any.whl", hash = "sha256:da1018d30dcbed101865a24c2a79c60be3f9800e7c91721c6ec9d4bc9e210538"},
+]
 poetry-plugin-export = [
     {file = "poetry-plugin-export-1.1.1.tar.gz", hash = "sha256:23e3e512a609b54ef5ac441339fc9e68fd41e61d15bd924eb0094b4fda1e30d0"},
     {file = "poetry_plugin_export-1.1.1-py3-none-any.whl", hash = "sha256:170fa367794d2385975d75298fe5509f772d35216ee36b8fa50c0350a064b761"},

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 @@ urllib3 = "^1.26.0"
 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"

src/poetry/console/commands/add.py

@@ -95,7 +95,7 @@ The add command adds required packages to your <comment>pyproject.toml</> and in
     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

src/poetry/console/commands/self/add.py

 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

src/poetry/console/commands/show.py

@@ -533,7 +533,7 @@ lists all packages available."""
         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"

src/poetry/console/commands/version.py

@@ -11,7 +11,7 @@ from poetry.console.commands.command import Command
 
 
 if TYPE_CHECKING:
-    from poetry.core.semver.version import Version
+    from poetry.core.constraints.version import Version
 
 
 class VersionCommand(Command):
@@ -91,7 +91,7 @@ patch, minor, major, prepatch, preminor, premajor, prerelease.
         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)

src/poetry/installation/chooser.py

@@ -14,9 +14,9 @@ from poetry.utils.patterns import wheel_file_re
 
 
 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

src/poetry/installation/pip_installer.py

@@ -10,8 +10,8 @@ from subprocess import CalledProcessError
 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

src/poetry/masonry/builders/editable.py

@@ -10,10 +10,10 @@ from base64 import urlsafe_b64encode
 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

src/poetry/mixology/failure.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 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

src/poetry/mixology/solutions/solutions/python_requirement_solution.py

@@ -12,7 +12,7 @@ if TYPE_CHECKING:
 
 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
 

src/poetry/mixology/term.py

@@ -8,8 +8,8 @@ from poetry.mixology.set_relation import SetRelation
 
 
 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:

src/poetry/packages/locker.py

@@ -12,10 +12,10 @@ from typing import Any
 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

src/poetry/publishing/uploader.py

@@ -10,7 +10,7 @@ from typing import Any
 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 @@ class Uploader:
         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)
 

src/poetry/puzzle/provider.py

@@ -16,9 +16,9 @@ from typing import Collection
 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
 
@@ -43,13 +43,13 @@ if TYPE_CHECKING:
 
     from cleo.io.io import IO
     from packaging.utils import NormalizedName
+    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

src/poetry/repositories/cached.py

@@ -7,7 +7,7 @@ from typing import Any
 
 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
@@ -15,8 +15,8 @@ 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
 

src/poetry/repositories/http.py

@@ -13,9 +13,9 @@ from typing import Any
 
 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
 

src/poetry/repositories/legacy_repository.py

@@ -13,9 +13,9 @@ from poetry.repositories.link_sources.html import SimpleRepositoryPage
 
 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
 

src/poetry/repositories/link_sources/base.py

@@ -7,8 +7,8 @@ from typing import TYPE_CHECKING
 from typing import DefaultDict
 from typing import List
 
+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

src/poetry/repositories/pool.py

@@ -7,9 +7,9 @@ from poetry.repositories.repository import Repository
 
 
 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):

src/poetry/repositories/pypi_repository.py

@@ -27,8 +27,8 @@ logger = logging.getLogger(__name__)
 
 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"}
 

src/poetry/repositories/repository.py

@@ -5,18 +5,18 @@ import logging
 from typing import TYPE_CHECKING
 
 from packaging.utils import canonicalize_name
-from poetry.core.semver.version import Version
-from poetry.core.semver.version_range import VersionRange
+from poetry.core.constraints.version import Version
+from poetry.core.constraints.version import VersionRange
 
 from poetry.repositories.exceptions import PackageNotFound
 
 
 if TYPE_CHECKING:
     from packaging.utils import NormalizedName
+    from poetry.core.constraints.version import VersionConstraint
     from poetry.core.packages.dependency import Dependency
     from poetry.core.packages.package import Package
     from poetry.core.packages.utils.link import Link
-    from poetry.core.semver.version_constraint import VersionConstraint
 
 
 class Repository:

src/poetry/utils/env.py

@@ -30,8 +30,8 @@ from packaging.tags import Tag
 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

src/poetry/utils/setup_reader.py

@@ -6,7 +6,7 @@ from configparser import ConfigParser
 from pathlib import Path
 from typing import Any
 
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 
 
 class SetupReader:

src/poetry/version/version_selector.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 
 
 if TYPE_CHECKING:

tests/console/commands/env/helpers.py

@@ -4,7 +4,7 @@ from pathlib import Path
 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:

tests/console/commands/env/test_remove.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 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
 

tests/console/commands/env/test_use.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING
 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

tests/console/commands/self/test_update.py

@@ -5,8 +5,8 @@ from typing import TYPE_CHECKING
 
 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

tests/console/commands/test_add.py

@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING
 
 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

tests/console/commands/test_publish.py

@@ -107,7 +107,7 @@ def test_publish_dry_run_skip_existing(
     error = app_tester.io.fetch_error()
 
     assert "Publishing simple-project (1.2.3) to PyPI" in output
-    assert "- Uploading simple-project-1.2.3.tar.gz" in error
+    assert "- Uploading simple_project-1.2.3.tar.gz" in error
     assert "- Uploading simple_project-1.2.3-py2.py3-none-any.whl" in error
 
 
@@ -125,4 +125,4 @@ def test_skip_existing_output(
     assert exit_code == 0
 
     error = app_tester.io.fetch_error()
-    assert "- Uploading simple-project-1.2.3.tar.gz File exists. Skipping" in error
+    assert "- Uploading simple_project-1.2.3.tar.gz File exists. Skipping" in error

tests/helpers.py

@@ -11,7 +11,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Any
 
-from poetry.core.masonry.utils.helpers import escape_name
+from poetry.core.masonry.utils.helpers import distribution_name
 from poetry.core.packages.package import Package
 from poetry.core.packages.utils.link import Link
 from poetry.core.toml.file import TOMLFile
@@ -30,8 +30,8 @@ from poetry.utils._compat import metadata
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
+    from poetry.core.constraints.version import Version
     from poetry.core.packages.dependency import Dependency
-    from poetry.core.semver.version import Version
     from pytest_mock import MockerFixture
     from tomlkit.toml_document import TOMLDocument
 
@@ -235,7 +235,7 @@ class TestRepository(Repository):
     def find_links_for_package(self, package: Package) -> list[Link]:
         return [
             Link(
-                f"https://foo.bar/files/{escape_name(package.name)}"
+                f"https://foo.bar/files/{distribution_name(package.name)}"
                 f"-{package.version.to_string()}-py2.py3-none-any.whl"
             )
         ]

tests/masonry/builders/test_editable_builder.py

@@ -12,7 +12,7 @@ import pytest
 
 from cleo.io.null_io import NullIO
 from deepdiff import DeepDiff
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 
 from poetry.factory import Factory
 from poetry.masonry.builders.editable import EditableBuilder

tests/packages/test_locker.py

@@ -14,9 +14,9 @@ from typing import TYPE_CHECKING
 import pytest
 import tomlkit
 
+from poetry.core.constraints.version import Version
 from poetry.core.packages.package import Package
 from poetry.core.packages.project_package import ProjectPackage
-from poetry.core.semver.version import Version
 
 from poetry.factory import Factory
 from poetry.packages.locker import GENERATED_COMMENT

tests/repositories/link_sources/test_base.py

@@ -7,9 +7,9 @@ from unittest.mock import PropertyMock
 import pytest
 
 from packaging.utils import canonicalize_name
+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.link_sources.base import LinkSource
 

tests/repositories/link_sources/test_html.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 import pytest
 
 from packaging.utils import canonicalize_name
+from poetry.core.constraints.version import Version
 from poetry.core.packages.utils.link import Link
-from poetry.core.semver.version import Version
 
 from poetry.repositories.link_sources.html import HTMLPage
 

tests/repositories/test_legacy_repository.py

@@ -11,8 +11,8 @@ import pytest
 import requests
 
 from packaging.utils import canonicalize_name
+from poetry.core.constraints.version import Version
 from poetry.core.packages.dependency import Dependency
-from poetry.core.semver.version import Version
 
 from poetry.factory import Factory
 from poetry.repositories.exceptions import PackageNotFound

tests/repositories/test_pool.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import pytest
 
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 
 from poetry.repositories import Pool
 from poetry.repositories import Repository

tests/repositories/test_pypi_repository.py

@@ -10,8 +10,8 @@ from typing import Any
 
 import pytest
 
+from poetry.core.constraints.version import Version
 from poetry.core.packages.dependency import Dependency
-from poetry.core.semver.version import Version
 from requests.exceptions import TooManyRedirects
 from requests.models import Response
 

tests/repositories/test_repository.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 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.factory import Factory
 from poetry.repositories import Repository

tests/test_factory.py

@@ -7,7 +7,7 @@ import pytest
 
 from deepdiff import DeepDiff
 from packaging.utils import canonicalize_name
-from poetry.core.semver.helpers import parse_constraint
+from poetry.core.constraints.version import parse_constraint
 from poetry.core.toml.file import TOMLFile
 
 from poetry.factory import Factory

tests/utils/test_env.py

@@ -12,7 +12,7 @@ import pytest
 import tomlkit
 
 from cleo.io.null_io import NullIO
-from poetry.core.semver.version import Version
+from poetry.core.constraints.version import Version
 from poetry.core.toml.file import TOMLFile
 
 from poetry.factory import Factory