[Python-modules-commits] [cysignals] 01/03: Import cysignals_1.6.5+ds.orig.tar.xz

Jerome Benoit calculus-guest at moszumanska.debian.org
Fri Jul 28 13:20:28 UTC 2017


This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository cysignals.

commit 1121080fa4071d2eb68ea119e928edc9e4808783
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Fri Jul 28 11:56:45 2017 +0400

    Import cysignals_1.6.5+ds.orig.tar.xz
---
 PKG-INFO                  |  2 +-
 VERSION                   |  2 +-
 docs/source/conf.py       |  7 ++-----
 setup.cfg                 |  3 +--
 setup.py                  | 12 +++++++++++-
 src/scripts/cysignals-CSI | 18 ++----------------
 6 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index eb3e749..f7842f6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: cysignals
-Version: 1.6.4
+Version: 1.6.5
 Summary: Interrupt and signal handling for Cython
 Home-page: https://github.com/sagemath/cysignals
 Author: Martin R. Albrecht, François Bissey, Volker Braun, Jeroen Demeyer
diff --git a/VERSION b/VERSION
index 9edc58b..9f05f9f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.4
+1.6.5
diff --git a/docs/source/conf.py b/docs/source/conf.py
index ad8eaae..9f9658c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -269,11 +269,8 @@ intersphinx_mapping = {'python': ('https://docs.python.org/2.7', None)}
 
 
 # Monkey-patch inspect with Cython support
-import inspect
 def isfunction(obj):
-    for cls in inspect.getmro(type(obj)):
-        if "__code__" in cls.__dict__:
-            return True
-    return False
+    return hasattr(type(obj), "__code__")
 
+import inspect
 inspect.isfunction = isfunction
diff --git a/setup.cfg b/setup.cfg
index 72f9d44..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
-tag_svn_revision = 0
-tag_date = 0
 tag_build = 
+tag_date = 0
 
diff --git a/setup.py b/setup.py
index 4f26407..57b6b39 100755
--- a/setup.py
+++ b/setup.py
@@ -28,10 +28,20 @@ opj = os.path.join
 
 cythonize_dir = "build"
 
+# Disable .c line numbers in exception tracebacks
+macros = [("CYTHON_CLINE_IN_TRACEBACK", 0)]
+
+if sys.platform == 'cygwin':
+    # On Cygwin FD_SETSIZE defaults to a rather low 64; we set it higher
+    # for use with PSelecter
+    # See https://github.com/sagemath/cysignals/pull/57
+    macros.append(('FD_SETSIZE', 512))
+
 kwds = dict(include_dirs=[opj("src", "cysignals"),
                           opj(cythonize_dir, "src"),
                           opj(cythonize_dir, "src", "cysignals")],
-            depends=glob(opj("src", "cysignals", "*.h")))
+            depends=glob(opj("src", "cysignals", "*.h")),
+            define_macros=macros)
 
 extensions = [
     Extension("cysignals.signals", ["src/cysignals/signals.pyx"], **kwds),
diff --git a/src/scripts/cysignals-CSI b/src/scripts/cysignals-CSI
index 343f1ab..ff7bed4 100755
--- a/src/scripts/cysignals-CSI
+++ b/src/scripts/cysignals-CSI
@@ -95,27 +95,13 @@ def run_gdb(pid, color):
     """
     Execute gdb.
     """
-    env = dict(os.environ)
-
-    # Preload the right Python library
-    libpython = os.path.join(sysconfig.get_config_var('LIBDIR'),
-                             sysconfig.get_config_var('INSTSONAME'))
-    if sys.platform == 'macosx':
-        env['DYLD_INSERT_LIBRARIES'] = libpython
-    else:
-        env['LD_PRELOAD'] = libpython
-
-    # Set the correct Python path
-    env['PYTHONPATH'] = os.path.dirname(site.__file__)
-
     whichgdb = find_executable('gdb')
     if whichgdb is None:
         return b"Cannot find gdb installed"
 
+    env = dict(os.environ)
     try:
-        # Run gdb but pretending to be Python in argv[0].
-        # This is needed for Python to find its own files.
-        cmd = Popen([sys.executable], executable=whichgdb,
+        cmd = Popen(["gdb"], executable=whichgdb,
                 stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)
     except OSError:
         return b"Unable to start gdb (not installed?)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cysignals.git



More information about the Python-modules-commits mailing list