#11874: Remove twisted spkg
-------------------------------------------+--------------------------------
Reporter: dimpase | Owner: tbd
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-5.1
Component: packages | Resolution:
Keywords: twisted; notebook | Work issues:
Report Upstream: N/A | Reviewers: Dmitrii Pasechnik,
Jason Grout
Authors: Rado Kirov, Jason Grout | Merged in:
Dependencies: #12329, #11080, #10492 | Stopgaps:
-------------------------------------------+--------------------------------
Comment (by SimonKing):
I followed the installation instructions at #11080, but found that the
"remove-twisted" patch from here fails to apply, at least to
sage-5.0.prealpha0:
{{{
(sage subshell) linux-sqwp:sage-5.0.prealpha0 simon$ ./sage -hg qimport
http://trac.sagemath.org/sage_trac/raw-attachment/ticket/11874/trac-11874
-remove-twisted.patch
Füge trac-11874-remove-twisted.patch zur Seriendatei hinzu
SAGE_ROOT=/home/simon/SAGE/sage-5.0.prealpha0
(sage subshell) linux-sqwp:sage-5.0.prealpha0 simon$ ./sage -hg qpush
Wende trac-11874-remove-twisted.patch an
Wende Patch auf Datei spkg/install an
FEHLSCHLAG von Teilstück #1 in Zeile 220
1 von 1 Teilstücken sind FEHLGESCHLAGEN -- speichere Ausschuss in Datei
spkg/install.rej
Wende Patch auf Datei spkg/standard/deps an
FEHLSCHLAG von Teilstück #2 in Zeile 405
1 von 2 Teilstücken sind FEHLGESCHLAGEN -- speichere Ausschuss in Datei
spkg/standard/deps.rej
Patch schlug fehl und Fortsetzung unmöglich (versuche -v)
Patch schlug fehl, Fehlerabschnitte noch im Arbeitsverzeichnis
Fehler beim Anwenden. Bitte beheben und trac-11874-remove-twisted.patch
aktualisieren
}}}
Here, one has
{{{
(sage subshell) linux-sqwp:sage-5.0.prealpha0 simon$ cat spkg/install.rej
--- install
+++ install
@@ -221,7 +221,6 @@
SYMPY=`newest_version sympy`
TACHYON=`newest_version tachyon`
TERMCAP=`newest_version termcap`
-TWISTED=`newest_version twisted`
ZLIB=`newest_version zlib`
ZNPOLY=`newest_version zn_poly`
ZODB=`newest_version zodb3`
}}}
Indeed, the "TWISTED" variable is now defined differently, namely
{{{
TWISTED=`$newest twisted`
export TWISTED
}}}
Easy to fix.
However, the rejection at spkg/standard/deps is worse:
{{{
(sage subshell) linux-sqwp:sage-5.0.prealpha0 simon$ cat
spkg/standard/deps.rej
--- deps
+++ deps
@@ -407,44 +406,43 @@
$(INST)/$(SAGE_ROOT_REPO): $(BASE) $(INST)/$(MERCURIAL)
+$(PIPE) "$(SAGE_SPKG) $(SAGE_ROOT_REPO) 2>&1" "tee -a
$(SAGE_LOGS)/$(SAGE_ROOT_REPO).log"
-# setuptools forgets to update easy-install.pth during parallel
-# builds, so we build the relevant packages serially. Note: To avoid
-# branching, we haven't given explicit dependencies, but the chain's
-# order is important.
-$(INST)/$(SAGENB): $(BASE) $(INST)/$(SQLALCHEMY) $(INST)/$(PATCH)
- +$(PIPE) "$(SAGE_SPKG) $(SAGENB) 2>&1" "tee -a
$(SAGE_LOGS)/$(SAGENB).log"
-
-$(INST)/$(SQLALCHEMY): $(BASE) $(INST)/$(SPHINX) $(INST)/$(PATCH)
- +$(PIPE) "$(SAGE_SPKG) $(SQLALCHEMY) 2>&1" "tee -a
$(SAGE_LOGS)/$(SQLALCHEMY).log"
-
-$(INST)/$(SPHINX): $(BASE) $(INST)/$(JINJA2) $(INST)/$(PATCH)
- +$(PIPE) "$(SAGE_SPKG) $(SPHINX) 2>&1" "tee -a
$(SAGE_LOGS)/$(SPHINX).log"
-
-$(INST)/$(JINJA2): $(BASE) $(INST)/$(PYGMENTS) $(INST)/$(PATCH)
- +$(PIPE) "$(SAGE_SPKG) $(JINJA2) 2>&1" "tee -a
$(SAGE_LOGS)/$(JINJA2).log"
-
-$(INST)/$(PYGMENTS): $(BASE) $(INST)/$(ZODB) $(INST)/$(PATCH)
- +$(PIPE) "$(SAGE_SPKG) $(PYGMENTS) 2>&1" "tee -a
$(SAGE_LOGS)/$(PYGMENTS).log"
-
-$(INST)/$(ZODB): $(BASE) $(INST)/$(TWISTED) $(INST)/$(PATCH)
- +$(PIPE) "$(SAGE_SPKG) $(ZODB) 2>&1" "tee -a
$(SAGE_LOGS)/$(ZODB).log"
-
-$(INST)/$(TWISTED): $(BASE) $(INST)/$(PYTHON) $(INST)/$(PYTHON_GNUTLS) \
- $(INST)/$(PEXPECT) $(INST)/$(DOCUTILS) \
- $(INST)/$(SETUPTOOLS) $(INST)/$(PATCH)
- +$(PIPE) "$(SAGE_SPKG) $(TWISTED) 2>&1" "tee -a
$(SAGE_LOGS)/$(TWISTED).log"
-
+# setuptools forgets to update easy-install.pth during parallel builds,
+# so we build the relevant packages serially. In order to enforce
+# this, we artificially make every package in the list below depend on
+# the package under it.
+#
# For reference and for when the setuptools problem is solved, here
# are the actual dependencies:
#
-# sagenb: python pexpect twisted jinja2 sphinx docutils setuptools
+# sagenb: python pexpect jinja2 sphinx docutils setuptools
# sqlalchemy: python setuptools
# sphinx: docutils jinja2 pygments
# jinja2: python docutils setuptools
# pygments: python setuptools
-# twisted: python python_gnutls setuptools
# zodb: python setuptools
+$(INST)/$(SAGENB): $(BASE) $(INST)/$(SETUPTOOLS) $(INST)/$(SQLALCHEMY) \
+ $(INST)/$(PEXPECT) $(INST)/$(JINJA2) $(INST)/$(SPHINX)
\
+ $(INST)/$(DOCUTILS) $(INST)/$(PATCH)
+ +$(PIPE) "$(SAGE_SPKG) $(SAGENB) 2>&1" "tee -a
$(SAGE_LOGS)/$(SAGENB).log"
+
+$(INST)/$(SQLALCHEMY): $(BASE) $(INST)/$(SETUPTOOLS) $(INST)/$(SPHINX)
$(INST)/$(PATCH)
+ +$(PIPE) "$(SAGE_SPKG) $(SQLALCHEMY) 2>&1" "tee -a
$(SAGE_LOGS)/$(SQLALCHEMY).log"
+
+$(INST)/$(SPHINX): $(BASE) $(INST)/$(DOCUTILS) $(INST)/$(JINJA2) \
+ $(INST)/$(PYGMENTS) $(INST)/$(PATCH)
+ +$(PIPE) "$(SAGE_SPKG) $(SPHINX) 2>&1" "tee -a
$(SAGE_LOGS)/$(SPHINX).log"
+
+$(INST)/$(JINJA2): $(BASE) $(INST)/$(SETUPTOOLS) $(INST)/$(PYGMENTS) \
+ $(INST)/$(PATCH) $(INST)/$(DOCUTILS)
+ +$(PIPE) "$(SAGE_SPKG) $(JINJA2) 2>&1" "tee -a
$(SAGE_LOGS)/$(JINJA2).log"
+
+$(INST)/$(PYGMENTS): $(BASE) $(INST)/$(SETUPTOOLS) $(INST)/$(ZODB)
$(INST)/$(PATCH)
+ +$(PIPE) "$(SAGE_SPKG) $(PYGMENTS) 2>&1" "tee -a
$(SAGE_LOGS)/$(PYGMENTS).log"
+
+$(INST)/$(ZODB): $(BASE) $(INST)/$(SETUPTOOLS) $(INST)/$(PATCH)
+ +$(PIPE) "$(SAGE_SPKG) $(ZODB) 2>&1" "tee -a
$(SAGE_LOGS)/$(ZODB).log"
+
########################################################################
# List all *build-time* dependencies of the Sage library. These are,
# on the one hand, programs needed for the build/install process of the
}}}
Does that mean "needs work", or are the instructions at #11080 misleading?
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/11874#comment:91>
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 post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
