I tried running those two commands and got merge conflicts: jacksonwalters@jaxmacbookair sage % git rebase origin/develop
Auto-merging src/sage/doctest/parsing.py CONFLICT (content): Merge conflict in src/sage/doctest/parsing.py error: could not apply db5bf6ce535... Filter out R warnings hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply db5bf6ce535... Filter out R warnings On Sun, Oct 20, 2024 at 3:03 PM Dima Pasechnik <dimp...@gmail.com> wrote: > On Sun, Oct 20, 2024 at 7:06 PM Jackson Walters > <jacksonwalt...@gmail.com> wrote: > > > > I don’t think I understand. I am just making commits in PR #38455. If I > switch to the develop branch, surely these won’t have the changes I’m > looking to see when I build? I’m probably just misunderstanding how git > works. > > I'm not telling you to switch to the develop branch, I am telling you > to re-base your work on it. > Currently your base branch, i.e. from where you started your changes, is > beta0. > These two commands: > > git fetch origin develop > git rebase origin/develop > > do the following. The 1st one copies the current develop branch (the > changeset, to be more precise) > from origin onto your local repo. This branch can be addressed, > locally, as origin/develop. > The 2nd command does the rebase of your current branch. > (https://git-scm.com/book/en/v2/Git-Branching-Rebasing) > > In fact I just checked that rebase in your case will be automatic (I > got the branch from #38455 and tested on it) > > Dima > > > > > > > > Thanks, > > Jackson > > > > On Sun, Oct 20, 2024 at 7:00 AM Dima Pasechnik <dimp...@gmail.com> > wrote: > >> > >> > >> > >> On 20 October 2024 01:58:14 BST, Jackson Walters < > jacksonwalt...@gmail.com> wrote: > >> >Yes, it is 10.5.beta0. I’m not entirely sure how to switch to the > latest > >> >beta version. I’m just on the branch of the PR that I’m working on > >> >currently. > >> > > >> >Do I have to rebase? > >> > >> Rebasing is typically automatic, if you just touched a few files which > were not touched in between the betas: > >> > >> If origin is the name you gave to the Sage remote repo, then you do > >> > >> git fetch origin develop > >> git rebase origin/develop > >> > >> and it hopefully just says "Successfully..." > >> > >> > >> > > >> >No worries, I should’ve included which version I was working with. I > should > >> >also mention I do have an installation from binary installed (10.4). > >> > > >> >Thanks, > >> >Jackson > >> > > >> >On Sat, Oct 19, 2024 at 4:01 AM Dima Pasechnik <dimp...@gmail.com> > wrote: > >> > > >> >> According to the config.log, you are trying to install Sage > 10.5.beta0 > >> >> - which might just not work. > >> >> (beta0 are often broken, etc). Anyway, for the development purposes > >> >> you'd normally use one of the latest betas. > >> >> The latest is 10.5.beta7. Please try it instead. > >> >> If you already have changes in your source tree, these should be > >> >> rebased over (or merged in) the latest beta branch. > >> >> Sorry, I should have spotted it earlier. > >> >> > >> >> Dima > >> >> > >> >> On Sat, Oct 19, 2024 at 1:03 AM Jackson Walters > >> >> <jacksonwalt...@gmail.com> wrote: > >> >> > > >> >> > I removed those three from my path and I'm still getting the same > error: > >> >> > > >> >> > % echo $PATH > >> >> > > >> >> > > >> >> > /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin > >> >> > > >> >> > > >> >> > I did source .homebrew-build-env before running ./configure. I > installed > >> >> the packages listed in the instructions. > >> >> > On Friday, October 18, 2024 at 4:48:51 PM UTC-4 dim...@gmail.com > wrote: > >> >> >> > >> >> >> The errors you have might be due to the use of pyenv (perhaps > it's not > >> >> >> activated, but still it might be a problem). Specifically, in your > >> >> >> PATH you have > >> >> >> > >> >> >> PATH: /opt/homebrew/Cellar/pyenv-virtualenv/1.2.4/shims/ > >> >> >> PATH: /Users/jacksonwalters/.pyenv/shims/ > >> >> >> PATH: /Users/jacksonwalters/.pyenv/bin/ > >> >> >> PATH: /opt/homebrew/bin/ > >> >> >> PATH: /opt/homebrew/sbin/ > >> >> >> PATH: /usr/local/bin/ > >> >> >> PATH: /System/Cryptexes/App/usr/bin/ > >> >> >> > >> >> >> Please remove the first 3 entries from it, and try again. Please > also > >> >> >> make sure you sourced > >> >> >> .homebrew-build-env before running ./configure, as explained in > >> >> >> macOS-specific docs. > >> >> >> > >> >> >> By the way, you can install more Homebrew packages to be used by > Sage, > >> >> >> as you can see at the bottom of config.log (concrete lists of > packages > >> >> >> are given there) > >> >> >> > >> >> >> > >> >> >> > >> >> >> > >> >> >> On Fri, Oct 18, 2024 at 8:51 PM Jackson Walters > >> >> >> <jackson...@gmail.com> wrote: > >> >> >> > > >> >> >> > Yes, attached. > >> >> >> > > >> >> >> > On Friday, October 18, 2024 at 3:43:14 PM UTC-4 > dim...@gmail.com > >> >> wrote: > >> >> >> >> > >> >> >> >> Hi, > >> >> >> >> could you post the top-level config.log > >> >> >> >> and logs/install.log ? > >> >> >> >> > >> >> >> >> Thanks. > >> >> >> >> > >> >> >> >> > >> >> >> >> > >> >> >> >> On 18 October 2024 20:19:13 BST, Jackson Walters < > >> >> jackson...@gmail.com> wrote: > >> >> >> >>> > >> >> >> >>> Hi all, > >> >> >> >>> > >> >> >> >>> I am making some changes to > `symmetric_group_representations.py`, > >> >> and it would be useful to test them locally before committing them > to a PR. > >> >> I haven't found it necessary to build Sage from source, but I'd like > to > >> >> now. I am following the instructions in "Instructions to Build from > Source" > >> >> in the README, installed the necessary prerequisites, and ran > `./configure` > >> >> followed by `make`. > >> >> >> >>> > >> >> >> >>> Here is the traceback of the errors I'm getting: > >> >> >> >>> > >> >> >> >>>> [pip-24.0] Using cached file > >> >> > /Users/jacksonwalters/Documents/GitHub/sage/upstream/pip-24.0-py3-none-any.whl > >> >> >> >>>> [pip-24.0] Setting up build directory > >> >> > /Users/jacksonwalters/Documents/GitHub/sage/local/var/lib/sage/venv-python3.12.4/var/tmp/sage/build/pip-24.0 > >> >> >> >>>> [pip-24.0] No stamp file for package 'pip' in > >> >> > /Users/jacksonwalters/Documents/GitHub/sage/local/var/lib/sage/venv-python3.12.4/var/lib/sage/installed > >> >> >> >>>> [pip-24.0] No spkg-legacy-uninstall script; nothing to do > >> >> >> >>>> [pip-24.0] [spkg-install] Staged wheel file, staged > >> >> > /Users/jacksonwalters/Documents/GitHub/sage/local/var/lib/sage/venv-python3.12.4/var/lib/sage/scripts/pip/spkg-requirements.txt > >> >> >> >>>> [pip-24.0] Moving package files from temporary location > >> >> > /Users/jacksonwalters/Documents/GitHub/sage/local/var/lib/sage/venv-python3.12.4/var/tmp/sage/build/pip-24.0/inst > >> >> to > >> >> > /Users/jacksonwalters/Documents/GitHub/sage/local/var/lib/sage/venv-python3.12.4 > >> >> >> >>>> [pip-24.0] [spkg-pipinst] Traceback (most recent call last): > >> >> >> >>>> [pip-24.0] [spkg-pipinst] File > >> >> "/Users/jacksonwalters/Documents/GitHub/sage/build/bin/sage-flock", > line > >> >> 23, in <module> > >> >> >> >>>> [pip-24.0] [spkg-pipinst] from sage_bootstrap.flock import > run > >> >> >> >>>> [pip-24.0] [spkg-pipinst] File > >> >> > "/Users/jacksonwalters/Documents/GitHub/sage/build/bin/../sage_bootstrap/flock.py", > >> >> line 15, in <module> > >> >> >> >>>> [pip-24.0] [spkg-pipinst] import pipes > >> >> >> >>>> [pip-24.0] [spkg-pipinst] ModuleNotFoundError: No module > named > >> >> 'pipes' > >> >> >> >>>> [pip-24.0] [spkg-pipinst] Traceback (most recent call last): > >> >> >> >>>> [pip-24.0] [spkg-pipinst] File > >> >> "/Users/jacksonwalters/Documents/GitHub/sage/build/bin/sage-flock", > line > >> >> 23, in <module> > >> >> >> >>>> [pip-24.0] [spkg-pipinst] from sage_bootstrap.flock import > run > >> >> >> >>>> [pip-24.0] [spkg-pipinst] File > >> >> > "/Users/jacksonwalters/Documents/GitHub/sage/build/bin/../sage_bootstrap/flock.py", > >> >> line 15, in <module> > >> >> >> >>>> [pip-24.0] [spkg-pipinst] import pipes > >> >> >> >>>> [pip-24.0] [spkg-pipinst] ModuleNotFoundError: No module > named > >> >> 'pipes' > >> >> >> >>>> [pip-24.0] [spkg-pipinst] Warning: installing with "python3 > -m pip > >> >> install --verbose --no-index > >> >> > --find-links=/Users/jacksonwalters/Documents/GitHub/sage/local/var/lib/sage/venv-python3.12.4/var/lib/sage/wheels > >> >> --disable-pip-version-check --isolated --no-cache-dir" failed. > Retrying, > >> >> adding "--no-deps --ignore-installed --ignore-requires-python" > >> >> >> >>>> [pip-24.0] [spkg-pipinst] Traceback (most recent call last): > >> >> >> >>>> [pip-24.0] [spkg-pipinst] File > >> >> "/Users/jacksonwalters/Documents/GitHub/sage/build/bin/sage-flock", > line > >> >> 23, in <module> > >> >> >> >>>> [pip-24.0] [spkg-pipinst] from sage_bootstrap.flock import > run > >> >> >> >>>> [pip-24.0] [spkg-pipinst] File > >> >> > "/Users/jacksonwalters/Documents/GitHub/sage/build/bin/../sage_bootstrap/flock.py", > >> >> line 15, in <module> > >> >> >> >>>> [pip-24.0] [spkg-pipinst] import pipes > >> >> >> >>>> [pip-24.0] [spkg-pipinst] ModuleNotFoundError: No module > named > >> >> 'pipes' > >> >> >> >>>> [pip-24.0] [spkg-pipinst] Error: installing with pip failed > >> >> >> >>>> [pip-24.0] [spkg-pipinst] > >> >> > ******************************************************************************** > >> >> >> >>>> [pip-24.0] [spkg-pipinst] Error installing pip > >> >> >> >>>> [pip-24.0] [spkg-pipinst] > >> >> > ******************************************************************************** > >> >> >> >>>> [pip-24.0] > >> >> > ************************************************************************ > >> >> >> >>>> [pip-24.0] Error running the pipinst script for pip-24.0. > >> >> >> >>>> [pip-24.0] > >> >> > ************************************************************************ > >> >> >> >>>> [pip-24.0] Please email sage-devel ( > >> >> http://groups.google.com/group/sage-devel) > >> >> >> >>>> [pip-24.0] explaining the problem and including the log files > >> >> >> >>>> [pip-24.0] > >> >> /Users/jacksonwalters/Documents/GitHub/sage/logs/pkgs/pip-24.0.log > >> >> >> >>>> [pip-24.0] and > >> >> >> >>>> [pip-24.0] > /Users/jacksonwalters/Documents/GitHub/sage/config.log > >> >> >> >>>> [pip-24.0] Describe your computer, operating system, etc. > >> >> >> >>>> [pip-24.0] > >> >> > ************************************************************************ > >> >> >> >>>> make[4]: *** [pip-SAGE_VENV-no-deps] Error 1 > >> >> >> >>>> make[3]: *** > >> >> > [/Users/jacksonwalters/Documents/GitHub/sage/local/var/lib/sage/venv-python3.12.4/var/lib/sage/installed/pip-24.0] > >> >> Error 2 > >> >> >> >>>> make[2]: *** [all-start] Error 2 > >> >> >> >>>> > *************************************************************** > >> >> >> >>>> Error building Sage. > >> >> >> >>>> The following package(s) may have failed to build (not > necessarily > >> >> >> >>>> during this run of 'make all-start'): > >> >> >> >>>> * package: m4ri-20200125 > >> >> >> >>>> last build time: Oct 17 15:01 > >> >> >> >>>> log file: > >> >> > /Users/jacksonwalters/Documents/GitHub/sage/logs/pkgs/m4ri-20200125.log > >> >> >> >>>> build directory: > >> >> > /Users/jacksonwalters/Documents/GitHub/sage/local/var/tmp/sage/build/m4ri-20200125 > >> >> >> >>>> * package: pip-24.0 > >> >> >> >>>> last build time: Oct 18 15:06 > >> >> >> >>>> log file: > >> >> /Users/jacksonwalters/Documents/GitHub/sage/logs/pkgs/pip-24.0.log > >> >> >> >>>> It is safe to delete any log files and build directories, > but they > >> >> >> >>>> contain information that is helpful for debugging build > problems. > >> >> >> >>>> WARNING: If you now run 'make' again, the build directory of > the > >> >> >> >>>> same version of the package will, by default, be deleted. > Set the > >> >> >> >>>> environment variable SAGE_KEEP_BUILT_SPKGS=yes to prevent > this. > >> >> >> >>>> real 2m41.391s user 1m45.773s sys 0m34.303s > >> >> >> >>>> make[1]: *** [all-start] Error 1 > >> >> >> >>>> make: *** [all] Error 2 > >> >> >> >>> > >> >> >> >>> Any help would be greatly appreciated. Thank you! > >> >> >> >>> > >> >> >> >>> Jackson > >> >> >> >>> > >> >> >> >>> > >> >> >> > -- > >> >> >> > You received this message because you are subscribed to the > Google > >> >> Groups "sage-support" group. > >> >> >> > To unsubscribe from this group and stop receiving emails from > it, > >> >> send an email to sage-support...@googlegroups.com. > >> >> >> > To view this discussion on the web visit > >> >> > https://groups.google.com/d/msgid/sage-support/df9de397-ca8d-4feb-b28f-92bcb5feb780n%40googlegroups.com > >> >> . > >> >> > > >> >> > -- > >> >> > You received this message because you are subscribed to the Google > >> >> Groups "sage-support" group. > >> >> > To unsubscribe from this group and stop receiving emails from it, > send > >> >> an email to sage-support+unsubscr...@googlegroups.com. > >> >> > To view this discussion on the web visit > >> >> > https://groups.google.com/d/msgid/sage-support/39f7e6b6-674d-470c-9c92-6f51ad8457edn%40googlegroups.com > >> >> . > >> >> > >> >> -- > >> >> You received this message because you are subscribed to the Google > Groups > >> >> "sage-support" group. > >> >> To unsubscribe from this group and stop receiving emails from it, > send an > >> >> email to sage-support+unsubscr...@googlegroups.com. > >> >> To view this discussion on the web visit > >> >> > https://groups.google.com/d/msgid/sage-support/CAAWYfq0opfjRbuXHwZgC6Cr1czwgKC7%2BJLGvbOAKnS%2BMQz1HcQ%40mail.gmail.com > >> >> . > >> >> > >> > > >> > >> -- > >> You received this message because you are subscribed to the Google > Groups "sage-support" group. > >> To unsubscribe from this group and stop receiving emails from it, send > an email to sage-support+unsubscr...@googlegroups.com. > >> To view this discussion on the web visit > https://groups.google.com/d/msgid/sage-support/CE536B49-0753-47F9-BF9E-11D10DCE7EAE%40gmail.com > . > > > > -- > > You received this message because you are subscribed to the Google > Groups "sage-support" group. > > To unsubscribe from this group and stop receiving emails from it, send > an email to sage-support+unsubscr...@googlegroups.com. > > To view this discussion on the web visit > https://groups.google.com/d/msgid/sage-support/CAGqtwVDjsXqK5_agqfSQstPZHRKqA3NBispiPOCgxeBkazM6SQ%40mail.gmail.com > . > -- You received this message because you are subscribed to the Google Groups "sage-support" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-support+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/sage-support/CAGqtwVB-RyjhzjaFJZm8g5Cr5G%2B899x8coqcMFpWARJOFD3YtQ%40mail.gmail.com.
