-
-
Notifications
You must be signed in to change notification settings - Fork 510
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove deprecated stuff related to Cython #27041
Comments
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Commit: |
New commits:
|
comment:7
(For the record: the 4 tickets have been closed for Sage 8.1 released in July 2017) |
comment:12
Maybe not for this ticket, but there's a patch in Debian related to this that I think would be worth incorporating into Sage somehow: Description: Additional changes to work with the Debian package of singular
We search for a specific SOVERSION of libsingular-Singular, to allow us to
runtime-Depend on libsingular4 and not libsingular4-dev.
Author: Tobias Hansen <[email protected]>
Author: Ximin Luo <[email protected]>
Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/interfaces/singular.py
+++ b/sage/src/sage/interfaces/singular.py
@@ -2264,7 +2264,7 @@
node_names.clear()
import os
- singular_docdir = os.environ['SINGULARPATH']+"/../info/"
+ singular_docdir = "/usr/share/doc/singular/"
new_node = re.compile(r"File: singular\.hlp, Node: ([^,]*),.*")
new_lookup = re.compile(r"\* ([^:]*):*([^.]*)\..*")
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
@@ -323,6 +323,11 @@
args = ['-w','-O2'] + args
libdirs = cblas_library_dirs
+ # Add Singular directories to includes
+ if "singular" in s or "pynac" in s:
+ import pkgconfig
+ inc.extend(sorted(set(pkgconfig.parse("Singular")["include_dirs"])))
+
# Add cysignals directory to includes
for path in sys.path:
cysignals_path = os.path.join(path, "cysignals")
--- a/sage/src/sage/env.py
+++ b/sage/src/sage/env.py
@@ -187,7 +187,7 @@
else:
extension = "so"
# library name changed from libsingular to libSingular btw 3.x and 4.x
- SINGULAR_SO = SAGE_LOCAL+"/lib/libSingular."+extension
+ SINGULAR_SO = "/usr/lib/%s/libsingular-Singular-4.1.1.so" % sysconfig.get_config_var('MULTIARCH')
_add_variable_or_fallback('SINGULAR_SO', SINGULAR_SO)
--- a/sage/src/sage/misc/compat.py
+++ b/sage/src/sage/misc/compat.py
@@ -87,7 +87,7 @@
EXAMPLES::
sage: from sage.misc.compat import find_library
- sage: find_library('Singular')
+ sage: find_library('singular-Singular')
'...Singular...'
""" I think that this demonstrates that there needs to be a better way to customize where sage looks for bits of Singular (the library, as well as its docs and include files). |
comment:13
Hooray for getting rid of cruft. |
Reviewer: Erik Bray |
comment:14
|
comment:15
That error doesn't seem related to this ticket at all. |
Changed branch from u/jdemeyer/remove_deprecated_code_in_sage_misc_cython to |
Remove deprecations from #22698, #22805, #23855, #24105.
Deprecate the script
src/bin/sage-cython
.Component: cython
Author: Jeroen Demeyer
Branch/Commit:
108a42e
Reviewer: Erik Bray
Issue created by migration from https://trac.sagemath.org/ticket/27041
The text was updated successfully, but these errors were encountered: