andras/reconcile
andras/reconcile
Watch
1
0
Fork
You've already forked reconcile
 0
Code Issues Pull requests 10 Projects Releases Packages Wiki Activity Actions

Bump versions to 0.14.0
Some checks failed
Check / build (push) Failing after 3m21s
Details
Publish / build (push) Failing after 3m15s
Details
Publish / publish-crate (push) Has been skipped
Details
Publish / publish-npm (push) Has been skipped
Details
Publish / publish-pypi (push) Has been skipped
Details

Browse source
This commit is contained in:
Andras Schmelczer 2026-10-29 00:01:23 +00:00
commit 4d977fc70d
4 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reconcile-python/Cargo.lock generated
View file

@ -130,14 +130,14 @@ dependencies = [
[[package]]
name = "reconcile-text"
version = "0.13.2"
version = "0.14.0"
dependencies = [
"thiserror",
]
[[package]]
name = "reconcile-text-python"
version = "0.13.2"
version = "0.14.0"
dependencies = [
"pyo3",
"reconcile-text",

2
reconcile-python/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "reconcile-text-python"
version = "0.13.2"
version = "0.14.0"
edition = "2024"
rust-version = "1.94"
authors = ["Andras Schmelczer <andras@schmelczer.dev>"]

2
reconcile-python/pyproject.toml
View file

@ -4,7 +4,7 @@ build-backend = "maturin"
[project]
name = "reconcile-text"
version = "0.13.2"
version = "0.14.0"
description = "Intelligent 3-way text merging with automated conflict resolution"
readme = "README.md"
license = { file = "LICENSE" }

32
reconcile-python/uv.lock generated
View file

@ -20,7 +20,7 @@ name = "exceptiongroup"
version = "1.3.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "typing-extensions" },
{ name = "typing-extensions", marker = "python_full_version < '3.13'" },
]
sdist = { url = "https://files.pythonhosted.org/packages/50/79/66800aadf48771f6b62f7eb014e352e5d06856655206165d775e675a02c9/exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219", size = 30371, upload-time = "2025-11-21T23:01:54.787Z" }
wheels = [
@ -132,13 +132,13 @@ resolution-markers = [
"python_full_version < '3.10'",
]
dependencies = [
{ name = "colorama", marker = "sys_platform == 'win32'" },
{ name = "exceptiongroup" },
{ name = "iniconfig", version = "2.1.0", source = { registry = "https://pypi.org/simple" } },
{ name = "packaging" },
{ name = "pluggy" },
{ name = "pygments" },
{ name = "tomli" },
{ name = "colorama", marker = "python_full_version < '3.10' and sys_platform == 'win32'" },
{ name = "exceptiongroup", marker = "python_full_version < '3.10'" },
{ name = "iniconfig", version = "2.1.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" },
{ name = "packaging", marker = "python_full_version < '3.10'" },
{ name = "pluggy", marker = "python_full_version < '3.10'" },
{ name = "pygments", marker = "python_full_version < '3.10'" },
{ name = "tomli", marker = "python_full_version < '3.10'" },
]
sdist = { url = "https://files.pythonhosted.org/packages/a3/5c/00a0e072241553e1a7496d638deababa67c5058571567b92a7eaa258397c/pytest-8.4.2.tar.gz", hash = "sha256:86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01", size = 1519618, upload-time = "2025-09-04T14:34:22.711Z" }
wheels = [
@ -153,13 +153,13 @@ resolution-markers = [
"python_full_version >= '3.10'",
]
dependencies = [
{ name = "colorama", marker = "sys_platform == 'win32'" },
{ name = "exceptiongroup", marker = "python_full_version < '3.11'" },
{ name = "iniconfig", version = "2.3.0", source = { registry = "https://pypi.org/simple" } },
{ name = "packaging" },
{ name = "pluggy" },
{ name = "pygments" },
{ name = "tomli", marker = "python_full_version < '3.11'" },
{ name = "colorama", marker = "python_full_version >= '3.10' and sys_platform == 'win32'" },
{ name = "exceptiongroup", marker = "python_full_version == '3.10.*'" },
{ name = "iniconfig", version = "2.3.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" },
{ name = "packaging", marker = "python_full_version >= '3.10'" },
{ name = "pluggy", marker = "python_full_version >= '3.10'" },
{ name = "pygments", marker = "python_full_version >= '3.10'" },
{ name = "tomli", marker = "python_full_version == '3.10.*'" },
]
sdist = { url = "https://files.pythonhosted.org/packages/d1/db/7ef3487e0fb0049ddb5ce41d3a49c235bf9ad299b6a25d5780a89f19230f/pytest-9.0.2.tar.gz", hash = "sha256:75186651a92bd89611d1d9fc20f0b4345fd827c41ccd5c299a868a05d70edf11", size = 1568901, upload-time = "2025-12-06T21:30:51.014Z" }
wheels = [
@ -168,7 +168,7 @@ wheels = [
[[package]]
name = "reconcile-text"
version = "0.13.2"
version = "0.14.0"
source = { editable = "." }
[package.dev-dependencies]