August 2024 - openSUSE Commits - openSUSE Mailing Lists

commit wireshark for openSUSE:Factory
by Source-Sync 30 Aug '24

30 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2024-08-30 13:28:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireshark (Old) and /work/SRC/openSUSE:Factory/.wireshark.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark" Fri Aug 30 13:28:46 2024 rev:223 rq:1197387 version:4.2.7 Changes: -------- --- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2024-07-29 21:53:33.319556300 +0200 +++ /work/SRC/openSUSE:Factory/.wireshark.new.2698/wireshark.changes 2024-08-30 13:28:49.857509604 +0200 @@ -1,0 +2,8 @@ +Thu Aug 29 07:09:42 UTC 2024 - Robert Frohl <rfrohl(a)suse.com> + +- Wireshark 4.2.7: + * CVE-2024-8250: NTLMSSP dissector crash (boo#1229907). +- Further features, bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-4.2.7.html + +------------------------------------------------------------------- Old: ---- wireshark-4.2.6.tar.xz wireshark-4.2.6.tar.xz.hash New: ---- wireshark-4.2.7.tar.xz wireshark-4.2.7.tar.xz.hash ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ --- /var/tmp/diff_new_pack.KuQDiF/_old 2024-08-30 13:28:51.089561095 +0200 +++ /var/tmp/diff_new_pack.KuQDiF/_new 2024-08-30 13:28:51.093561261 +0200 @@ -29,7 +29,7 @@ %endif %bcond_without qt5 Name: wireshark -Version: 4.2.6 +Version: 4.2.7 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0-or-later AND GPL-3.0-or-later ++++++ wireshark-4.2.6.tar.xz -> wireshark-4.2.7.tar.xz ++++++ /work/SRC/openSUSE:Factory/wireshark/wireshark-4.2.6.tar.xz /work/SRC/openSUSE:Factory/.wireshark.new.2698/wireshark-4.2.7.tar.xz differ: char 15, line 1 ++++++ wireshark-4.2.6.tar.xz.hash -> wireshark-4.2.7.tar.xz.hash ++++++ --- /work/SRC/openSUSE:Factory/wireshark/wireshark-4.2.6.tar.xz.hash 2024-07-11 20:29:59.785857886 +0200 +++ /work/SRC/openSUSE:Factory/.wireshark.new.2698/wireshark-4.2.7.tar.xz.hash 2024-08-30 13:28:49.809507598 +0200 @@ -1,33 +1,33 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -wireshark-4.2.6.tar.xz: 45015272 bytes -SHA256(wireshark-4.2.6.tar.xz)=5ec6028df29068d889c98489bf194a884b00831106fea1e921fea3c65f2003f5 -SHA1(wireshark-4.2.6.tar.xz)=db0374dce360b99d8abb9a3f3471f3fc98d6d099 - -Wireshark-4.2.6-arm64.exe: 67985184 bytes -SHA256(Wireshark-4.2.6-arm64.exe)=602b5b95249f8955c5a6dbc41b2012c3b06a26daafbb07ed5ea66fa43c7a6574 -SHA1(Wireshark-4.2.6-arm64.exe)=4ee9ec6fc05a0d63f0f3d7110964689ab9f4f122 - -Wireshark-4.2.6-x64.exe: 86491216 bytes -SHA256(Wireshark-4.2.6-x64.exe)=ba679117304718a009092a5327abfdbc559031d9216512fc7540cb03d30a5545 -SHA1(Wireshark-4.2.6-x64.exe)=129df64c8aa44d9ce2ad191fa783faffd71301ae - -Wireshark-4.2.6-x64.msi: 62926848 bytes -SHA256(Wireshark-4.2.6-x64.msi)=cf8399afd61f2cadefd73b46dc9a206186502d30f6867457fe163a94574c1214 -SHA1(Wireshark-4.2.6-x64.msi)=825e5d80806f2e613373255c1e3fd3d6d280e9f6 - -WiresharkPortable64_4.2.6.paf.exe: 53648680 bytes -SHA256(WiresharkPortable64_4.2.6.paf.exe)=5924198bbbcd75f8f4709799b5185be1a5c20f08f678534ed00675842bcbc5d9 -SHA1(WiresharkPortable64_4.2.6.paf.exe)=dde23431f3878cafa6fb5f43e461259960b4f990 - -Wireshark 4.2.6 Arm 64.dmg: 65590940 bytes -SHA256(Wireshark 4.2.6 Arm 64.dmg)=11fc3f8b12b8369398e373058f9b8f0730e3228611ecf3d7ecc63c5f1855241e -SHA1(Wireshark 4.2.6 Arm 64.dmg)=57ef4f0600644c15566a9b6e9e2e71a1d2735b66 - -Wireshark 4.2.6 Intel 64.dmg: 69344904 bytes -SHA256(Wireshark 4.2.6 Intel 64.dmg)=41601877fa5294ec7c20f8d81c799612c6bca7fa689f237fdbf6595b5fc22071 -SHA1(Wireshark 4.2.6 Intel 64.dmg)=391319afa4bd74af89baf3d73d820ab0171da0ac +wireshark-4.2.7.tar.xz: 45017312 bytes +SHA256(wireshark-4.2.7.tar.xz)=2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86 +SHA1(wireshark-4.2.7.tar.xz)=90624e262733bcb111081927d1e60a35301251b9 + +Wireshark-4.2.7-x64.exe: 86501096 bytes +SHA256(Wireshark-4.2.7-x64.exe)=a85375070cba58c1c53c051e85643651ea37840022eb13358c54bbc6fb83193f +SHA1(Wireshark-4.2.7-x64.exe)=e9d7ce19a037421008449a372e47b18219ca196e + +Wireshark-4.2.7-arm64.exe: 67998504 bytes +SHA256(Wireshark-4.2.7-arm64.exe)=19773c593b6a1bda9921c57407f96f85a19ad0c83a1e40541982b1e61b81e49c +SHA1(Wireshark-4.2.7-arm64.exe)=54dbb2a22348148140cbe421bf52fb88ee35f2dc + +Wireshark-4.2.7-x64.msi: 63148032 bytes +SHA256(Wireshark-4.2.7-x64.msi)=5afa8e3a146c70a62e9922e7c7136ff6274baa8a145a823521fa1fcdb01779fb +SHA1(Wireshark-4.2.7-x64.msi)=353e8fa795a365dbae4d4a9d47e89d20e7f64a02 + +WiresharkPortable64_4.2.7.paf.exe: 53663376 bytes +SHA256(WiresharkPortable64_4.2.7.paf.exe)=9955764524973f2d35b80b2904c3413e391d40ddfdbb42e47a45ef1fa49241eb +SHA1(WiresharkPortable64_4.2.7.paf.exe)=5be19351f0c15edcc1c8f2875dcde53dd653c254 + +Wireshark 4.2.7 Arm 64.dmg: 65582345 bytes +SHA256(Wireshark 4.2.7 Arm 64.dmg)=3853a900941df1d13be64ff2bebc47da5ffe81328650f7ab7546011792aa1c29 +SHA1(Wireshark 4.2.7 Arm 64.dmg)=f7e31c4a0f199ef82dd9f3ddababe97794d12b36 + +Wireshark 4.2.7 Intel 64.dmg: 69349139 bytes +SHA256(Wireshark 4.2.7 Intel 64.dmg)=21d1bb5fa3e79328c5790de1374a81ca1975d11d2d695cd90469e8032b729844 +SHA1(Wireshark 4.2.7 Intel 64.dmg)=a1d8c9025fccf4d8837fd05314613b4517003690 You can validate these hashes using the following commands (among others): @@ -37,17 +37,17 @@ Other: openssl sha256 wireshark-x.y.z.tar.xz -----BEGIN PGP SIGNATURE----- -iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmaO0uIACgkQgiRKeOb+ -ruo+eQ//TQBxIVPnBX2isKfGpngWQ+e75/2Xk/00173P0lIiuV3x5gtRQ7SiVh5H -qC1bb6bbcD0+wK6BDU/K15eMQ30ODI0BdbQSElH9CaZZ6w84gAK2x+iJFy/kQl/O -3FQMM8v2MYMlN1Algs/czKDBK0Bbex/hCuIARMn60Z+35MEZvJqraY4aMTkBQ94t -uaJM2rZPq1kCU+eeX+KqRwJMvd11Re850j/YdzWPEvu9k1+isbB7drZKTmI9d1HT -HUIWpjYJDhJ2hFFamXHkY/OR/UVVTBfAJMSZ/nodHa2WKX2u76CnESqNTrFelUZs -jdtSTUA/S3DfcVvhx4FTWmwRmSgzAnauYwanFW9Zd+KuEKmPQA6JKBW4niUS11g8 -Luj+bPG9rJwPfiwbTl1VtS9DiMrm6hWnmvzySqQ3PhyDIBXT/2tx6SQhcK2u2/Vk -LtIGBDqjGltaagex8zm89HBgp3ByDy1Jh2yOaC2cHdidrkL9Wqo8bniA58Dt5jZS -0hHrAg+tT65sLVd2huHAX6yHzgbWtFp4F6N3pKPE4OY9rBbkVA/oQqiYGTWK0eaP -FQfg3yWWRV159xbDl/DnfnJ6T9puKk1/u+bMwfmjRMr+CJFAe0c1qYn/t/eP7oKl -mm3hd2NmhFG5RFRCGTArl6IkCHSyV6GuUkgUPfRqyCt6rLZishs= -=t1tY +iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmbPm2MACgkQgiRKeOb+ +ruo/LRAAjgOV5ZhbWPA8HwTYsGXfWOKCkne7/l3IM+PQRdN/iBDg/jW1CLqbTyk/ +zGgxcpYdyh8m2iBqDrWpFv2TZXRNUjcUrxcjyW2JXUXdqu/XCegHVgcr9pL4r61x +QwTbe68kofUy+cgqrRp/dPqLaNmxRZyGeig6dOnc/y+O9XwAShEUuwkMwhpK526r +j1Hs4GdvTciOTVM0178VSlHV9ORfzxEBOKCu3KNYMEbBHUy57LideUWJK3wnhcG/ +nQZnewCZ3cz4Pz0UjcOU21yLWqY3aXWJQ9VMWf8fo/T/q7/2B7Pu2wAcZQW4vZvf +0jzIeVpTG0aaEELenESXvQDG8V2mVulfDqT3v0iJ7MeaT/mTe8uTp05W0BERpRKf +s3SCR/yBDgzNCCW2rHFPuJlYzpLxMzZkp1mAD+DdtDH5wWLgOJcjyCAg1JryXR3e +Duv4/CCyvDDLMhvwZB2x8VaOrUzV76nax3ygd/tHulO5S+irDFopXTjuqFhvaUI9 +q1kDdpg7ZjEuja4NkPyS1Oe08+OUnQaBa4UYRo9fju+eCv6usKZvIpPbkD3jWWNt +C0lnY/LX3QmUU2aBPbNoX0eutTxKQ0x0tVsDG6XDUtXpfxoHFL0rKw63mFBdfPpH +Rmilpi9MR5H5xNL58HMAisjC+5p9xIEyFyAbW+HDSutSRJAYICI= +=2g4W -----END PGP SIGNATURE-----

1 0

commit qt6-wayland for openSUSE:Factory
by Source-Sync 30 Aug '24

30 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-wayland for openSUSE:Factory checked in at 2024-08-30 13:26:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-wayland (Old) and /work/SRC/openSUSE:Factory/.qt6-wayland.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-wayland" Fri Aug 30 13:26:32 2024 rev:37 rq:1197321 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-wayland/qt6-wayland.changes 2024-07-17 15:14:13.052027312 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-wayland.new.2698/qt6-wayland.changes 2024-08-30 13:26:55.060725443 +0200 @@ -1,0 +2,7 @@ +Wed Aug 28 08:36:28 UTC 2024 - Hillwood Yang <hillwood(a)opensuse.org> + +- Add patch to fix 'wl_shm' higher than interface version (2 > 1) + (boo#1229893, QTBUG-126379): + * 0001-update-wayland_xml-to-version-1_23_0.patch + +------------------------------------------------------------------- New: ---- 0001-update-wayland_xml-to-version-1_23_0.patch BETA DEBUG BEGIN: New: (boo#1229893, QTBUG-126379): * 0001-update-wayland_xml-to-version-1_23_0.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-wayland.spec ++++++ --- /var/tmp/diff_new_pack.YlWRgA/_old 2024-08-30 13:26:57.080809294 +0200 +++ /var/tmp/diff_new_pack.YlWRgA/_new 2024-08-30 13:26:57.104810290 +0200 @@ -39,8 +39,10 @@ Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version… Source99: qt6-wayland-rpmlintrc # PATCH-FIX-UPSTREAM -Patch1: 0001-Client-Ensure-that-guessed-popup-parent-has-a-shell-.patch -Patch2: 0001-client-Guard-against-windows-being-on-a-null-screen.patch +Patch0: 0001-Client-Ensure-that-guessed-popup-parent-has-a-shell-.patch +Patch1: 0001-client-Guard-against-windows-being-on-a-null-screen.patch +# https://bugreports.qt.io/browse/QTBUG-126379 +Patch2: 0001-update-wayland_xml-to-version-1_23_0.patch # https://codereview.qt-project.org/c/qt/qtwayland/+/574983 Patch3: 0002-Client-Improve-thread-safety-determining-window-size.patch BuildRequires: pkgconfig @@ -168,6 +170,7 @@ This package contains enabled features information shared by all the qt6-wayland libraries. + ### Private only libraries ### %package -n libQt6WaylandEglClientHwIntegration6 ++++++ 0001-update-wayland_xml-to-version-1_23_0.patch ++++++ From c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi(a)qt.io> Date: Wed, 3 Jul 2024 15:06:09 +0200 Subject: [PATCH] Update wayland.xml to version 1.23.0 This updates only the protocol definition, implementations will need additional commits to opt into using them. Change-Id: I5999e6dd75dfff7d904981fb1545d58c8b38ceb0 Reviewed-by: David Edmundson <davidedmundson(a)kde.org> --- src/3rdparty/protocol/wayland.xml | 215 ++++++++++++++++++++++-------- 1 file changed, 156 insertions(+), 59 deletions(-) diff --git a/src/3rdparty/protocol/wayland.xml b/src/3rdparty/protocol/wayland.xml index 10e039d6e..9418c62f3 100644 --- a/src/3rdparty/protocol/wayland.xml +++ b/src/3rdparty/protocol/wayland.xml @@ -46,7 +46,7 @@ compositor after the callback is fired and as such the client must not attempt to use it after that point. - The callback_data passed in the callback is the event serial. + The callback_data passed in the callback is undefined and should be ignored. </description> <arg name="callback" type="new_id" interface="wl_callback" summary="callback object for the sync request"/> @@ -212,7 +212,7 @@ </request> </interface> - <interface name="wl_shm_pool" version="1"> + <interface name="wl_shm_pool" version="2"> <description summary="a shared memory pool"> The wl_shm_pool object encapsulates a piece of memory shared between the compositor and client. Through the wl_shm_pool @@ -262,17 +262,17 @@ created, but using the new size. This request can only be used to make the pool bigger. - This request only changes the amount of bytes that are mmapped - by the server and does not touch the file corresponding to the - file descriptor passed at creation time. It is the client's - responsibility to ensure that the file is at least as big as - the new pool size. + This request only changes the amount of bytes that are mmapped + by the server and does not touch the file corresponding to the + file descriptor passed at creation time. It is the client's + responsibility to ensure that the file is at least as big as + the new pool size. </description> <arg name="size" type="int" summary="new size of the pool, in bytes"/> </request> </interface> - <interface name="wl_shm" version="1"> + <interface name="wl_shm" version="2"> <description summary="shared memory support"> A singleton global object that provides support for shared memory. @@ -419,6 +419,21 @@ <entry name="xbgr16161616" value="0x38344258" summary="[63:0] x:B:G:R 16:16:16:16 little endian"/> <entry name="argb16161616" value="0x38345241" summary="[63:0] A:R:G:B 16:16:16:16 little endian"/> <entry name="abgr16161616" value="0x38344241" summary="[63:0] A:B:G:R 16:16:16:16 little endian"/> + <entry name="c1" value="0x20203143" summary="[7:0] C0:C1:C2:C3:C4:C5:C6:C7 1:1:1:1:1:1:1:1 eight pixels/byte"/> + <entry name="c2" value="0x20203243" summary="[7:0] C0:C1:C2:C3 2:2:2:2 four pixels/byte"/> + <entry name="c4" value="0x20203443" summary="[7:0] C0:C1 4:4 two pixels/byte"/> + <entry name="d1" value="0x20203144" summary="[7:0] D0:D1:D2:D3:D4:D5:D6:D7 1:1:1:1:1:1:1:1 eight pixels/byte"/> + <entry name="d2" value="0x20203244" summary="[7:0] D0:D1:D2:D3 2:2:2:2 four pixels/byte"/> + <entry name="d4" value="0x20203444" summary="[7:0] D0:D1 4:4 two pixels/byte"/> + <entry name="d8" value="0x20203844" summary="[7:0] D"/> + <entry name="r1" value="0x20203152" summary="[7:0] R0:R1:R2:R3:R4:R5:R6:R7 1:1:1:1:1:1:1:1 eight pixels/byte"/> + <entry name="r2" value="0x20203252" summary="[7:0] R0:R1:R2:R3 2:2:2:2 four pixels/byte"/> + <entry name="r4" value="0x20203452" summary="[7:0] R0:R1 4:4 two pixels/byte"/> + <entry name="r10" value="0x20303152" summary="[15:0] x:R 6:10 little endian"/> + <entry name="r12" value="0x20323152" summary="[15:0] x:R 4:12 little endian"/> + <entry name="avuy8888" value="0x59555641" summary="[31:0] A:Cr:Cb:Y 8:8:8:8 little endian"/> + <entry name="xvuy8888" value="0x59555658" summary="[31:0] X:Cr:Cb:Y 8:8:8:8 little endian"/> + <entry name="p030" value="0x30333050" summary="2x2 subsampled Cr:Cb plane 10 bits per channel packed"/> </enum> <request name="create_pool"> @@ -442,6 +457,17 @@ </description> <arg name="format" type="uint" enum="format" summary="buffer pixel format"/> </event> + +  + + <request name="release" type="destructor" since="2"> + <description summary="release the shm object"> + Using this request a client can tell the server that it is not going to + use the shm object anymore. + + Objects created via this interface remain unaffected. + </description> + </request> </interface> <interface name="wl_buffer" version="1"> @@ -453,9 +479,11 @@ client provides and updates the contents is defined by the buffer factory interface. - If the buffer uses a format that has an alpha channel, the alpha channel - is assumed to be premultiplied in the color channels unless otherwise - specified. + Color channels are assumed to be electrical rather than optical (in other + words, encoded with a transfer function) unless otherwise specified. If + the buffer uses a format that has an alpha channel, the alpha channel is + assumed to be premultiplied into the electrical color channel values + (after transfer function encoding) unless otherwise specified. Note, because wl_buffer objects are created from multiple independent factory interfaces, the wl_buffer interface is frozen at version 1. @@ -847,6 +875,7 @@ <enum name="error"> <entry name="role" value="0" summary="given wl_surface has another role"/> + <entry name="used_source" value="1" summary="source has already been used"/> </enum> <request name="start_drag"> @@ -868,7 +897,7 @@ The icon surface is an optional (can be NULL) surface that provides an icon to be moved around with the cursor. Initially, the top-left corner of the icon surface is placed at the cursor - hotspot, but subsequent wl_surface.attach request can move the + hotspot, but subsequent wl_surface.offset requests can move the relative position. Attach requests must be confirmed with wl_surface.commit as usual. The icon surface is given the role of a drag-and-drop icon. If the icon surface already has another role, @@ -876,6 +905,10 @@ The input region is ignored for wl_surfaces with the role of a drag-and-drop icon. + + The given source may not be used in any further set_selection or + start_drag requests. Attempting to reuse a previously-used source + may send a used_source error. </description> <arg name="source" type="object" interface="wl_data_source" allow-null="true" summary="data source for the eventual transfer"/> <arg name="origin" type="object" interface="wl_surface" summary="surface where the drag originates"/> @@ -889,6 +922,10 @@ to the data from the source on behalf of the client. To unset the selection, set the source to NULL. + + The given source may not be used in any further set_selection or + start_drag requests. Attempting to reuse a previously-used source + may send a used_source error. </description> <arg name="source" type="object" interface="wl_data_source" allow-null="true" summary="data source for the selection"/> <arg name="serial" type="uint" summary="serial number of the event that triggered this request"/> @@ -1411,7 +1448,7 @@ <entry name="invalid_size" value="2" summary="buffer size is invalid"/> <entry name="invalid_offset" value="3" summary="buffer offset is invalid"/> <entry name="defunct_role_object" value="4" - summary="surface was destroyed before its role object"/> + summary="surface was destroyed before its role object"/> </enum> <request name="destroy" type="destructor"> @@ -1440,9 +1477,9 @@ When the bound wl_surface version is 5 or higher, passing any non-zero x or y is a protocol violation, and will result in an - 'invalid_offset' error being raised. The x and y arguments are ignored - and do not change the pending state. To achieve equivalent semantics, - use wl_surface.offset. + 'invalid_offset' error being raised. The x and y arguments are ignored + and do not change the pending state. To achieve equivalent semantics, + use wl_surface.offset. Surface contents are double-buffered state, see wl_surface.commit. @@ -1479,6 +1516,13 @@ If wl_surface.attach is sent with a NULL wl_buffer, the following wl_surface.commit will remove the surface content. + + If a pending wl_buffer has been destroyed, the result is not specified. + Many compositors are known to remove the surface content on the following + wl_surface.commit, but this behaviour is not universal. Clients seeking to + maximise compatibility should not destroy pending buffers and should + ensure that they explicitly remove content from surfaces, even after + destroying buffers. </description> <arg name="buffer" type="object" interface="wl_buffer" allow-null="true" summary="buffer of surface contents"/> @@ -1618,16 +1662,18 @@ <description summary="commit pending surface state"> Surface state (input, opaque, and damage regions, attached buffers, etc.) is double-buffered. Protocol requests modify the pending state, - as opposed to the current state in use by the compositor. A commit - request atomically applies all pending state, replacing the current - state. After commit, the new pending state is as documented for each - related request. + as opposed to the active state in use by the compositor. - On commit, a pending wl_buffer is applied first, and all other state - second. This means that all coordinates in double-buffered state are - relative to the new wl_buffer coming into use, except for - wl_surface.attach itself. If there is no pending wl_buffer, the - coordinates are relative to the current surface contents. + A commit request atomically creates a content update from the pending + state, even if the pending state has not been touched. The content + update is placed in a queue until it becomes active. After commit, the + new pending state is as documented for each related request. + + When the content update is applied, the wl_buffer is applied before all + other state. This means that all coordinates in double-buffered state + are relative to the newly attached wl_buffers, except for + wl_surface.attach itself. If there is no newly attached wl_buffer, the + coordinates are relative to the previous content update. All requests that need a commit to become effective are documented to affect double-buffered state. @@ -1666,10 +1712,12 @@ <request name="set_buffer_transform" since="2"> <description summary="sets the buffer transformation"> - This request sets an optional transformation on how the compositor - interprets the contents of the buffer attached to the surface. The - accepted values for the transform parameter are the values for - wl_output.transform. + This request sets the transformation that the client has already applied + to the content of the buffer. The accepted values for the transform + parameter are the values for wl_output.transform. + + The compositor applies the inverse of this transformation whenever it + uses the buffer contents. Buffer transform is double-buffered state, see wl_surface.commit. @@ -1725,11 +1773,11 @@ a buffer that is larger (by a factor of scale in each dimension) than the desired surface size. - If scale is not positive the invalid_scale protocol error is + If scale is not greater than 0 the invalid_scale protocol error is raised. </description> <arg name="scale" type="int" - summary="positive scale for interpreting buffer contents"/> + summary="scale for interpreting buffer contents"/> </request>  @@ -1802,10 +1850,15 @@ This event indicates the preferred buffer scale for this surface. It is sent whenever the compositor's preference changes. + Before receiving this event the preferred buffer scale for this surface + is 1. + It is intended that scaling aware clients use this event to scale their content and use wl_surface.set_buffer_scale to indicate the scale they have rendered with. This allows clients to supply a higher detail buffer. + + The compositor shall emit a scale value greater than 0. </description> <arg name="factor" type="int" summary="preferred scaling factor"/> </event> @@ -1815,9 +1868,12 @@ This event indicates the preferred buffer transform for this surface. It is sent whenever the compositor's preference changes. - It is intended that transform aware clients use this event to apply the - transform to their content and use wl_surface.set_buffer_transform to - indicate the transform they have rendered with. + Before receiving this event the preferred buffer transform for this + surface is normal. + + Applying this transformation to the surface buffer contents and using + wl_surface.set_buffer_transform might allow the compositor to use the + surface buffer more efficiently. </description> <arg name="transform" type="uint" enum="wl_output.transform" summary="preferred transform"/> @@ -1992,9 +2048,9 @@ where (x, y) are the coordinates of the pointer location, in surface-local coordinates. - On surface.attach requests to the pointer surface, hotspot_x + On wl_surface.offset requests to the pointer surface, hotspot_x and hotspot_y are decremented by the x and y parameters - passed to the request. Attach must be confirmed by + passed to the request. The offset must be applied by wl_surface.commit as usual. The hotspot can also be updated by passing the currently set @@ -2248,7 +2304,7 @@ <arg name="axis" type="uint" enum="axis" summary="the axis stopped with this event"/> </event> - <event name="axis_discrete" since="5"> + <event name="axis_discrete" since="5" deprecated-since="8"> <description summary="axis click event"> Discrete step information for scroll and other axes. @@ -2374,6 +2430,16 @@ <description summary="keyboard input device"> The wl_keyboard interface represents one or more keyboards associated with a seat. + + Each wl_keyboard has the following logical state: + + - an active surface (possibly null), + - the keys currently logically down, + - the active modifiers, + - the active group. + + By default, the active surface is null, the keys currently logically down + are empty, the active modifiers and the active group are 0. </description> <enum name="keymap_format"> @@ -2408,10 +2474,15 @@ The compositor must send the wl_keyboard.modifiers event after this event. + + In the wl_keyboard logical state, this event sets the active surface to + the surface argument and the keys currently logically down to the keys + in the keys argument. The compositor must not send this event if the + wl_keyboard already had an active surface immediately before this event. </description> <arg name="serial" type="uint" summary="serial number of the enter event"/> <arg name="surface" type="object" interface="wl_surface" summary="surface gaining keyboard focus"/> - <arg name="keys" type="array" summary="the currently pressed keys"/> + <arg name="keys" type="array" summary="the keys currently logically down"/> </event> <event name="leave"> @@ -2422,8 +2493,10 @@ The leave notification is sent before the enter notification for the new focus. - After this event client must assume that all keys, including modifiers, - are lifted and also it must stop key repeating if there's some going on. + In the wl_keyboard logical state, this event resets all values to their + defaults. The compositor must not send this event if the active surface + of the wl_keyboard was not equal to the surface argument immediately + before this event. </description> <arg name="serial" type="uint" summary="serial number of the leave event"/> <arg name="surface" type="object" interface="wl_surface" summary="surface that lost keyboard focus"/> @@ -2448,6 +2521,15 @@ If this event produces a change in modifiers, then the resulting wl_keyboard.modifiers event must be sent after this event. + + In the wl_keyboard logical state, this event adds the key to the keys + currently logically down (if the state argument is pressed) or removes + the key from the keys currently logically down (if the state argument is + released). The compositor must not send this event if the wl_keyboard + did not have an active surface immediately before this event. The + compositor must not send this event if state is pressed (resp. released) + and the key was already logically down (resp. was not logically down) + immediately before this event. </description> <arg name="serial" type="uint" summary="serial number of the key event"/> <arg name="time" type="uint" summary="timestamp with millisecond granularity"/> @@ -2459,6 +2541,17 @@ <description summary="modifier and group state"> Notifies clients that the modifier and/or group state has changed, and it should update its local state. + + The compositor may send this event without a surface of the client + having keyboard focus, for example to tie modifier information to + pointer focus instead. If a modifier event with pressed modifiers is sent + without a prior enter event, the client can assume the modifier state is + valid until it receives the next wl_keyboard.modifiers event. In order to + reset the modifier state again, the compositor can send a + wl_keyboard.modifiers event with no pressed modifiers. + + In the wl_keyboard logical state, this event updates the modifiers and + group. </description> <arg name="serial" type="uint" summary="serial number of the modifiers event"/> <arg name="mods_depressed" type="uint" summary="depressed modifiers"/> @@ -2566,6 +2659,8 @@ currently active on this client's surface. The client is responsible for finalizing the touch points, future touch points on this surface may reuse the touch point ID. + + No frame event is required after the cancel event. </description> </event> @@ -2665,10 +2760,9 @@ </enum> <enum name="transform"> - <description summary="transform from framebuffer to output"> - This describes the transform that a compositor will apply to a - surface to compensate for the rotation or mirroring of an - output device. + <description summary="transformation applied to buffer contents"> + This describes transformations that clients and compositors apply to + buffer contents. The flipped values correspond to an initial flip around a vertical axis followed by rotation. @@ -2700,6 +2794,10 @@ The geometry event will be followed by a done event (starting from version 2). + Clients should use wl_surface.preferred_buffer_transform instead of the + transform advertised by this event to find the preferred buffer + transform to use for a surface. + Note: wl_output only advertises partial information about the output position and identification. Some compositors, for instance those not implementing a desktop-style output layout or those exposing virtual @@ -2722,7 +2820,7 @@ <arg name="model" type="string" summary="textual description of the model"/> <arg name="transform" type="int" enum="transform" - summary="transform that maps framebuffer to output"/> + summary="additional transformation applied to buffer contents during presentation"/> </event> <enum name="mode" bitfield="true"> @@ -2795,8 +2893,9 @@ This event contains scaling geometry information that is not in the geometry event. It may be sent after binding the output object or if the output scale changes - later. If it is not sent, the client should assume a - scale of 1. + later. The compositor will emit a non-zero, positive + value for scale. If it is not sent, the client should + assume a scale of 1. A scale larger than 1 means that the compositor will automatically scale surface buffers by this amount @@ -2804,12 +2903,9 @@ displays where applications rendering at the native resolution would be too small to be legible. - It is intended that scaling aware clients track the - current output of a surface, and if it is on a scaled - output it should use wl_surface.set_buffer_scale with - the scale of the output. That way the compositor can - avoid scaling the surface, and the client can supply - a higher detail image. + Clients should use wl_surface.preferred_buffer_scale + instead of this event to find the preferred buffer + scale to use for a surface. The scale event will be followed by a done event. </description> @@ -3035,6 +3131,11 @@ If the parent wl_surface object is destroyed, the sub-surface is unmapped. + + A sub-surface never has the keyboard focus of any seat. + + The wl_surface.offset request is ignored: clients must use set_position + instead to move the sub-surface. </description> <request name="destroy" type="destructor"> @@ -3060,9 +3161,7 @@ surface area. Negative values are allowed. The scheduled coordinates will take effect whenever the state of the - parent surface is applied. When this happens depends on whether the - parent surface is in synchronized mode or not. See - wl_subsurface.set_sync and wl_subsurface.set_desync for details. + parent surface is applied. If more than one set_position request is invoked by the client before the commit of the parent surface, the position of a new request always @@ -3085,9 +3184,7 @@ The z-order is double-buffered. Requests are handled in order and applied immediately to a pending state. The final pending state is copied to the active state the next time the state of the parent - surface is applied. When this happens depends on whether the parent - surface is in synchronized mode or not. See wl_subsurface.set_sync and - wl_subsurface.set_desync for details. + surface is applied. A new sub-surface is initially added as the top-most in the stack of its siblings and parent.

1 0

commit perl-Scalar-List-Utils for openSUSE:Factory
by Source-Sync 30 Aug '24

30 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package perl-Scalar-List-Utils for openSUSE:Factory checked in at 2024-08-30 13:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Scalar-List-Utils (Old) and /work/SRC/openSUSE:Factory/.perl-Scalar-List-Utils.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Scalar-List-Utils" Fri Aug 30 13:26:14 2024 rev:26 rq:1197303 version:1.650.0 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Scalar-List-Utils/perl-Scalar-List-Utils.changes 2022-08-17 18:22:41.419121264 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Scalar-List-Utils.new.2698/perl-Scalar-List-Utils.changes 2024-08-30 13:26:35.311905692 +0200 @@ -1,0 +2,20 @@ +Wed Aug 7 05:30:09 UTC 2024 - Tina Müller <timueller+perl(a)suse.de> + +- updated to 1.650.0 (1.65) + see /usr/share/doc/packages/perl-Scalar-List-Utils/Changes + + 1.65 -- 2024-08-06 + [BUGFIXES] + * Update exotic names test to avoid single quote package separator + (GH #128) + * Don't loop forever in uniqnum.t (GH #130) + + 1.64 -- 2024-08-02 + [CHANGES] + * On Perl version 5.40 or later, various `Scalar::Util` functions are + now simply aliases to core-provided functions in `builtin::`: + + blessed(), refaddr(), reftype(), weaken(), unweaken(), isweak() + * Remember to list `head` and `tail` in `List::Util` SYNOPSIS + * Various improvements to internal CI infrastructure + +------------------------------------------------------------------- Old: ---- Scalar-List-Utils-1.63.tar.gz New: ---- Scalar-List-Utils-1.65.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Scalar-List-Utils.spec ++++++ --- /var/tmp/diff_new_pack.CcMpPO/_old 2024-08-30 13:26:35.991933918 +0200 +++ /var/tmp/diff_new_pack.CcMpPO/_new 2024-08-30 13:26:35.995934085 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Scalar-List-Utils # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,12 +18,14 @@ %define cpan_name Scalar-List-Utils Name: perl-Scalar-List-Utils -Version: 1.63 +Version: 1.650.0 Release: 0 +# 1.65 -> normalize -> 1.650.0 +%define cpan_version 1.65 License: Artistic-1.0 OR GPL-1.0-or-later Summary: Common Scalar and List utility subroutines URL: https://metacpan.org/release/%{cpan_name} -Source0: https://cpan.metacpan.org/authors/id/P/PE/PEVANS/%{cpan_name}-%{version}.ta… +Source0: https://cpan.metacpan.org/authors/id/P/PE/PEVANS/%{cpan_name}-%{cpan_versio… Source1: cpanspec.yml BuildRequires: perl BuildRequires: perl-macros @@ -33,7 +35,7 @@ Common Scalar and List utility subroutines %prep -%autosetup -n %{cpan_name}-%{version} +%autosetup -n %{cpan_name}-%{cpan_version} %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" ++++++ Scalar-List-Utils-1.63.tar.gz -> Scalar-List-Utils-1.65.tar.gz ++++++ ++++ 3674 lines of diff (skipped)

1 0

commit git for openSUSE:Factory
by Source-Sync 30 Aug '24

30 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2024-08-30 13:26:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "git" Fri Aug 30 13:26:07 2024 rev:315 rq:1197168 version:2.46.0 Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2024-07-31 13:28:34.086015007 +0200 +++ /work/SRC/openSUSE:Factory/.git.new.2698/git.changes 2024-08-30 13:26:30.851720555 +0200 @@ -1,0 +2,5 @@ +Wed Aug 28 08:33:45 UTC 2024 - Georg Pfuetzenreuter <georg.pfuetzenreuter(a)suse.com> + +- Change less requirement to path to allow for use with BusyBox + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.hweG2L/_old 2024-08-30 13:26:31.587751106 +0200 +++ /var/tmp/diff_new_pack.hweG2L/_new 2024-08-30 13:26:31.587751106 +0200 @@ -129,7 +129,7 @@ %package core Summary: Core git tools Group: Development/Tools/Version Control -Requires: less +Requires: /usr/bin/less Obsoletes: git-remote-helpers < %{version} %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 Recommends: openssh-clients

1 0

commit glib2 for openSUSE:Factory
by Source-Sync 30 Aug '24

30 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at 2024-08-30 13:26:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2 (Old) and /work/SRC/openSUSE:Factory/.glib2.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glib2" Fri Aug 30 13:26:01 2024 rev:283 rq:1197025 version:2.80.5 Changes: -------- --- /work/SRC/openSUSE:Factory/glib2/glib2.changes 2024-08-27 19:38:24.734135286 +0200 +++ /work/SRC/openSUSE:Factory/.glib2.new.2698/glib2.changes 2024-08-30 13:26:23.859430312 +0200 @@ -1,0 +2,6 @@ +Tue Aug 27 12:00:06 UTC 2024 - pgajdos(a)suse.com + +- remove dependency on /usr/bin/python3 using + %python3_fix_shebang{,_path} macros, [bsc#1212476] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.rA7i57/_old 2024-08-30 13:26:28.119607147 +0200 +++ /var/tmp/diff_new_pack.rA7i57/_new 2024-08-30 13:26:28.131607645 +0200 @@ -443,6 +443,10 @@ mkdir -p %{buildroot}%{_datadir}/zsh/site-functions/ cp -T %{SOURCE8} %{buildroot}%{_datadir}/zsh/site-functions/_gsettings %fdupes %{buildroot}/%{_prefix} + %python3_fix_shebang + %if %{suse_version} >= 1600 + %python3_fix_shebang_path %{buildroot}%{_libexecdir}/installed-tests/glib/* + %endif # Too many users complain about schemas compiled with wrong permissions # when in fact the system just honours their umask setting

1 0

commit python-pandas for openSUSE:Factory
by Source-Sync 30 Aug '24

30 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pandas for openSUSE:Factory checked in at 2024-08-30 13:25:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pandas (Old) and /work/SRC/openSUSE:Factory/.python-pandas.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pandas" Fri Aug 30 13:25:55 2024 rev:68 rq:1197229 version:2.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pandas/python-pandas.changes 2024-07-17 15:14:52.781471409 +0200 +++ /work/SRC/openSUSE:Factory/.python-pandas.new.2698/python-pandas.changes 2024-08-30 13:26:17.331159331 +0200 @@ -1,0 +2,12 @@ +Wed Aug 28 13:53:55 UTC 2024 - Ben Greiner <code(a)bnavigator.de> + +- Skip overflowing tests on 32-bit + +------------------------------------------------------------------- +Sun Aug 25 21:22:36 UTC 2024 - Ben Greiner <code(a)bnavigator.de> + +- Add pandas-pr59353-np2eval.patch + * gh#pandas-dev/pandas#59353 + * gh#pandas-dev/pandas#58548 + +------------------------------------------------------------------- New: ---- pandas-pr59353-np2eval.patch BETA DEBUG BEGIN: New: - Add pandas-pr59353-np2eval.patch * gh#pandas-dev/pandas#59353 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pandas.spec ++++++ --- /var/tmp/diff_new_pack.jZebDa/_old 2024-08-30 13:26:18.535209310 +0200 +++ /var/tmp/diff_new_pack.jZebDa/_new 2024-08-30 13:26:18.539209476 +0200 @@ -77,6 +77,8 @@ Patch2: pandas-pr58484-matplotlib.patch # PATCH-FIX-UPSTREAM pandas-pr59175-matplotlib.patch -- gh#pandas-dev/pandas#59175 Patch3: https://github.com/pandas-dev/pandas/pull/59175.patch#/pandas-pr59175-matpl… +# PATCH-FIX-UPSTREAM pandas-pr59353-np2eval.patch -- gh#pandas-dev/pandas#59144 backported to 2.2, no new tests, see gh#pandas-dev/pandas#58548, gh#pandas-dev/pandas#59353 +Patch4: pandas-pr59353-np2eval.patch %if !%{with test} BuildRequires: %{python_module Cython >= 3.0.5} BuildRequires: %{python_module devel >= 3.9} @@ -515,9 +517,11 @@ # expects a dirty git revision from git repo SKIP_TESTS+=" or test_git_version" %if "%{flavor}" == "test-py312" -# https://github.com/pandas-dev/pandas/pull/57391, proposed change is not necessary the right one +# https://github.com/pandas-dev/pandas/pull/57391, proposed change is not necessarily the right one SKIP_TESTS+=" or (test_scalar_unary and numexpr-pandas)" %endif +# Numpy2: unexpected 'np.str_(...)' in error message +SKIP_TESTS+=" or test_group_subplot_invalid_column_name" %ifarch %{ix86} %{arm32} # https://github.com/pandas-dev/pandas/issues/31856 @@ -528,6 +532,9 @@ SKIP_TESTS+=" or test_large_string_pyarrow" SKIP_TESTS+=" or test_pandas_nullable_with_missing_values" SKIP_TESTS+=" or test_pandas_nullable_without_missing_values" +SKIP_TESTS+=" or (test_to_datetime and TestOrigin and test_epoch)" +SKIP_TESTS+=" or test_td_mul_numeric_ndarray_0d" +SKIP_TESTS+=" or test_get_indexer_non_unique_wrong_dtype" # pyarrow read-only errors SKIP_TESTS+=" or test_left_join_multi_index" SKIP_TESTS+=" or test_join_on_single_col_dup_on_right" ++++++ pandas-pr59353-np2eval.patch ++++++ diff --git a/pandas/_testing/__init__.py b/pandas/_testing/__init__.py index 361998db8e..87d419e2db 100644 --- a/pandas/_testing/__init__.py +++ b/pandas/_testing/__init__.py @@ -111,6 +111,7 @@ ALL_FLOAT_DTYPES: list[Dtype] = [*FLOAT_NUMPY_DTYPES, *FLOAT_EA_DTYPES] COMPLEX_DTYPES: list[Dtype] = [complex, "complex64", "complex128"] STRING_DTYPES: list[Dtype] = [str, "str", "U"] +COMPLEX_FLOAT_DTYPES: list[Dtype] = [*COMPLEX_DTYPES, *FLOAT_NUMPY_DTYPES] DATETIME64_DTYPES: list[Dtype] = ["datetime64[ns]", "M8[ns]"] TIMEDELTA64_DTYPES: list[Dtype] = ["timedelta64[ns]", "m8[ns]"] diff --git a/pandas/conftest.py b/pandas/conftest.py index 7c35dfdde9..10134c90f8 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -1403,6 +1403,21 @@ def complex_dtype(request): return request.param +(a)pytest.fixture(params=tm.COMPLEX_FLOAT_DTYPES) +def complex_or_float_dtype(request): + """ + Parameterized fixture for complex and numpy float dtypes. + + * complex + * 'complex64' + * 'complex128' + * float + * 'float32' + * 'float64' + """ + return request.param + + @pytest.fixture(params=tm.SIGNED_INT_NUMPY_DTYPES) def any_signed_int_numpy_dtype(request): """ diff --git a/pandas/core/computation/expr.py b/pandas/core/computation/expr.py index b5861fbaeb..d642c37cea 100644 --- a/pandas/core/computation/expr.py +++ b/pandas/core/computation/expr.py @@ -31,7 +31,6 @@ from pandas.core.computation.ops import ( UNARY_OPS_SYMS, BinOp, Constant, - Div, FuncNode, Op, Term, @@ -370,7 +369,7 @@ class BaseExprVisitor(ast.NodeVisitor): "Add", "Sub", "Mult", - None, + "Div", "Pow", "FloorDiv", "Mod", @@ -533,9 +532,6 @@ class BaseExprVisitor(ast.NodeVisitor): left, right = self._maybe_downcast_constants(left, right) return self._maybe_evaluate_binop(op, op_class, left, right) - def visit_Div(self, node, **kwargs): - return lambda lhs, rhs: Div(lhs, rhs) - def visit_UnaryOp(self, node, **kwargs): op = self.visit(node.op) operand = self.visit(node.operand) diff --git a/pandas/core/computation/ops.py b/pandas/core/computation/ops.py index 95ac20ba39..ea8b1c0457 100644 --- a/pandas/core/computation/ops.py +++ b/pandas/core/computation/ops.py @@ -332,31 +332,6 @@ for d in (_cmp_ops_dict, _bool_ops_dict, _arith_ops_dict): _binary_ops_dict.update(d) -def _cast_inplace(terms, acceptable_dtypes, dtype) -> None: - """ - Cast an expression inplace. - - Parameters - ---------- - terms : Op - The expression that should cast. - acceptable_dtypes : list of acceptable numpy.dtype - Will not cast if term's dtype in this list. - dtype : str or numpy.dtype - The dtype to cast to. - """ - dt = np.dtype(dtype) - for term in terms: - if term.type in acceptable_dtypes: - continue - - try: - new_value = term.value.astype(dt) - except AttributeError: - new_value = dt.type(term.value) - term.update(new_value) - - def is_term(obj) -> bool: return isinstance(obj, Term) @@ -516,31 +491,6 @@ class BinOp(Op): def isnumeric(dtype) -> bool: return issubclass(np.dtype(dtype).type, np.number) - -class Div(BinOp): - """ - Div operator to special case casting. - - Parameters - ---------- - lhs, rhs : Term or Op - The Terms or Ops in the ``/`` expression. - """ - - def __init__(self, lhs, rhs) -> None: - super().__init__("/", lhs, rhs) - - if not isnumeric(lhs.return_type) or not isnumeric(rhs.return_type): - raise TypeError( - f"unsupported operand type(s) for {self.op}: " - f"'{lhs.return_type}' and '{rhs.return_type}'" - ) - - # do not upcast float32s to float64 un-necessarily - acceptable_dtypes = [np.float32, np.float64] - _cast_inplace(com.flatten(self), acceptable_dtypes, np.float64) - - UNARY_OPS_SYMS = ("+", "-", "~", "not") _unary_ops_funcs = (operator.pos, operator.neg, operator.invert, operator.invert) _unary_ops_dict = dict(zip(UNARY_OPS_SYMS, _unary_ops_funcs)) diff --git a/pandas/tests/computation/test_eval.py b/pandas/tests/computation/test_eval.py index 17630f14b0..e8fad6b8cb 100644 --- a/pandas/tests/computation/test_eval.py +++ b/pandas/tests/computation/test_eval.py @@ -747,16 +747,26 @@ class TestTypeCasting: @pytest.mark.parametrize("op", ["+", "-", "*", "**", "/"]) # maybe someday... numexpr has too many upcasting rules now # chain(*(np.core.sctypes[x] for x in ['uint', 'int', 'float'])) - @pytest.mark.parametrize("dt", [np.float32, np.float64]) @pytest.mark.parametrize("left_right", [("df", "3"), ("3", "df")]) - def test_binop_typecasting(self, engine, parser, op, dt, left_right): - df = DataFrame(np.random.default_rng(2).standard_normal((5, 3)), dtype=dt) + def test_binop_typecasting( + self, engine, parser, op, complex_or_float_dtype, left_right, request + ): + # GH#21374 + dtype = complex_or_float_dtype + df = DataFrame(np.random.default_rng(2).standard_normal((5, 3)), dtype=dtype) left, right = left_right s = f"{left} {op} {right}" res = pd.eval(s, engine=engine, parser=parser) - assert df.values.dtype == dt - assert res.values.dtype == dt - tm.assert_frame_equal(res, eval(s)) + if dtype == "complex64" and engine == "numexpr": + mark = pytest.mark.xfail( + reason="numexpr issue with complex that are upcast " + "to complex 128 " + "https://github.com/pydata/numexpr/issues/492" + ) + request.applymarker(mark) + assert df.values.dtype == dtype + assert res.values.dtype == dtype + tm.assert_frame_equal(res, eval(s), check_exact=False) # -------------------------------------

1 0

commit gnustep-make for openSUSE:Factory
by Source-Sync 30 Aug '24

30 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnustep-make for openSUSE:Factory checked in at 2024-08-30 13:25:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnustep-make (Old) and /work/SRC/openSUSE:Factory/.gnustep-make.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnustep-make" Fri Aug 30 13:25:47 2024 rev:9 rq:1197580 version:2.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gnustep-make/gnustep-make.changes 2024-07-08 19:07:22.956814258 +0200 +++ /work/SRC/openSUSE:Factory/.gnustep-make.new.2698/gnustep-make.changes 2024-08-30 13:26:04.130611391 +0200 @@ -1,0 +2,5 @@ +Fri Aug 9 17:33:15 UTC 2024 - Franz Sirl <franz.sirl-obs(a)lauterbach.com> + +- Use the --with-libdir configure option introduced with 2.9.2. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnustep-make.spec ++++++ --- /var/tmp/diff_new_pack.fmNFih/_old 2024-08-30 13:26:04.714635633 +0200 +++ /var/tmp/diff_new_pack.fmNFih/_new 2024-08-30 13:26:04.714635633 +0200 @@ -17,7 +17,6 @@ %define gs_config %{_sysconfdir}/GNUstep/GNUstep.conf -%define gs_layout fhs-other %define gs_makefiles %{_datadir}/GNUstep/Makefiles # Disable LTO for all GNUstep packages %define _lto_cflags %{nil} @@ -43,14 +42,11 @@ %prep %autosetup -# Set correct library path. -sed -e 's|/lib/|/%{_lib}/|' -e 's|/lib$|/%{_lib}|' \ - FilesystemLayouts/fhs-system > FilesystemLayouts/%{gs_layout} %build # '--with-tar=tar' ensures we get the real tar rather than gnutar. # If star is installed, it sets up a duff gnutar. -%configure --with-layout=%{gs_layout} \ +%configure --with-layout=fhs-system --with-libdir=%{_lib} \ %if 0%{?suse_version} >= 1120 --enable-native-objc-exceptions \ %endif

1 0

commit sdbootutil for openSUSE:Factory
by Source-Sync 30 Aug '24

30 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sdbootutil for openSUSE:Factory checked in at 2024-08-30 13:25:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sdbootutil (Old) and /work/SRC/openSUSE:Factory/.sdbootutil.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sdbootutil" Fri Aug 30 13:25:45 2024 rev:30 rq:1197503 version:1+git20240829.1b5aa4d Changes: -------- --- /work/SRC/openSUSE:Factory/sdbootutil/sdbootutil.changes 2024-08-29 15:43:03.448459111 +0200 +++ /work/SRC/openSUSE:Factory/.sdbootutil.new.2698/sdbootutil.changes 2024-08-30 13:25:59.314411476 +0200 @@ -1,0 +2,6 @@ +Thu Aug 29 17:19:24 UTC 2024 - aplanas(a)suse.com + +- Update to version 1+git20240829.1b5aa4d: + * Add --default-snapshot parameter (bsc#1224773) + +------------------------------------------------------------------- Old: ---- sdbootutil-1+git20240823.30ef4f1.obscpio New: ---- sdbootutil-1+git20240829.1b5aa4d.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sdbootutil.spec ++++++ --- /var/tmp/diff_new_pack.h8fEMv/_old 2024-08-30 13:26:00.054442194 +0200 +++ /var/tmp/diff_new_pack.h8fEMv/_new 2024-08-30 13:26:00.054442194 +0200 @@ -27,7 +27,7 @@ %define git_version %{nil} %endif Name: sdbootutil -Version: 1+git20240823.30ef4f1%{git_version} +Version: 1+git20240829.1b5aa4d%{git_version} Release: 0 Summary: script to install shim with sd-boot License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.h8fEMv/_old 2024-08-30 13:26:00.110444518 +0200 +++ /var/tmp/diff_new_pack.h8fEMv/_new 2024-08-30 13:26:00.114444684 +0200 @@ -3,6 +3,6 @@ <param name="url">https://github.com/lnussel/sdbootutil.git</param> <param name="changesrevision">708592a5033bb41d14e378172466ae9e90dfb3c4</param></service><service name="tar_scm"> <param name="url">https://github.com/openSUSE/sdbootutil.git</param> - <param name="changesrevision">30ef4f1b51f4ec7c5a14efd6560c1da122c65cce</param></service></servicedata> + <param name="changesrevision">1b5aa4dff0d80c2b6871e3224fb1a5e8eb4d92f8</param></service></servicedata> (No newline at EOF) ++++++ sdbootutil-1+git20240823.30ef4f1.obscpio -> sdbootutil-1+git20240829.1b5aa4d.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sdbootutil-1+git20240823.30ef4f1/sdbootutil new/sdbootutil-1+git20240829.1b5aa4d/sdbootutil --- old/sdbootutil-1+git20240823.30ef4f1/sdbootutil 2024-08-23 10:54:27.000000000 +0200 +++ new/sdbootutil-1+git20240829.1b5aa4d/sdbootutil 2024-08-29 19:17:34.000000000 +0200 @@ -21,6 +21,7 @@ arg_no_random_seed= arg_portable= arg_only_default= +arg_default_snapshot= arg_ask_pin_or_pw= arg_method= arg_signed_policy= @@ -88,6 +89,7 @@ --no-reuse-initrd Always regenerate initrd --portable Handle bootloader on portable devices --only-default Only list the default entry + --default-snapshot [SNAPSHOT] refers to the default snapshot --ask-pin Ask recovery PIN for re-enrollment Ask TPM2 PIN when initial enrollment --ask-pw Ask password when initial enrollment @@ -503,7 +505,7 @@ local type date desc important pre_num local snapshot_info - update_snapper + [ -s "$snapperfile" ] || update_snapper # shellcheck disable=SC2046 IFS="|" read -r type date desc important pre_num <<< \ @@ -1040,7 +1042,7 @@ list_snapshots() { [ -n "$have_snapshots" ] || { log_info "System does not support snapshots."; return 0; } - update_snapper 2>"$tmpfile" || err "$(cat "$tmpfile")" + [ -s "$snapperfile" ] || update_snapper 2>"$tmpfile" || err "$(cat "$tmpfile")" local n=0 while read -r n isdefault title; do @@ -1313,8 +1315,6 @@ find_grub2() { - local prefix="" - [ -z "$have_snapshots" ] || prefix="/.snapshots/${1-$root_snapshot}/snapshot" local grub2 # The old grub.efi will contain the BLS patches, but we cannot # use it because we also dropped the process of creating the @@ -2411,7 +2411,7 @@ ####### main ####### -getopttmp=$(getopt -o hc:v --long help,flicker,verbose,esp-path:,entry-token:,arch:,image:,entry-keys:,no-variables,no-reuse-initrd,no-random-seed,all,portable,only-default,ask-pin,ask-pw,method:,signed-policy -n "${0##*/}" -- "$@") +getopttmp=$(getopt -o hc:v --long help,flicker,verbose,esp-path:,entry-token:,arch:,image:,entry-keys:,no-variables,no-reuse-initrd,no-random-seed,all,portable,only-default,default-snapshot,ask-pin,ask-pw,method:,signed-policy -n "${0##*/}" -- "$@") eval set -- "$getopttmp" while true ; do @@ -2430,6 +2430,7 @@ --all) arg_all_entries=1; shift ;; --portable) arg_portable=1; shift ;; --only-default) arg_only_default=1; shift ;; + --default-snapshot) arg_default_snapshot=1; shift ;; --ask-pin|--ask-pw) arg_ask_pin_or_pw=1; shift ;; --method) arg_method="$2"; shift 2 ;; --signed-policy) arg_signed_policy=1; shift ;; @@ -2468,8 +2469,13 @@ fi root_snapshot="" if [ -n "$have_snapshots" ]; then - root_snapshot="${root_subvol#"${subvol_prefix}"/.snapshots/}" - root_snapshot="${root_snapshot%/snapshot}" + if [ -n "$arg_default_snapshot" ]; then + [ -s "$snapperfile" ] || update_snapper + read -r root_snapshot <<< "$(jq -r '.root[]|select(.default==true)|.number' < "$snapperfile")" + else + root_snapshot="${root_subvol#"${subvol_prefix}"/.snapshots/}" + root_snapshot="${root_snapshot%/snapshot}" + fi fi if [ -n "$arg_esp_path" ] && [ "$boot_root" != "$arg_esp_path" ]; then ++++++ sdbootutil.obsinfo ++++++ --- /var/tmp/diff_new_pack.h8fEMv/_old 2024-08-30 13:26:00.254450496 +0200 +++ /var/tmp/diff_new_pack.h8fEMv/_new 2024-08-30 13:26:00.258450662 +0200 @@ -1,5 +1,5 @@ name: sdbootutil -version: 1+git20240823.30ef4f1 -mtime: 1724403267 -commit: 30ef4f1b51f4ec7c5a14efd6560c1da122c65cce +version: 1+git20240829.1b5aa4d +mtime: 1724951854 +commit: 1b5aa4dff0d80c2b6871e3224fb1a5e8eb4d92f8

1 0

commit python311 for openSUSE:Factory
by Source-Sync 30 Aug '24

30 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python311 for openSUSE:Factory checked in at 2024-08-30 13:25:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python311 (Old) and /work/SRC/openSUSE:Factory/.python311.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python311" Fri Aug 30 13:25:42 2024 rev:39 rq:1197475 version:3.11.9 Changes: -------- --- /work/SRC/openSUSE:Factory/python311/python311.changes 2024-08-10 19:05:46.408732978 +0200 +++ /work/SRC/openSUSE:Factory/.python311.new.2698/python311.changes 2024-08-30 13:25:46.293871008 +0200 @@ -1,0 +2,7 @@ +Wed Aug 28 16:54:34 UTC 2024 - Matej Cepl <mcepl(a)cepl.eu> + +- Add CVE-2024-8088-inf-loop-zipfile_Path.patch to prevent + malformed payload to cause infinite loops in zipfile.Path + (bsc#1229704, CVE-2024-8088). + +------------------------------------------------------------------- New: ---- CVE-2024-8088-inf-loop-zipfile_Path.patch BETA DEBUG BEGIN: New: - Add CVE-2024-8088-inf-loop-zipfile_Path.patch to prevent malformed payload to cause infinite loops in zipfile.Path BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python311.spec ++++++ --- /var/tmp/diff_new_pack.MCY4Jm/_old 2024-08-30 13:25:48.229951373 +0200 +++ /var/tmp/diff_new_pack.MCY4Jm/_new 2024-08-30 13:25:48.229951373 +0200 @@ -186,6 +186,9 @@ # PATCH-FIX-UPSTREAM CVE-2024-6923-email-hdr-inject.patch bsc#1228780 mcepl(a)suse.com # prevent email header injection, patch from gh#python/cpython!122608 Patch20: CVE-2024-6923-email-hdr-inject.patch +# PATCH-FIX-UPSTREAM CVE-2024-8088-inf-loop-zipfile_Path.patch bsc#1229704 mcepl(a)suse.com +# avoid denial of service in zipfile +Patch21: CVE-2024-8088-inf-loop-zipfile_Path.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes @@ -450,6 +453,7 @@ %patch -p1 -P 18 %patch -p1 -P 19 %patch -p1 -P 20 +%patch -p1 -P 21 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac ++++++ CVE-2024-8088-inf-loop-zipfile_Path.patch ++++++ --- Lib/test/test_zipfile.py | 75 ++++++++++ Lib/zipfile.py | 10 + Misc/NEWS.d/next/Library/2024-08-11-14-08-04.gh-issue-122905.7tDsxA.rst | 1 Misc/NEWS.d/next/Library/2024-08-26-13-45-20.gh-issue-123270.gXHvNJ.rst | 3 4 files changed, 87 insertions(+), 2 deletions(-) --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -3651,6 +3651,81 @@ with zipfile.ZipFile(io.BytesIO(), "w") zipfile.Path(zf) zf.extractall(source_path.parent) + def test_malformed_paths(self): + """ + Path should handle malformed paths gracefully. + + Paths with leading slashes are not visible. + + Paths with dots are treated like regular files. + """ + data = io.BytesIO() + zf = zipfile.ZipFile(data, "w") + zf.writestr("../parent.txt", b"content") + zf.filename = '' + root = zipfile.Path(zf) + assert list(map(str, root.iterdir())) == ['../'] + assert root.joinpath('..').joinpath('parent.txt').read_bytes() == b'content' + + def test_unsupported_names(self): + """ + Path segments with special characters are readable. + + On some platforms or file systems, characters like + ``:`` and ``?`` are not allowed, but they are valid + in the zip file. + """ + data = io.BytesIO() + zf = zipfile.ZipFile(data, "w") + zf.writestr("path?", b"content") + zf.writestr("V: NMS.flac", b"fLaC...") + zf.filename = '' + root = zipfile.Path(zf) + contents = root.iterdir() + assert next(contents).name == 'path?' + assert next(contents).name == 'V: NMS.flac' + assert root.joinpath('V: NMS.flac').read_bytes() == b"fLaC..." + + def test_backslash_not_separator(self): + """ + In a zip file, backslashes are not separators. + """ + data = io.BytesIO() + zf = zipfile.ZipFile(data, "w") + zf.writestr(DirtyZipInfo.for_name("foo\\bar", zf), b"content") + zf.filename = '' + root = zipfile.Path(zf) + (first,) = root.iterdir() + assert not first.is_dir() + assert first.name == 'foo\\bar' + + +class DirtyZipInfo(zipfile.ZipInfo): + """ + Bypass name sanitization. + """ + + def __init__(self, filename, *args, **kwargs): + super().__init__(filename, *args, **kwargs) + self.filename = filename + + @classmethod + def for_name(cls, name, archive): + """ + Construct the same way that ZipFile.writestr does. + + TODO: extract this functionality and re-use + """ + self = cls(filename=name, date_time=time.localtime(time.time())[:6]) + self.compress_type = archive.compression + self.compress_level = archive.compresslevel + if self.filename.endswith('/'): # pragma: no cover + self.external_attr = 0o40775 << 16 # drwxrwxr-x + self.external_attr |= 0x10 # MS-DOS directory flag + else: + self.external_attr = 0o600 << 16 # ?rw------- + return self + class EncodedMetadataTests(unittest.TestCase): file_names = ['\u4e00', '\u4e8c', '\u4e09'] # Han 'one', 'two', 'three' --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -9,6 +9,7 @@ import io import itertools import os import posixpath +import re import shutil import stat import struct @@ -2212,7 +2213,7 @@ def _parents(path): def _ancestry(path): """ Given a path with elements separated by - posixpath.sep, generate all elements of that path + posixpath.sep, generate all elements of that path. >>> list(_ancestry('b/d')) ['b/d', 'b'] @@ -2224,9 +2225,14 @@ def _ancestry(path): ['b'] >>> list(_ancestry('')) [] + + Multiple separators are treated like a single. + + >>> list(_ancestry('//b//d///f//')) + ['//b//d///f', '//b//d', '//b'] """ path = path.rstrip(posixpath.sep) - while path and path != posixpath.sep: + while path.rstrip(posixpath.sep): yield path path, tail = posixpath.split(path) --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-08-11-14-08-04.gh-issue-122905.7tDsxA.rst @@ -0,0 +1 @@ +:class:`zipfile.Path` objects now sanitize names from the zipfile. --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-08-26-13-45-20.gh-issue-123270.gXHvNJ.rst @@ -0,0 +1,3 @@ +Applied a more surgical fix for malformed payloads in :class:`zipfile.Path` +causing infinite loops (gh-122905) without breaking contents using +legitimate characters.

1 0

commit python-scikit-build for openSUSE:Factory
by Source-Sync 30 Aug '24

30 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-scikit-build for openSUSE:Factory checked in at 2024-08-30 13:25:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-scikit-build (Old) and /work/SRC/openSUSE:Factory/.python-scikit-build.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-scikit-build" Fri Aug 30 13:25:39 2024 rev:24 rq:1197467 version:0.18.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-scikit-build/python-scikit-build.changes 2024-08-01 22:03:54.083160000 +0200 +++ /work/SRC/openSUSE:Factory/.python-scikit-build.new.2698/python-scikit-build.changes 2024-08-30 13:25:41.433669266 +0200 @@ -1,0 +2,12 @@ +Thu Aug 29 13:35:59 UTC 2024 - Ben Greiner <code(a)bnavigator.de> + +- Update to 0.18.1 + * Support for setuptools 74 in #1116 + * iOS and Android support by @FeodorFitsner in #1101 + * Fix for distutils change in #1103 + * Remove test directives by @s-t-e-v-e-n-k in #1108 +- Drop patches + * support-setuptools-72-distutils.patch + * support-setuptools-72-test-directives.patch + +------------------------------------------------------------------- Old: ---- scikit_build-0.18.0.tar.gz support-setuptools-72-distutils.patch support-setuptools-72-test-directives.patch New: ---- scikit_build-0.18.1.tar.gz BETA DEBUG BEGIN: Old:- Drop patches * support-setuptools-72-distutils.patch * support-setuptools-72-test-directives.patch Old: * support-setuptools-72-distutils.patch * support-setuptools-72-test-directives.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-scikit-build.spec ++++++ --- /var/tmp/diff_new_pack.qXtolP/_old 2024-08-30 13:25:43.553757269 +0200 +++ /var/tmp/diff_new_pack.qXtolP/_new 2024-08-30 13:25:43.557757435 +0200 @@ -27,17 +27,13 @@ %{?sle15_python_module_pythons} Name: python-scikit-build%{psuffix} -Version: 0.18.0 +Version: 0.18.1 Release: 0 Summary: Improved build system generator for Python C/C++/Fortran/Cython extensions License: MIT URL: https://github.com/scikit-build/scikit-build Source: https://files.pythonhosted.org/packages/source/s/scikit-build/scikit_build-… Source99: sample-setup.cfg -# PATCH-FIX-UPSTREAM gh#scikit-build/scikit-build#1103 -Patch0: support-setuptools-72-distutils.patch -# PATCH-FIX-UPSTREAM gh#scikit-build/scikit-build#1108 -Patch1: support-setuptools-72-test-directives.patch BuildRequires: %{python_module devel >= 3.8} BuildRequires: %{python_module hatch-fancy-pypi-readme} BuildRequires: %{python_module hatch-vcs} ++++++ scikit_build-0.18.0.tar.gz -> scikit_build-0.18.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/.github/workflows/ci.yml new/scikit_build-0.18.1/.github/workflows/ci.yml --- old/scikit_build-0.18.0/.github/workflows/ci.yml 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/.github/workflows/ci.yml 2020-02-02 01:00:00.000000000 +0100 @@ -58,7 +58,9 @@ - name: Set environment for Fortran compiler on MacOS if: runner.os == 'macOS' - run: echo "FC=gfortran-11" >> $GITHUB_ENV + run: | + brew reinstall gfortran + echo "FC=gfortran" >> $GITHUB_ENV - name: Setup nox uses: wntrblm/nox(a)2024.04.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/.pre-commit-config.yaml new/scikit_build-0.18.1/.pre-commit-config.yaml --- old/scikit_build-0.18.0/.pre-commit-config.yaml 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/.pre-commit-config.yaml 2020-02-02 01:00:00.000000000 +0100 @@ -21,15 +21,15 @@ - id: fix-ligatures - id: fix-smartquotes -- repo: https://github.com/asottile/blacken-docs - rev: 1.16.0 +- repo: https://github.com/adamchainz/blacken-docs + rev: 1.18.0 hooks: - id: "blacken-docs" additional_dependencies: - - black==23.* + - black==24.* - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.9 + rev: v0.5.0 hooks: - id: ruff args: ["--fix", "--show-fixes"] @@ -61,7 +61,7 @@ - hatchling - repo: https://github.com/pre-commit/mirrors-mypy - rev: "v1.10.0" + rev: "v1.10.1" hooks: - id: mypy files: ^(skbuild|tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/CHANGES.rst new/scikit_build-0.18.1/CHANGES.rst --- old/scikit_build-0.18.0/CHANGES.rst 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/CHANGES.rst 2020-02-02 01:00:00.000000000 +0100 @@ -15,6 +15,27 @@ .. START-BRIEF-CHANGELOG +Scikit-build 0.18.1 +=================== + +This release fixes issues with setuptools 74, and avoids a warning from recent +versions of wheel. Android and iOS are now included in known platforms. + +Bug fixes +--------- + +* Support for setuptools 74 in :pr:`1116` +* iOS and Android support by :user:`FeodorFitsner` in :pr:`1101` + + +Testing +------- + +* Fix for distutils change in :pr:`1103` +* Remove test directives by :user:`s-t-e-v-e-n-k` in :pr:`1108` + + + Scikit-build 0.18.0 =================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/PKG-INFO new/scikit_build-0.18.1/PKG-INFO --- old/scikit_build-0.18.0/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.3 Name: scikit-build -Version: 0.18.0 +Version: 0.18.1 Summary: Improved build system generator for Python C/C++/Fortran/Cython extensions Project-URL: Bug Tracker, https://github.com/scikit-build/scikit-build/issues Project-URL: Changelog, https://scikit-build.readthedocs.io/en/latest/history.html @@ -75,6 +75,27 @@ +Scikit-build 0.18.1 +=================== + +This release fixes issues with setuptools 74, and avoids a warning from recent +versions of wheel. Android and iOS are now included in known platforms. + +Bug fixes +--------- + +* Support for setuptools 74 in `#1116 <https://github.com/scikit-build/scikit-build/pull/1116>`_ +* iOS and Android support by `@FeodorFitsner <https://github.com/FeodorFitsner>`_ in `#1101 <https://github.com/scikit-build/scikit-build/pull/1101>`_ + + +Testing +------- + +* Fix for distutils change in `#1103 <https://github.com/scikit-build/scikit-build/pull/1103>`_ +* Remove test directives by `@s-t-e-v-e-n-k <https://github.com/s-t-e-v-e-n-k>`_ in `#1108 <https://github.com/scikit-build/scikit-build/pull/1108>`_ + + + Scikit-build 0.18.0 =================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/skbuild/_version.py new/scikit_build-0.18.1/skbuild/_version.py --- old/scikit_build-0.18.0/skbuild/_version.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/skbuild/_version.py 2020-02-02 01:00:00.000000000 +0100 @@ -12,5 +12,5 @@ __version_tuple__: VERSION_TUPLE version_tuple: VERSION_TUPLE -__version__ = version = '0.18.0' -__version_tuple__ = version_tuple = (0, 18, 0) +__version__ = version = '0.18.1' +__version_tuple__ = version_tuple = (0, 18, 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/skbuild/command/bdist_wheel.py new/scikit_build-0.18.1/skbuild/command/bdist_wheel.py --- old/scikit_build-0.18.0/skbuild/command/bdist_wheel.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/skbuild/command/bdist_wheel.py 2020-02-02 01:00:00.000000000 +0100 @@ -3,8 +3,18 @@ from __future__ import annotations -from wheel.bdist_wheel import bdist_wheel as _bdist_wheel -from wheel.wheelfile import WheelFile +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from wheel.bdist_wheel import bdist_wheel as _bdist_wheel + from wheel.wheelfile import WheelFile +else: + try: + from setuptools.command.bdist_wheel import WheelFile # type: ignore[attr-defined] + from setuptools.command.bdist_wheel import bdist_wheel as _bdist_wheel + except ImportError: + from wheel.bdist_wheel import bdist_wheel as _bdist_wheel + from wheel.wheelfile import WheelFile from .._version import version as skbuild_version from ..utils import distribution_hide_listing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/skbuild/platform_specifics/platform_factory.py new/scikit_build-0.18.1/skbuild/platform_specifics/platform_factory.py --- old/scikit_build-0.18.0/skbuild/platform_specifics/platform_factory.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/skbuild/platform_specifics/platform_factory.py 2020-02-02 01:00:00.000000000 +0100 @@ -20,7 +20,7 @@ return windows.WindowsPlatform() # Some flexibility based on what emcripten distros decide to call themselves - if this_platform.startswith(("linux", "emscripten", "pyodide")): + if this_platform.startswith(("linux", "emscripten", "pyodide", "android")): from . import linux return linux.LinuxPlatform() @@ -30,7 +30,7 @@ return cygwin.CygwinPlatform() - if this_platform == "darwin": + if this_platform in ["darwin", "ios"]: from . import osx return osx.OSXPlatform() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/skbuild/platform_specifics/windows.py new/scikit_build-0.18.1/skbuild/platform_specifics/windows.py --- old/scikit_build-0.18.0/skbuild/platform_specifics/windows.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/skbuild/platform_specifics/windows.py 2020-02-02 01:00:00.000000000 +0100 @@ -214,7 +214,8 @@ if cache_key in __get_msvc_compiler_env_cache: return __get_msvc_compiler_env_cache[cache_key] - monkey.patch_for_msvc_specialized_compiler() # type: ignore[no-untyped-call] + if hasattr(monkey, "patch_for_msvc_specialized_compiler"): + monkey.patch_for_msvc_specialized_compiler() # type: ignore[no-untyped-call] vc_dir = find_visual_studio(vs_version) vcvarsall = os.path.join(vc_dir, "vcvarsall.bat") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/skbuild/setuptools_wrap.py new/scikit_build-0.18.1/skbuild/setuptools_wrap.py --- old/scikit_build-0.18.0/skbuild/setuptools_wrap.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/skbuild/setuptools_wrap.py 2020-02-02 01:00:00.000000000 +0100 @@ -319,9 +319,7 @@ # and the entry in package_data would look like this: # # {'foo.bar' : ['module.py']} - if strip_package(package.split("."), module_file) in package_data[package]: - return True - return False + return strip_package(package.split("."), module_file) in package_data[package] def _should_run_cmake(commands: Sequence[str], cmake_with_sdist: bool) -> bool: @@ -344,9 +342,7 @@ if expected_commands & given_commands: return True - if "sdist" in given_commands and cmake_with_sdist: - return True - return False + return bool("sdist" in given_commands and cmake_with_sdist) def _save_cmake_spec(args: Mapping[str, Any]) -> None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/tests/__init__.py new/scikit_build-0.18.1/tests/__init__.py --- old/scikit_build-0.18.0/tests/__init__.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/tests/__init__.py 2020-02-02 01:00:00.000000000 +0100 @@ -215,7 +215,7 @@ """ # See https://stackoverflow.com/questions/9160227/dir-util-copy-tree-fails-after-… - distutils.dir_util._path_created = {} # type: ignore[attr-defined] + distutils.dir_util._path_created.clear() # type: ignore[attr-defined] # Clear _PYTHON_HOST_PLATFORM to ensure value sets in skbuild.setuptools_wrap.setup() does not # influence other tests. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/tests/samples/issue-274-support-default-package-dir/setup.py new/scikit_build-0.18.1/tests/samples/issue-274-support-default-package-dir/setup.py --- old/scikit_build-0.18.0/tests/samples/issue-274-support-default-package-dir/setup.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/tests/samples/issue-274-support-default-package-dir/setup.py 2020-02-02 01:00:00.000000000 +0100 @@ -10,5 +10,4 @@ license="MIT", packages=["hello"], package_dir={"": "src"}, - test_suite="hello_tests", ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/tests/samples/issue-274-support-one-package-without-package-dir/setup.py new/scikit_build-0.18.1/tests/samples/issue-274-support-one-package-without-package-dir/setup.py --- old/scikit_build-0.18.0/tests/samples/issue-274-support-one-package-without-package-dir/setup.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/tests/samples/issue-274-support-one-package-without-package-dir/setup.py 2020-02-02 01:00:00.000000000 +0100 @@ -9,5 +9,4 @@ author="The scikit-build team", license="MIT", packages=["hello"], - test_suite="hello_tests", ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/tests/samples/issue-335-support-cmake-source-dir/wrapping/python/setup.py new/scikit_build-0.18.1/tests/samples/issue-335-support-cmake-source-dir/wrapping/python/setup.py --- old/scikit_build-0.18.0/tests/samples/issue-335-support-cmake-source-dir/wrapping/python/setup.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/tests/samples/issue-335-support-cmake-source-dir/wrapping/python/setup.py 2020-02-02 01:00:00.000000000 +0100 @@ -9,7 +9,6 @@ author="The scikit-build team", license="MIT", packages=["hello"], - tests_require=[], setup_requires=[], cmake_source_dir="../../", ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/tests/samples/test-filter-manifest/wrapping/python/setup.py new/scikit_build-0.18.1/tests/samples/test-filter-manifest/wrapping/python/setup.py --- old/scikit_build-0.18.0/tests/samples/test-filter-manifest/wrapping/python/setup.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/tests/samples/test-filter-manifest/wrapping/python/setup.py 2020-02-02 01:00:00.000000000 +0100 @@ -14,7 +14,6 @@ author="The scikit-build team", license="MIT", packages=["hello"], - tests_require=[], setup_requires=[], cmake_source_dir="../../", cmake_process_manifest_hook=exclude_dev_files, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/tests/test_issue284_build_ext_inplace.py new/scikit_build-0.18.1/tests/test_issue284_build_ext_inplace.py --- old/scikit_build-0.18.0/tests/test_issue284_build_ext_inplace.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/tests/test_issue284_build_ext_inplace.py 2020-02-02 01:00:00.000000000 +0100 @@ -1,10 +1,16 @@ from __future__ import annotations import os +import platform + +import pytest from . import get_ext_suffix, project_setup_py_test +(a)pytest.mark.skipif( + platform.python_implementation() == "PyPy", reason="PyPy is reporting an empty linker, doesn't seem to be our fault" +) @project_setup_py_test("issue-284-build-ext-inplace", ["build_ext", "--inplace"], disable_languages_test=True) def test_build_ext_inplace_command(): assert os.path.exists(f"hello/_hello_sk{get_ext_suffix()}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit_build-0.18.0/tests/test_setup.py new/scikit_build-0.18.1/tests/test_setup.py --- old/scikit_build-0.18.0/tests/test_setup.py 2020-02-02 01:00:00.000000000 +0100 +++ new/scikit_build-0.18.1/tests/test_setup.py 2020-02-02 01:00:00.000000000 +0100 @@ -221,7 +221,7 @@ assert failed == expected_failed if failed: - if error_code_type == str: + if error_code_type is str: assert message == "error: package directory '{}' does not exist".format( os.path.join(CMAKE_INSTALL_DIR(), "banana") )

1 0