-
-
Notifications
You must be signed in to change notification settings - Fork 405
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'sagemath:develop' into numberfields
- Loading branch information
Showing
320 changed files
with
3,876 additions
and
2,574 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| #!/bin/sh | ||
| if [ $# != 2 ]; then | ||
| echo >&2 "usage: $0 BASE_DOC_COMMIT DOC_REPO" | ||
| echo >&2 "creates CHANGES.html in the current directory" | ||
| echo >&2 "for the diffs of DOC_REPO against BASE_DOC_COMMIT" | ||
| exit 1 | ||
| fi | ||
| BASE_DOC_COMMIT="$1" | ||
| DOC_REPOSITORY="$2" | ||
|
|
||
| # Wipe out chronic diffs between old doc and new doc | ||
| (cd $DOC_REPOSITORY && find . -name "*.html" | xargs sed -i -e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d') | ||
| # Create CHANGES.html | ||
| echo '<html>' > CHANGES.html | ||
| echo '<head>' >> CHANGES.html | ||
| echo '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/default.min.css">' >> CHANGES.html | ||
| echo '<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>' >> CHANGES.html | ||
| echo '<script>hljs.highlightAll();</script>' >> CHANGES.html | ||
| cat >> CHANGES.html << EOF | ||
| <script> | ||
| document.addEventListener('DOMContentLoaded', () => { | ||
| const diffSite = 'https://pianomister.github.io/diffsite' | ||
| const baseDocURL = 'https://sagemath-tobias.netlify.app' | ||
| const diffParagraphs = document.querySelectorAll('p.diff'); | ||
| diffParagraphs.forEach(paragraph => { | ||
| const rootURL = window.location.origin; | ||
| const docAnchor = paragraph.querySelector('a'); // first "a" element | ||
| const url = new URL(docAnchor.href); | ||
| const path = url.pathname; | ||
| const anchor = document.createElement('a'); | ||
| anchor.href = diffSite + '/?url1=' + rootURL + path + '&url2=' + baseDocURL + path; | ||
| anchor.textContent = 'compare with the base'; | ||
| anchor.setAttribute('target', '_blank'); | ||
| paragraph.appendChild(anchor); | ||
| paragraph.innerHTML += ' '; | ||
| const hunkAnchors = paragraph.querySelectorAll('a.hunk'); | ||
| hunkAnchors.forEach(hunkAnchor => { | ||
| const url = new URL(hunkAnchor.href); | ||
| const path = url.pathname; | ||
| const pathHash = path + url.hash.replace('#', '%23'); | ||
| const anchor = document.createElement('a'); | ||
| anchor.href = diffSite + '/?url1=' + rootURL + pathHash + '&url2=' + baseDocURL + path; | ||
| anchor.textContent = hunkAnchor.textContent; | ||
| anchor.setAttribute('target', '_blank'); | ||
| paragraph.appendChild(anchor); | ||
| paragraph.innerHTML += ' '; | ||
| }); | ||
| }); | ||
| }); | ||
| </script> | ||
| EOF | ||
| echo '</head>' >> CHANGES.html | ||
| echo '<body>' >> CHANGES.html | ||
| (cd $DOC_REPOSITORY && git diff $BASE_DOC_COMMIT -- *.html) > diff.txt | ||
| python3 - << EOF | ||
| import os, re, html | ||
| with open('diff.txt', 'r') as f: | ||
| diff_text = f.read() | ||
| diff_blocks = re.split(r'^(?=diff --git)', diff_text, flags=re.MULTILINE) | ||
| out_blocks = [] | ||
| for block in diff_blocks: | ||
| match = re.search(r'^diff --git a/(.*) b/\1', block, flags=re.MULTILINE) | ||
| if match: | ||
| doc = match.group(1) | ||
| path = 'html/' + doc | ||
| file_path = os.path.join('$DOC_REPOSITORY', doc) | ||
| with open(file_path, 'r') as file: | ||
| content = file.readlines() | ||
| count = 0 | ||
| for line in block.splitlines(): | ||
| if line.startswith('@@ -'): | ||
| line_number = int(re.search(r'@@ -(\d+)', line).group(1)) | ||
| for i in range(line_number, -1, -1): | ||
| if content[i].startswith('<'): | ||
| count += 1 | ||
| content[i] = f'<span id="hunk{count}" style="visibility: hidden;"></span>' + content[i] | ||
| break | ||
| with open(file_path, 'w') as file: | ||
| file.writelines(content) | ||
| hunks = ' '.join(f'<a href="{path}#hunk{i+1}" class="hunk" target="_blank">#{i + 1}</a>' for i in range(count)) | ||
| out_blocks.append(f'<p class="diff"><a href="{path}">{doc}</a> ' + hunks + ' </p>' | ||
| + '\n<pre><code class="language-diff">' | ||
| + html.escape(block).strip() + '</code></pre>') | ||
| output_text = '\n'.join(out_blocks) | ||
| with open('diff.html', 'w') as f: | ||
| f.write(output_text) | ||
| EOF | ||
| cat diff.html >> CHANGES.html | ||
| echo '</body>' >> CHANGES.html | ||
| echo '</html>' >> CHANGES.html | ||
| rm diff.txt diff.html |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,82 @@ | ||
| #!/bin/sh | ||
| # Merge open PRs from sagemath/sage labeled "blocker". | ||
| REPO="sagemath/sage" | ||
| GH="gh -R $REPO" | ||
| PRs="$($GH pr list --label "p: blocker / 1" --json number --jq '.[].number')" | ||
| if [ -z "$PRs" ]; then | ||
| echo 'Nothing to do: Found no open PRs with "blocker" status.' | ||
| else | ||
| echo "Found PRs: " $PRs | ||
| export GIT_AUTHOR_NAME="ci-sage workflow" | ||
| export GIT_AUTHOR_EMAIL="ci-sage@example.com" | ||
| export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" | ||
| export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL" | ||
| git tag -f test_base | ||
| git commit -q -m "Uncommitted changes" --no-allow-empty -a | ||
| for a in $PRs; do | ||
| git fetch --unshallow --all > /dev/null 2>&1 && echo "Unshallowed." | ||
| echo "::group::Merging PR https://github.com/$REPO/pull/$a" | ||
| git tag -f test_head | ||
| $GH pr checkout -b pr-$a $a | ||
| git checkout -q test_head | ||
| if git merge --no-edit --squash -q pr-$a; then | ||
| echo "::endgroup::" | ||
| if git commit -q -m "Merge https://github.com/$REPO/pull/$a" -a --no-allow-empty; then | ||
| echo "Merged #$a" | ||
| # Apply open PRs labeled "blocker" from sagemath/sage as patches. | ||
| # This script is invoked by various workflows in .github/workflows | ||
| # | ||
| # The repository variable SAGE_CI_FIXES_FROM_REPOS can be set | ||
| # to customize this for CI runs in forks: | ||
| # | ||
| # - If set to a whitespace-separated list of repositories, use them instead of sagemath/sage. | ||
| # - If set to "none", do not apply any PRs. | ||
| # | ||
| # https://docs.github.com/en/actions/learn-github-actions/variables#creating-configuration-variables-for-a-repository | ||
| export GIT_AUTHOR_NAME="ci-sage workflow" | ||
| export GIT_AUTHOR_EMAIL="ci-sage@example.com" | ||
| export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" | ||
| export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL" | ||
| mkdir -p upstream | ||
| for REPO in ${SAGE_CI_FIXES_FROM_REPOSITORIES:-sagemath/sage}; do | ||
| case $REPO in | ||
| none) | ||
| echo "Nothing to do for 'none' in SAGE_CI_FIXES_FROM_REPOSITORIES" | ||
| ;; | ||
| */*) | ||
| echo "Getting open PRs with 'blocker' status from https://github.com/$REPO/pulls?q=is%3Aopen+label%3A%22p%3A+blocker+%2F+1%22" | ||
| GH="gh -R $REPO" | ||
| REPO_FILE="upstream/ci-fixes-${REPO%%/*}-${REPO##*/}" | ||
| PRs="$($GH pr list --label "p: blocker / 1" --json number --jq '.[].number' | tee $REPO_FILE)" | ||
| date -u +"%Y-%m-%dT%H:%M:%SZ" > $REPO_FILE.date # Record the date, for future reference | ||
| if [ -z "$PRs" ]; then | ||
| echo "Nothing to do: Found no open PRs with 'blocker' status in $REPO." | ||
| else | ||
| echo "Empty, skipped" | ||
| echo "Found open PRs with 'blocker' status in $REPO: $(echo $PRs)" | ||
| git tag -f test_base | ||
| git commit -q -m "Uncommitted changes" --no-allow-empty -a | ||
| for a in $PRs; do | ||
| # We used to pull the branch and merge it (after unshallowing), but when run on PRs that are | ||
| # based on older releases, it has the side effect of updating to this release, | ||
| # which may be confusing. | ||
| # | ||
| # Here, we obtain the "git am"-able patch of the PR branch. | ||
| # This also makes it unnecessary to unshallow the repository. | ||
| # | ||
| # Considered alternative: Use https://github.com/$REPO/pull/$a.diff, | ||
| # which squashes everything into one diff without commit metadata. | ||
| PULL_URL="https://github.com/$REPO/pull/$a" | ||
| PULL_FILE="$REPO_FILE-$a" | ||
| PATH=build/bin:$PATH build/bin/sage-download-file --quiet "$PULL_URL.patch" $PULL_FILE.patch | ||
| date -u +"%Y-%m-%dT%H:%M:%SZ" > $PULL_FILE.date # Record the date, for future reference | ||
| LAST_SHA=$(sed -n -E '/^From [0-9a-f]{40}/s/^From ([0-9a-f]{40}).*/\1/p' $PULL_FILE.patch | tail -n 1) | ||
| COMMITS_URL="https://github.com/$REPO/commits/$LAST_SHA" | ||
| echo "::group::Applying PR $PULL_URL @ $COMMITS_URL as a patch" | ||
| export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME applying $PULL_URL @ $COMMITS_URL" | ||
| if git am --signoff --empty=keep < $PULL_FILE.patch; then | ||
| echo "---- Applied patch --------------------------------------------------------------------------------" | ||
| cat $PULL_FILE.patch | ||
| echo "--------------------------------------------------------------------8<-----------------------------" | ||
| echo "::endgroup::" | ||
| elif git am --abort \ | ||
| && if git fetch --unshallow --all > /dev/null 2>&1; then echo "Unshallowed"; fi \ | ||
| && echo "Retrying with 3-way merge" \ | ||
| && git am --empty=keep --3way < $PULL_FILE.patch; then | ||
| echo "---- Applied patch --------------------------------------------------------------------------------" | ||
| cat $PULL_FILE.patch | ||
| echo "--------------------------------------------------------------------8<-----------------------------" | ||
| echo "::endgroup::" | ||
| else | ||
| echo "---- Failure applying patch -----------------------------------------------------------------------" | ||
| git am --signoff --show-current-patch=diff | ||
| echo "--------------------------------------------------------------------8<-----------------------------" | ||
| echo "::endgroup::" | ||
| echo "Failure applying $PULL_URL as a patch, resetting" | ||
| git am --signoff --abort | ||
| fi | ||
| done | ||
| fi | ||
| else | ||
| echo "::endgroup::" | ||
| echo "Failure merging #$a, resetting" | ||
| git reset --hard | ||
| fi | ||
| done | ||
| git log test_base..HEAD | ||
| fi | ||
| ;; | ||
| *) | ||
| echo "Repository variable SAGE_CI_FIXES_FROM_REPOSITORIES, if set, should be a whitespace-separated list of repositories or 'none'" | ||
| echo "Got: $SAGE_CI_FIXES_FROM_REPOSITORIES" | ||
| exit 1 | ||
| ;; | ||
| esac | ||
| done |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.