#15261: Fix brian optional spkg for new workflow
--------------------------------------+-------------------------
Reporter: kcrisman | Owner:
Type: defect | Status: new
Priority: major | Milestone: sage-5.13
Component: packages: optional | Resolution:
Keywords: | Merged in:
Authors: | Reviewers:
Report Upstream: N/A | Work issues:
Branch: | Commit:
Dependencies: | Stopgaps:
--------------------------------------+-------------------------
Comment (by kcrisman):
Here's my current diff. I won't have time to upgrade and test today, but
hopefully tomorrow. Note that
{{{
$ diff -Naur src/brian/units.py patches/units.py
}}}
actually returns a lot of whitespace changes so this is better from that
standpoint as well.
{{{
#!diff
diff --git a/SPKG.txt b/SPKG.txt
--- a/SPKG.txt
+++ b/SPKG.txt
@@ -31,9 +31,11 @@
== Changelog ==
+=== brian-1.2.1.p1 (Karl-Dieter Crisman, 7 October 2013) ===
+ * Change spkg-install for transition to git
+
=== brian-1.2.1.p0 (Oriol Castejon, 3rd August 2010) ===
* Version for Sage of the Python package Brian released.
-
* Minor change added to avoid problems with Brian units and Sage
Integers and
RealNumbers.
diff --git a/spkg-install b/spkg-install
--- a/spkg-install
+++ b/spkg-install
@@ -6,42 +6,16 @@
exit 1
fi
-############################## Check dependencies
##############################
-NUMPY=`cd $SAGE_ROOT/spkg/standard/; ./newest_version numpy`
-if [ $? -ne 0 ]; then
- echo "Failed to find numpy. Please install the numpy spkg."
- exit 1
-fi
+cd src
-SCIPY=`cd $SAGE_ROOT/spkg/standard/; ./newest_version scipy`
-if [ $? -ne 0 ]; then
- echo "Failed to find scipy. Please install the scipy spkg."
- exit 1
-fi
-
-MATPLOTLIB=`cd $SAGE_ROOT/spkg/standard/; ./newest_version matplotlib`
-if [ $? -ne 0 ]; then
- echo "Failed to find matplotlib. Please install the matplotlib
spkg."
- exit 1
-fi
-
-SYMPY=`cd $SAGE_ROOT/spkg/standard/; ./newest_version sympy`
-if [ $? -ne 0 ]; then
- echo "Failed to find sympy. Please install the sympy spkg."
- exit 1
-fi
-################################################################################
-
-
-################################ Apply patches
#################################
-cp patches/units.py src/brian/units.py
-if [ $? -ne 0 ]; then
- echo "Error copying patch."
- exit 1
-fi
-################################################################################
-
-cd src
+# Apply patch so that Sage reals and integers do not conflict
+for patches in ../patches/*.patch; do
+ patch -p1 <"$patch"
+ if [ $? -ne 0 ]; then
+ echo "Error applying '$patch'."
+ exit 1
+ fi
+done
python setup.py build
if [ $? -ne 0 ]; then
}}}
I may have to change the `p1` to something else or change the patch file
slightly.
--
Ticket URL: <http://trac.sagemath.org/ticket/15261#comment:1>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/groups/opt_out.
