Skip to content

Commit 4b638af

Browse files
committed
Merge remote-tracking branch 'origin/main'
Resolve merge conflict in pyproject.toml: - Keep local python_version = '3.9' for mypy (correct Python version) - Reject remote python_version = '0.6.0' (incorrect project version in mypy config) - Maintain project version = '0.6.0' in [project] section - Preserve pre-commit hook quality improvements and tool configurations
2 parents 7fda6a1 + cddcd2e commit 4b638af

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "demopy_gb_jj"
3-
version = "0.5.0"
3+
version = "0.6.0"
44
edition = "2021"
55
description = "A demo PyPI package with Rust extensions"
66
authors = ["jj-devhub <Jaid.jashim@infinitibit.com>"]

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "maturin"
44

55
[project]
66
name = "demopy_gb_jj"
7-
version = "0.5.0"
7+
version = "0.6.0"
88
description = "A demo PyPI package with Rust extensions"
99
authors = [{name="jj-devhub", email="Jaid.jashim@infinitibit.com"}]
1010
readme = "README.md"

python/demopy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
This package demonstrates how to create Python extensions using Rust and PyO3.
55
"""
66

7-
__version__ = "0.5.0"
7+
__version__ = "0.6.0"
88

99
try:
1010
# Import the Rust extension

0 commit comments

Comments
 (0)