Quick update: removing the backslash seems to fix the problem with all.py. It was probably a stray character introduced when I went in to do some other minor fixes.
Unfortunately, it appears that the merge tool I used (Apple's FileMerge) has introduced a bunch of indentation errors in another file. Which is a bit too bad. Thankfully the conflicts were minimal and I should be able to resolve by hand. And make finally works! Huzzah! Thanks for all the help. JH On Friday, August 12, 2016 at 9:47:03 PM UTC-4, Joseph Hundley wrote: > > Yes, and yes. Both /Users/jahundle/sage/local/lib/python2.7/site-packages/ > sage/categories/all.py > and $SAGEROOT/src/sage/categories/all.py start with a backslash. > > Using a merge program to compare them confirms that they're identical. > > On a hunch I decided to compare $SAGEROOT/src/sage/categories/all.py > with $SAGEROOT/src/sage/categories/all.py.orig which I would > guess is a file created during the merge process. The backslash is not > there in the "orig." So, maybe it's a stray character introduced at that > stage? Would a typo I'd made during the merge get propogated from > $SAGEROOT/src/sage/categories/all.py > to /Users/jahundle/sage/local/lib/python2.7/site-packages/ > sage/categories/all.py? > > Thanks for your help. > > Maybe I'll try seeing what deleting that backslash does. > > Joe > > On Friday, August 12, 2016 at 3:45:17 PM UTC-4, leif wrote: >> >> Joseph Hundley wrote: >> > >> > On Friday, August 12, 2016 at 12:13:08 PM UTC-4, Joseph Hundley wrote: >> > >> > [...] I ran >> > >> > git reset --hard HEAD >> > make clean >> > make doc-clean >> > >> > and am now back to a state where make works. >> > >> > hundleymac:sage jahundle$ git status >> > >> > On branch develop >> > >> > Your branch is up-to-date with 'origin/develop'. >> > >> > nothing to commit, working tree clean >> > >> > >> > >> > Normally speaking, you want to continue working on this ticket >> > on the current beta (although 7.4.beta0 is a bit >> > broken, as happens with some betas). >> > >> > That is, you should rebase the branch over 7.4.beta0 >> > I.e., >> > git checkout -b new16821 7.4.beta0 >> > >> > >> > fatal: Cannot update paths and switch to branch 'new16821' at the >> > same time. >> > >> > Did you intend to checkout '7.4.beta0' which can not be resolved as >> > commit? >> > >> > >> > To get around this issue I just did >> > >> > git checkout -b new16821 >> > >> > hundleymac:sage jahundle$ git status >> > >> > On branch develop >> > >> > Your branch is up-to-date with 'origin/develop'. >> > >> > nothing to commit, working tree clean >> > >> > >> > git fetch trac public/lie_algebras/classical-16821 >> > git merge FETCH_HEAD >> > (the latter may require further actions, be alert... >> > >> > >> > these commands now work. There were a few files to merge. I used git >> > mergetool and the Apple Developer program FileMerge, plus a little >> > by-hand editing. >> > >> > make produced >> > >> > .... >> > >> > cd ../.. && sage-logger -p './sage --docbuild --no-pdf-links all html ' >> > logs/dochtml.log >> > >> > [dochtml] Traceback (most recent call last): >> > >> > [dochtml] <SNIP> >> > >> > [dochtml] File >> > >> "/Users/jahundle/sage/local/lib/python2.7/site-packages/sage/combinat/free_module.py", >> >> >> > line 29, in <module> >> > >> > [dochtml] from sage.categories.all import Category, Sets, >> > ModulesWithBasis >> > >> > [dochtml] File >> > >> "/Users/jahundle/sage/local/lib/python2.7/site-packages/sage/categories/all.py", >> >> >> > line 1 >> > >> > [dochtml] \from __future__ import absolute_import >> > >> > [dochtml] ^ >> > >> > [dochtml] SyntaxError: unexpected character after line continuation >> > character >> > >> > make[2]: *** [doc-html] Error 1 >> > >> > make[1]: *** [all] Error 2 >> > >> > >> > real0m7.891s >> > >> > user0m4.979s >> > >> > sys0m1.536s >> > >> > *************************************************************** >> > >> > Error building Sage. >> > >> > >> > The following package(s) may have failed to build (not necessarily >> > >> > during this run of 'make all'): >> > >> > >> > * package: sagelib-7.3.beta2 >> > >> > log file: /Users/jahundle/sage/logs/pkgs/sagelib-7.3..beta2.log >> > >> > build directory: >> > /Users/jahundle/sage/local/var/tmp/sage/build/sagelib-7.3.beta2 >> >> >> Ignore that (or better delete that log), since it's from an older >> attempt to build Sage (apparently Sage 7.2.beta2), and unrelated to the >> docbuild error you get. >> >> >> > <SNIP> >> > >> > hundleymac:sage jahundle$ make doc-clean >> > >> > ... >> > >> > real0m0.033s >> > >> > user0m0.018s >> > >> > sys0m0.013s >> > >> > Sage build/upgrade complete! >> > >> > hundleymac:sage jahundle$ make >> > >> > ... >> > >> > cd ../.. && sage-logger -p './sage --docbuild --no-pdf-links all html ' >> > logs/dochtml.log >> > >> > [dochtml] Traceback (most recent call last): >> > sage/categories/all.py >> > [dochtml] <SNIP, same as above> >> > >> > [dochtml] from sage.categories.all import Category, Sets, >> > ModulesWithBasis >> > >> > [dochtml] File >> > >> "/Users/jahundle/sage/local/lib/python2.7/site-packages/sage/categories/all.py", >> >> >> > line 1 >> > >> > [dochtml] \from __future__ import absolute_import >> > >> > [dochtml] ^ >> > >> > [dochtml] SyntaxError: unexpected character after line continuation >> > character >> > >> > make[2]: *** [doc-html] Error 1 >> > ... >> >> Is there really a backslash at the beginning of the first line of that >> file? >> >> And is it in src/sage/categories/all.py as well? (These files should^TM >> be identical.) >> >> >> -leif >> >> >> -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
