Merge pull request #9 from ischaojie/o

Add major/minor/micro for Version

.gitignore

@@ -2,3 +2,4 @@
 .pytest_cache
 /target
 __pycache__
+.venv

Cargo.toml

@@ -23,6 +23,3 @@ unicode-width = "0.1.10"
 
 [dev-dependencies]
 indoc = "2.0.1"
-
-[package.metadata.maturin]
-name = "pep440_rs._pep440_rs"

pyproject.toml

@@ -9,6 +9,7 @@ build-backend = "maturin"
 [tool.maturin]
 features = ["pyo3"]
 python-source = "python"
+module-name = "pep440_rs._pep440_rs"
 
 [tool.ruff.per-file-ignores]
-"python/pep440_rs/__init__.py" = ["F403", "F405"]
+"python/pep440_rs/__init__.py" = ["F403", "F405"]

python/pep440_rs/__init__.pyi

@@ -1,12 +1,16 @@
 # Generated by `stubgen -p pep440_rs`
 from typing import Any, ClassVar
 
+
 class Version:
  dev: Any
  epoch: Any
  post: Any
  pre: Any
  release: Any
+ major: Any
+ minor: Any
+ micro: Any
 
  @classmethod
  def __init__(cls, *args, **kwargs) -> None: ...
@@ -20,6 +24,7 @@ class Version:
  def __lt__(self, other) -> Any: ...
  def __ne__(self, other) -> Any: ...
 
+
 class VersionSpecifier:
  __hash__: ClassVar[None] = ...
 

src/version.rs

@@ -344,6 +344,33 @@ impl PyVersion {
  pub fn dev(&self) -> Option<usize> {
  self.0.dev
  }
+ /// The first item of release or 0 if unavailable.
+ #[getter]
+ pub fn major(&self) -> usize {
+ if !self.release().is_empty() {
+ self.release()[0]
+ } else {
+ 0
+ }
+ }
+ /// The second item of release or 0 if unavailable.
+ #[getter]
+ pub fn minor(&self) -> usize {
+ if self.release().len() > 1 {
+ self.release()[1]
+ } else {
+ 0
+ }
+ }
+ /// The third item of release or 0 if unavailable.
+ #[getter]
+ pub fn micro(&self) -> usize {
+ if self.release().len() > 2 {
+ self.release()[2]
+ } else {
+ 0
+ }
+ }
 
  /// Parses a PEP 440 version string
  #[cfg(feature = "pyo3")]
@@ -765,6 +792,7 @@ impl Version {
  .split('.')
  .map(|segment| segment.parse::<usize>().map_err(|err| err.to_string()))
  .collect::<Result<Vec<usize>, String>>()?;
+
  let star = captures.name("trailing_dot_star").is_some();
  if star {
  if pre.is_some() {

test/test_python.py

@@ -12,6 +12,9 @@ def test_pep440():
  assert not VersionSpecifier(">=1.1").contains(Version("1.1a1"))
  assert Version("1.1") >= Version("1.1a1")
  assert Version("2.0") in VersionSpecifier("==2")
+ assert Version("2.1").major == 2
+ assert Version("2.1").minor == 1
+ assert Version("2.1").micro == 0
 
 
 def test_version_specifier():