Skip to content

Commit

Permalink
Trac #20002: Move interrupt.pyx to package cysignals
Browse files Browse the repository at this point in the history
Move Sage’s interrupt handling to a separate package:
https://github.com/sagemath/cysignals

See also https://groups.google.com/d/topic/sage-
devel/oA9NsF26eOA/discussion for a discussion. We need one trivial
Cython patch, see [cython/cython#483]

'''Tarball''': https://github.com/sagemath/cysignals/releases/download/1
.0rc2/cysignals-1.0rc2.tar.bz2

URL: http://trac.sagemath.org/20002
Reported by: malb
Ticket author(s): Jeroen Demeyer
Reviewer(s): Martin Albrecht
  • Loading branch information
Release Manager authored and vbraun committed Feb 22, 2016
2 parents 212ae72 + 4677a93 commit dbee691
Show file tree
Hide file tree
Showing 225 changed files with 325 additions and 3,078 deletions.
1 change: 1 addition & 0 deletions build/make/deps
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ sagelib: \
$(INST)/$(BRIAL) \
$(INST)/$(CEPHES) \
$(INST)/$(CLIQUER) \
$(INST)/$(CYSIGNALS) \
$(INST)/$(CYTHON) \
$(INST)/$(ECL) \
$(INST)/$(ECLIB) \
Expand Down
19 changes: 19 additions & 0 deletions build/pkgs/cysignals/SPKG.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
= cysignals =

== Description ==

Interrupt and signal handling for Cython

== License ==

LGPL version 3 or later

== Upstream Contact ==

https://github.com/sagemath/cysignals

== Dependencies ==

* Python
* Cython
* PARI (optional)
4 changes: 4 additions & 0 deletions build/pkgs/cysignals/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tarball=cysignals-VERSION.tar.bz2
sha1=390f62a454a96cccf85ee3f2c62dd7d4622ec36b
md5=140fa256493a6a6ec11f57c2d95e3894
cksum=268906678
5 changes: 5 additions & 0 deletions build/pkgs/cysignals/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
$(INST)/$(CYTHON) $(INST)/$(PARI)

----------
All lines of this file are ignored except the first.
It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
1 change: 1 addition & 0 deletions build/pkgs/cysignals/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0rc2
9 changes: 9 additions & 0 deletions build/pkgs/cysignals/spkg-check
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

if [ -z "$SAGE_LOCAL" ]; then
echo >&2 "SAGE_LOCAL undefined ... exiting"
echo >&2 "Maybe run 'sage --sh'?"
exit 1
fi

cd src && $MAKE check
30 changes: 30 additions & 0 deletions build/pkgs/cysignals/spkg-install
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/usr/bin/env bash

if [ -z "$SAGE_LOCAL" ]; then
echo >&2 "SAGE_LOCAL undefined ... exiting"
echo >&2 "Maybe run 'sage --sh'?"
exit 1
fi

cd src

for patch in ../patches/*.patch; do
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
patch -p1 <"$patch"
if [ $? -ne 0 ]; then
echo >&2 "Error applying '$patch'"
exit 1
fi
done

./configure
if [ $? -ne 0 ]; then
echo "Error configuring cysignals ... exiting"
exit 1
fi

$MAKE install
if [ $? -ne 0 ]; then
echo "Error installing cysignals ... exiting"
exit 1
fi
1 change: 1 addition & 0 deletions build/pkgs/cysignals/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
standard
2 changes: 1 addition & 1 deletion build/pkgs/cython/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.23.4
0.23.4.p0
21 changes: 21 additions & 0 deletions build/pkgs/cython/patches/pxi_sys_path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
See https://github.com/cython/cython/pull/483

commit 97de55acf4efe3c3ae2b5a955578cae71958dfe7
Author: Jeroen Demeyer <[email protected]>
Date: Sun Feb 7 17:07:54 2016 +0100

Check sys.path for .pxi files too

diff --git a/Cython/Compiler/Main.py b/Cython/Compiler/Main.py
index 65b3cd3..d4d0f78 100644
--- a/Cython/Compiler/Main.py
+++ b/Cython/Compiler/Main.py
@@ -269,7 +269,7 @@ class Context(object):
# Search list of include directories for filename.
# Reports an error and returns None if not found.
path = self.search_include_directories(filename, "", pos,
- include=True)
+ include=True, sys_path=True)
if not path:
error(pos, "'%s' not found" % filename)
return path
193 changes: 0 additions & 193 deletions src/bin/sage-CSI

This file was deleted.

Loading

0 comments on commit dbee691

Please sign in to comment.