<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1c45a5df1df3b2adb8eaac792b7eea2e53f9e717">https://github.com/macports/macports-ports/commit/1c45a5df1df3b2adb8eaac792b7eea2e53f9e717</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1c45a5df1df3b2adb8eaac792b7eea2e53f9e717
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Tue Nov 19 16:06:01 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-dulwich: update to 0.22.6
</span>---
python/py-dulwich/Portfile | 29 +++---
.../eb6e78f01a44d738ca3c801d777785910aab5000.patch | 108 ---------------------
2 files changed, 12 insertions(+), 125 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-dulwich/Portfile b/python/py-dulwich/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2472a940f87..43cc64849b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-dulwich/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-dulwich/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-dulwich
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.22.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.22.6
</span> categories-append devel
maintainers {danchr @danchr} openmaintainer
license {GPL-2+ Apache-2+}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,9 @@ long_description Simple Pure-Python implementation of the Git file \
</span> homepage https://www.dulwich.io
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0517b08bac8f4320b6c2ff37f2f58b9108ed6984 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7968c7b8a877b614c46b5ee7c1b28411772123004d7cf6357e763ad2cbeb8254 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 447748
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f04759f31a7ebad396283f3415d193c743f67081 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c1f44d599fa5dc59ca43e0789f835b8689b4d831d8de5ae009c442192a1408b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 450726
</span>
python.versions 39 310 311 312 313
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,11 +33,6 @@ if {${name} ne ${subport}} {
</span>
patchfiles patch-archflags.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Backport of a fix from upstream.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Drop with next release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eb6e78f01a44d738ca3c801d777785910aab5000.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append \
port:py${python.version}-urllib3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,19 +50,19 @@ if {${name} ne ${subport}} {
</span> cfg-if 1.0.0 baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd \
heck 0.5.0 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea \
indoc 2.0.5 b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libc 0.2.159 561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libc 0.2.162 18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398 \
</span> memchr 2.7.4 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3 \
memoffset 0.9.1 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a \
once_cell 1.20.2 1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775 \
portable-atomic 1.9.0 cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- proc-macro2 1.0.87 b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyo3 0.22.5 3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyo3-build-config 0.22.5 bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyo3-ffi 0.22.5 94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyo3-macros 0.22.5 e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyo3-macros-backend 0.22.5 ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc-macro2 1.0.89 f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyo3 0.23.0 d51da03e17ef97ae4185cd606a4b316e04bb6f047d66913d6b57d4e6acfb41ec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyo3-build-config 0.23.0 455f646b3d007fb6d85cffccff9c7dfb752f24ec9fb0a04cb49537e7e9bdc2dd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyo3-ffi 0.23.0 432fc20d4dd419f8d1dd402a659bb42e75430706b50d367cc978978778638084 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyo3-macros 0.23.0 ae1cd532e9356f90d1be1317d8bf51873e4a9468b9305b950c20e8aef786cc16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyo3-macros-backend 0.23.0 975b289b3d3901442a6def73eedf8251dc1aed2cdc0a80d1c4f3998d868a97aa \
</span> quote 1.0.37 b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- syn 2.0.79 89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ syn 2.0.87 25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d \
</span> target-lexicon 0.12.16 61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1 \
unicode-ident 1.0.13 e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe \
unindent 0.2.3 c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-dulwich/files/eb6e78f01a44d738ca3c801d777785910aab5000.patch b/python/py-dulwich/files/eb6e78f01a44d738ca3c801d777785910aab5000.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 531f15c13ea..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-dulwich/files/eb6e78f01a44d738ca3c801d777785910aab5000.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,108 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9fea5e31722b35ee66c564538fb84c96f10eee40 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Eli Schwartz <eschwartz93@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 5 Nov 2024 12:01:47 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] build: respect the "pure" argument at metadata generation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-When a pure build is requested, no compiled extensions are produced. The
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-setuptools_rust dependency ends up imported-but-not-used. Teach
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-setuptools to avoid build-requiring it in this case.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Closes: https://github.com/jelmer/dulwich/issues/1405
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyproject.toml | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setup.py | 58 ++++++++++++++++++++++++++++----------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 33 insertions(+), 27 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/pyproject.toml b/pyproject.toml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2f7c59681..aaa873223 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyproject.toml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyproject.toml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [build-system]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--requires = ["setuptools>=61.2", "setuptools-rust"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+requires = ["setuptools>=61.2"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build-backend = "setuptools.build_meta"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [project]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/setup.py b/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6eada1487..07381eee8 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from setuptools import setup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--from setuptools_rust import Binding, RustExtension
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tests_require = ["fastimport"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,35 +17,45 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- optional = os.environ.get("CIBUILDWHEEL", "0") != "1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--rust_extensions = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- RustExtension(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "dulwich._objects",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "crates/objects/Cargo.toml",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- binding=Binding.PyO3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- optional=optional,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- RustExtension(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "dulwich._pack",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "crates/pack/Cargo.toml",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- binding=Binding.PyO3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- optional=optional,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- RustExtension(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "dulwich._diff_tree",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "crates/diff-tree/Cargo.toml",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- binding=Binding.PyO3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- optional=optional,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ideally, setuptools would just provide a way to do this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if "--pure" in sys.argv:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sys.argv.remove("--pure")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if "PURE" in os.environ or "--pure" in sys.argv:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if "--pure" in sys.argv:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.argv.remove("--pure")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setup_requires = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rust_extensions = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setup_requires = ["setuptools_rust"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # We check for egg_info since that indicates we are running prepare_metadata_for_build_*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if "egg_info" in sys.argv:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rust_extensions = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from setuptools_rust import Binding, RustExtension
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rust_extensions = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ RustExtension(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "dulwich._objects",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "crates/objects/Cargo.toml",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ binding=Binding.PyO3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ optional=optional,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ RustExtension(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "dulwich._pack",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "crates/pack/Cargo.toml",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ binding=Binding.PyO3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ optional=optional,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ RustExtension(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "dulwich._diff_tree",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "crates/diff-tree/Cargo.toml",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ binding=Binding.PyO3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ optional=optional,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setup(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- package_data={"": ["py.typed"]},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rust_extensions=rust_extensions,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setup_requires=setup_requires,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tests_require=tests_require,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span></pre><pre style='margin:0'>
</pre>