On Dec 6, 9:13 am, John H Palmieri <[EMAIL PROTECTED]> wrote: > On Dec 6, 8:50 am, mabshoff <[EMAIL PROTECTED]> wrote: > > > > > On Dec 6, 8:19 am, John H Palmieri <[EMAIL PROTECTED]> wrote: > > > > On Dec 5, 5:10 pm, "William Stein" <[EMAIL PROTECTED]> wrote: > > > Hi John, > > > > > You have to manually resolve this merge conflict by editing > > > > integer.pyx, choosing one of the two options, and then > > > > check in the result of doing the merge. > > > > Actually, before you posted this I just edited integer.pyx by hand and > > > ran 'sage -b' to finish the compilation of the pyx files. > > > > I had two doctest failures: > > > > When building from scratch: > > > > sage -t "devel/sage/sage/interfaces/psage.py" > > > A mysterious error (perphaps a memory error?) occurred, which may have > > > crashed doctest. > > > Is that with #4719 applied or not? > > Not. I've applied it now and am running each of these two doctests a > bunch of times to see if I can get an error again. > > John
After running the doctests for the files rings/polynomial/ multi_polynomial_libsingular.pyx and interfaces/psage.py 1000 times each (500 times each for the upgraded version of sage and the built- from-scratch version), I haven't seen a failure for multi_polynomial_libsingular.pyx, although I'll keep trying a while longer, and I have one failure for psage.py (built-from-scratch version): File "/Applications/sage_builds/sage-3.2.2.alpha0/devel/sage/sage/ interfaces/psage.py", line 79, in __main__.example_0 Failed example: print "ignore this"; w # random output###line 35:_sage_ >>> print "ignore this"; w # random output Exception raised: Traceback (most recent call last): File "/Applications/sage-3.2.2.alpha0/local/bin/ncadoctest.py", line 1231, in run_one_test self.run_one_example(test, example, filename, compileflags) File "/Applications/sage-3.2.2.alpha0/local/bin/sagedoctest.py", line 38, in run_one_example OrigDocTestRunner.run_one_example(self, test, example, filename, compileflags) File "/Applications/sage-3.2.2.alpha0/local/bin/ncadoctest.py", line 1172, in run_one_example compileflags, 1) in test.globs File "<doctest __main__.example_0[5]>", line 1, in <module> print "ignore this"; w # random output###line 35:_sage_ >>> print "ignore this"; w # random output File "/Applications/sage_builds/sage-3.2.2.alpha0/local/lib/ python2.5/site-packages/sage/interfaces/expect.py", line 1462, in __repr__ s = s.replace(self._name, self.__dict__['__custom_name']) KeyError: '__custom_name' ********************************************************************** 1 items had failures: 1 of 6 in __main__.example_0 ***Test Failed*** 1 failures. Is this helpful? John --~--~---------~--~----~------------~-------~--~----~ To post to this group, send email to sage-devel@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/sage-devel URLs: http://www.sagemath.org -~----------~----~----~----~------~----~------~--~---