Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update type hints of PEP440Version class #270

Merged
merged 4 commits into from Feb 28, 2022
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/poetry/core/version/pep440/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
from typing import Any
from typing import Optional
from typing import Tuple
from typing import Type
from typing import TypeVar
from typing import Union

from poetry.core.version.pep440.segments import RELEASE_PHASE_ALPHA
Expand All @@ -14,6 +16,8 @@
from poetry.core.version.pep440.segments import ReleaseTag


T = TypeVar("T")
neersighted marked this conversation as resolved.
Show resolved Hide resolved

# we use the phase "z" to ensure we always sort this after other phases
_INF_TAG = ReleaseTag("z", math.inf) # noqa
# we use the phase "" to ensure we always sort this before other phases
Expand Down Expand Up @@ -133,7 +137,7 @@ def to_string(self, short: bool = False) -> str:
return version_string

@classmethod
def parse(cls, value: str) -> "PEP440Version":
def parse(cls: Type[T], value: str) -> T:
from poetry.core.version.pep440.parser import parse_pep440

return parse_pep440(value, cls)
Expand All @@ -159,13 +163,13 @@ def is_unstable(self) -> bool:
def is_stable(self) -> bool:
return not self.is_unstable()

def next_major(self) -> "PEP440Version":
def next_major(self: T) -> T:
release = self.release
if self.is_stable() or Release(self.release.major, 0, 0) < self.release:
release = self.release.next_major()
return self.__class__(epoch=self.epoch, release=release)

def next_minor(self) -> "PEP440Version":
def next_minor(self: T) -> T:
release = self.release
if (
self.is_stable()
Expand All @@ -174,20 +178,20 @@ def next_minor(self) -> "PEP440Version":
release = self.release.next_minor()
return self.__class__(epoch=self.epoch, release=release)

def next_patch(self) -> "PEP440Version":
def next_patch(self: T) -> T:
return self.__class__(
epoch=self.epoch,
release=self.release.next_patch() if self.is_stable() else self.release,
)

def next_prerelease(self, next_phase: bool = False) -> "PEP440Version":
def next_prerelease(self: T, next_phase: bool = False) -> "PEP440Version":
if self.is_prerelease():
pre = self.pre.next_phase() if next_phase else self.pre.next()
else:
pre = ReleaseTag(RELEASE_PHASE_ALPHA)
return self.__class__(epoch=self.epoch, release=self.release, pre=pre)

def next_postrelease(self) -> "PEP440Version":
def next_postrelease(self: T) -> T:
if self.is_prerelease():
post = self.post.next()
else:
Expand All @@ -200,7 +204,7 @@ def next_postrelease(self) -> "PEP440Version":
post=post,
)

def next_devrelease(self) -> "PEP440Version":
def next_devrelease(self: T) -> T:
if self.is_prerelease():
dev = self.dev.next()
else:
Expand All @@ -209,12 +213,12 @@ def next_devrelease(self) -> "PEP440Version":
epoch=self.epoch, release=self.release, pre=self.pre, dev=dev
)

def first_prerelease(self) -> "PEP440Version":
def first_prerelease(self: T) -> T:
return self.__class__(
epoch=self.epoch, release=self.release, pre=ReleaseTag(RELEASE_PHASE_ALPHA)
)

def replace(self, **kwargs: Any) -> "PEP440Version":
def replace(self: T, **kwargs: Any) -> "PEP440Version":
return self.__class__(
**{
**{
Expand All @@ -226,8 +230,8 @@ def replace(self, **kwargs: Any) -> "PEP440Version":
}
)

def without_local(self) -> "PEP440Version":
def without_local(self: T) -> T:
return self.replace(local=None)

def without_postrelease(self) -> "PEP440Version":
def without_postrelease(self: T) -> T:
return self.replace(post=None)