Skip to content

Commit dfde868

Browse files
author
Release Manager
committed
gh-36663: Upgrade `zeromq` to 4.3.5, `pyzmq` to 25.1.1, patch out broken tests in setup <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> Patches generated from zeromq/pyzmq@main...mkoeppe:pyzmq:sage_fixes <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> - Fixes #36027 - Part of #35092 <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36663 Reported by: Matthias Köppe Reviewer(s): John H. Palmieri, Matthias Köppe
2 parents 7cad4fc + 2a5293c commit dfde868

File tree

7 files changed

+57
-66
lines changed

7 files changed

+57
-66
lines changed

build/pkgs/pyzmq/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=pyzmq-VERSION.tar.gz
2-
sha1=1a2e7220d7d1b6167c14ae2cc001dfc5d9a28dde
3-
md5=f10b7c3dee2c03557e2c5d00b73dfc7f
4-
cksum=1163982926
2+
sha1=f750e59a3d5fcca64d0a1a6723c1bc72173e976f
3+
md5=993a646d3f1c6201a8c93bcb2d2f867e
4+
cksum=2057198190
55
upstream_url=https://pypi.io/packages/source/p/pyzmq/pyzmq-VERSION.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.0.1
1+
25.1.1
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 29427869ce0a9f13e29c7f89873a1880c8be55a1 Mon Sep 17 00:00:00 2001
2+
From: Matthias Koeppe <[email protected]>
3+
Date: Sun, 5 Nov 2023 21:12:48 -0800
4+
Subject: [PATCH 1/2] setup.py: Remove setting of rpath
5+
6+
---
7+
setup.py | 2 --
8+
1 file changed, 2 deletions(-)
9+
10+
diff --git a/setup.py b/setup.py
11+
index d5c77a23..8a2a4943 100755
12+
--- a/setup.py
13+
+++ b/setup.py
14+
@@ -300,8 +300,6 @@ def settings_from_prefix(prefix=None):
15+
settings['include_dirs'] += [pjoin(env, 'include')]
16+
settings['library_dirs'] += [pjoin(env, 'lib')]
17+
18+
- for path in settings['library_dirs']:
19+
- _add_rpath(settings, os.path.abspath(path))
20+
info(settings)
21+
22+
return settings
23+
--
24+
2.42.0
25+
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From b5bdcad66a28394f6e5be4ad7fd00835deec73f7 Mon Sep 17 00:00:00 2001
2+
From: Matthias Koeppe <[email protected]>
3+
Date: Sun, 5 Nov 2023 21:35:29 -0800
4+
Subject: [PATCH 2/2] setup.py: Patch out broken version detection
5+
6+
---
7+
setup.py | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/setup.py b/setup.py
11+
index 8a2a4943..19d31654 100755
12+
--- a/setup.py
13+
+++ b/setup.py
14+
@@ -463,6 +463,7 @@ class Configure(build_ext):
15+
16+
def check_zmq_version(self):
17+
"""check the zmq version"""
18+
+ return
19+
cfg = self.config
20+
# build test program
21+
zmq_prefix = cfg['zmq_prefix']
22+
--
23+
2.42.0
24+

build/pkgs/zeromq/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=zeromq-VERSION.tar.gz
2-
sha1=47277a64749049123d1401600e8cfbab10a3ae28
3-
md5=c897d4005a3f0b8276b00b7921412379
4-
cksum=1500782345
2+
sha1=bdbf686c8a40ba638e21cf74e34dbb425e108500
3+
md5=ae933b1e98411fd7cb8309f9502d2737
4+
cksum=1351453048
55
upstream_url=https://github.com/zeromq/libzmq/releases/download/vVERSION/zeromq-VERSION.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.3.4
1+
4.3.5

build/pkgs/zeromq/patches/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)