-
-
Notifications
You must be signed in to change notification settings - Fork 478
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
…ken 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
- Loading branch information
Showing
7 changed files
with
57 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
tarball=pyzmq-VERSION.tar.gz | ||
sha1=1a2e7220d7d1b6167c14ae2cc001dfc5d9a28dde | ||
md5=f10b7c3dee2c03557e2c5d00b73dfc7f | ||
cksum=1163982926 | ||
sha1=f750e59a3d5fcca64d0a1a6723c1bc72173e976f | ||
md5=993a646d3f1c6201a8c93bcb2d2f867e | ||
cksum=2057198190 | ||
upstream_url=https://pypi.io/packages/source/p/pyzmq/pyzmq-VERSION.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
24.0.1 | ||
25.1.1 |
25 changes: 25 additions & 0 deletions
25
build/pkgs/pyzmq/patches/0001-setup.py-Remove-setting-of-rpath.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From 29427869ce0a9f13e29c7f89873a1880c8be55a1 Mon Sep 17 00:00:00 2001 | ||
From: Matthias Koeppe <[email protected]> | ||
Date: Sun, 5 Nov 2023 21:12:48 -0800 | ||
Subject: [PATCH 1/2] setup.py: Remove setting of rpath | ||
|
||
--- | ||
setup.py | 2 -- | ||
1 file changed, 2 deletions(-) | ||
|
||
diff --git a/setup.py b/setup.py | ||
index d5c77a23..8a2a4943 100755 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -300,8 +300,6 @@ def settings_from_prefix(prefix=None): | ||
settings['include_dirs'] += [pjoin(env, 'include')] | ||
settings['library_dirs'] += [pjoin(env, 'lib')] | ||
|
||
- for path in settings['library_dirs']: | ||
- _add_rpath(settings, os.path.abspath(path)) | ||
info(settings) | ||
|
||
return settings | ||
-- | ||
2.42.0 | ||
|
24 changes: 24 additions & 0 deletions
24
build/pkgs/pyzmq/patches/0002-setup.py-Patch-out-broken-version-detection.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From b5bdcad66a28394f6e5be4ad7fd00835deec73f7 Mon Sep 17 00:00:00 2001 | ||
From: Matthias Koeppe <[email protected]> | ||
Date: Sun, 5 Nov 2023 21:35:29 -0800 | ||
Subject: [PATCH 2/2] setup.py: Patch out broken version detection | ||
|
||
--- | ||
setup.py | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/setup.py b/setup.py | ||
index 8a2a4943..19d31654 100755 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -463,6 +463,7 @@ class Configure(build_ext): | ||
|
||
def check_zmq_version(self): | ||
"""check the zmq version""" | ||
+ return | ||
cfg = self.config | ||
# build test program | ||
zmq_prefix = cfg['zmq_prefix'] | ||
-- | ||
2.42.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
tarball=zeromq-VERSION.tar.gz | ||
sha1=47277a64749049123d1401600e8cfbab10a3ae28 | ||
md5=c897d4005a3f0b8276b00b7921412379 | ||
cksum=1500782345 | ||
sha1=bdbf686c8a40ba638e21cf74e34dbb425e108500 | ||
md5=ae933b1e98411fd7cb8309f9502d2737 | ||
cksum=1351453048 | ||
upstream_url=https://github.com/zeromq/libzmq/releases/download/vVERSION/zeromq-VERSION.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
4.3.4 | ||
4.3.5 |
58 changes: 0 additions & 58 deletions
58
build/pkgs/zeromq/patches/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch
This file was deleted.
Oops, something went wrong.