diff --git a/.gitignore b/.gitignore index 30b538c..c23081e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -uv.lock - __pycache__/ *.pyc *.pyo diff --git a/README.md b/README.md index 1eee062..13f619e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Edit two files side by side, showing differences. Install diff-edit directly using uv: - uv tool install git+https://forgejo.tail556789.ts.net/ahamilton/diff-edit + uv tool install --python 3.14 git+https://forgejo.tail556789.ts.net/ahamilton/diff-edit Or install from source: diff --git a/diff_edit/__init__.py b/diff_edit/__init__.py index b2f5536..515b279 100755 --- a/diff_edit/__init__.py +++ b/diff_edit/__init__.py @@ -26,7 +26,7 @@ import termstr import diff_edit.editor as editor -__version__ = "2026.7.27" +__version__ = "2026.8.6" PROJECT_NAME = "diff-edit" diff --git a/pyproject.toml b/pyproject.toml index cab902a..28c4f8f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,17 +2,17 @@ tool.uv.package = true [project] name = "diff-edit" -version = "2026.7.27" +version = "2026.8.6" description = "Edit two files side by side, showing differences." readme = "README.md" authors = [ { name = "Andrew Hamilton", email = "and_hamilton@yahoo.com" }, ] -requires-python = ">=3.11" +requires-python = ">=3.14" dependencies = [ "docopt-ng==0.9.0", - "fill3 @ git+https://forgejo.tail556789.ts.net/ahamilton/fill3.git@2026.7.22", - "lscolors @ git+https://forgejo.tail556789.ts.net/ahamilton/lscolors.git@2026.7.27", + "fill3 @ git+https://forgejo.tail556789.ts.net/ahamilton/fill3.git@2026.8.5", + "lscolors @ git+https://forgejo.tail556789.ts.net/ahamilton/lscolors.git@2026.8.3", "pygments==2.19.1", ] diff --git a/uv.lock b/uv.lock new file mode 100644 index 0000000..65b7e7c --- /dev/null +++ b/uv.lock @@ -0,0 +1,135 @@ +version = 1 +revision = 3 +requires-python = ">=3.14" + +[[package]] +name = "colorama" +version = "0.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, +] + +[[package]] +name = "cwcwidth" +version = "0.1.12" +source = { git = "https://forgejo.tail556789.ts.net/ahamilton/cwcwidth.git?rev=v0.1.12#6ac7d0e3c70535a454094e5e7e51e637d05a29c9" } + +[[package]] +name = "diff-edit" +version = "2026.8.6" +source = { editable = "." } +dependencies = [ + { name = "docopt-ng" }, + { name = "fill3" }, + { name = "lscolors" }, + { name = "pygments" }, +] + +[package.dev-dependencies] +dev = [ + { name = "pytest" }, +] + +[package.metadata] +requires-dist = [ + { name = "docopt-ng", specifier = "==0.9.0" }, + { name = "fill3", git = "https://forgejo.tail556789.ts.net/ahamilton/fill3.git?rev=2026.8.5" }, + { name = "lscolors", git = "https://forgejo.tail556789.ts.net/ahamilton/lscolors.git?rev=2026.8.3" }, + { name = "pygments", specifier = "==2.19.1" }, +] + +[package.metadata.requires-dev] +dev = [{ name = "pytest", specifier = ">=9.1.1" }] + +[[package]] +name = "docopt-ng" +version = "0.9.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e4/50/8d6806cf13138127692ae6ff79ddeb4e25eb3b0bcc3c1bd033e7e04531a9/docopt_ng-0.9.0.tar.gz", hash = "sha256:91c6da10b5bb6f2e9e25345829fb8278c78af019f6fc40887ad49b060483b1d7", size = 32264, upload-time = "2023-05-30T20:46:25.064Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6c/4a/c3b77fc1a24510b08918b43a473410c0168f6e657118807015f1f1edceea/docopt_ng-0.9.0-py3-none-any.whl", hash = "sha256:bfe4c8b03f9fca424c24ee0b4ffa84bf7391cb18c29ce0f6a8227a3b01b81ff9", size = 16689, upload-time = "2023-05-30T20:46:45.294Z" }, +] + +[[package]] +name = "fill3" +version = "2026.8.5" +source = { git = "https://forgejo.tail556789.ts.net/ahamilton/fill3.git?rev=2026.8.5#ac9c61e4c8eab271a616c65d50b1ebf70feab7e7" } +dependencies = [ + { name = "termstr" }, + { name = "textgrid" }, +] + +[[package]] +name = "iniconfig" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, +] + +[[package]] +name = "lscolors" +version = "2026.8.3" +source = { git = "https://forgejo.tail556789.ts.net/ahamilton/lscolors.git?rev=2026.8.3#ff650469c5c2d3cfeeeacb3f17afba2ee57f97ba" } +dependencies = [ + { name = "termstr" }, +] + +[[package]] +name = "packaging" +version = "26.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7d/fa/3944b40b07da9ce895c0e6303a5ab7d53da063554f534556b134a54d6093/packaging-26.3.tar.gz", hash = "sha256:94edc256424af38762eb31306eed28beb9f0efc50a8837492c9d6fd6004aed79", size = 313412, upload-time = "2026-08-04T18:15:28.737Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/63/34/ba1c580383c9eada3711951fef0795c80b829a078d72188184bcab9dd527/packaging-26.3-py3-none-any.whl", hash = "sha256:d7193f7c8e4e93f444fde0262bf90af30e16fa0ad0ad44cb553c87339b23cd1c", size = 129956, upload-time = "2026-08-04T18:15:27.159Z" }, +] + +[[package]] +name = "pluggy" +version = "1.6.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, +] + +[[package]] +name = "pygments" +version = "2.19.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7c/2d/c3338d48ea6cc0feb8446d8e6937e1408088a72a39937982cc6111d17f84/pygments-2.19.1.tar.gz", hash = "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f", size = 4968581, upload-time = "2025-01-06T17:26:30.443Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8a/0b/9fcc47d19c48b59121088dd6da2488a49d5f72dacf8262e2790a1d2c7d15/pygments-2.19.1-py3-none-any.whl", hash = "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c", size = 1225293, upload-time = "2025-01-06T17:26:25.553Z" }, +] + +[[package]] +name = "pytest" +version = "9.1.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "iniconfig" }, + { name = "packaging" }, + { name = "pluggy" }, + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/e4/47/b9efed96c114afcfa3c9d3fe98a76a1d14c74a9e266d397cf6eb64be5e01/pytest-9.1.1.tar.gz", hash = "sha256:1088fbde8f2b49d95a549a195707afa7a76a3ce9bcadc26b6d71f0ffda5fe313", size = 1636369, upload-time = "2026-06-19T10:58:32.857Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/24/25/1de2678b631f5a49215c6c96fff41ba892b0a34df68d6d80292b1b48aa7f/pytest-9.1.1-py3-none-any.whl", hash = "sha256:37a86b45efb9a47a61a36449063e8e18d0cab3161329fc099eb21783169c4f0c", size = 386536, upload-time = "2026-06-19T10:58:31.347Z" }, +] + +[[package]] +name = "termstr" +version = "2026.8.3" +source = { git = "https://forgejo.tail556789.ts.net/ahamilton/termstr.git?rev=2026.8.3#12cf0e42691fb241932bdfbb17a7e794978a45cf" } +dependencies = [ + { name = "cwcwidth" }, +] + +[[package]] +name = "textgrid" +version = "2026.8.5" +source = { git = "https://forgejo.tail556789.ts.net/ahamilton/textgrid-rust.git?rev=2026.8.5#17c54d89216c51c9427513ca6179c42d86fd9157" }