Skip to content

Commit

Permalink
gh-35384: make dist: Update git remotes
Browse files Browse the repository at this point in the history
    
<!-- Please provide a concise, informative and self-explanatory title.
-->
<!-- Don't put issue numbers in the title. Put it in the Description
below. -->
<!-- For example, instead of "Fixes #12345", use "Add a new method to
multiply two integers" -->

### 📚 Description

<!-- Describe your changes here in detail. -->
The source tarballs made by `make dist` contain a git repository.
We update the remotes.
<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes #12345". -->
As discussed in https://groups.google.com/g/sage-devel/c/TsHnvmkdrR8
<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x
]`. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- #12345: short description why this is a dependency
- #34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: #35384
Reported by: Matthias Köppe
Reviewer(s): John H. Palmieri
  • Loading branch information
Release Manager committed Apr 4, 2023
2 parents 34b6383 + 217a60d commit 6a01bbd
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
8 changes: 5 additions & 3 deletions build/bin/sage-clone-source
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ CONFBALL="$SRC/upstream/configure-$CONFVERSION.tar.gz"
rm -rf "$DST"
mkdir -p "$DST"

git clone --origin trac "$SRC" "$DST"
git clone --origin upstream "$SRC" "$DST"

cd "$DST"
git remote set-url trac "$SAGE_REPO_ANONYMOUS"
git remote set-url --push trac "$SAGE_REPO_AUTHENTICATED"
git remote set-url upstream "$SAGE_REPO_ANONYMOUS"
git remote set-url --push upstream "do not push to upstream"
git remote add trac https://github.com/sagemath/sagetrac-mirror.git
git remote set-url --push trac "do not push to trac"

# Save space
git gc --aggressive --prune=now
Expand Down
4 changes: 2 additions & 2 deletions src/bin/sage-env
Original file line number Diff line number Diff line change
Expand Up @@ -305,11 +305,11 @@ if [ -n "$SAGE_LOCAL" ]; then
fi

if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
SAGE_REPO_ANONYMOUS="https://github.com/sagemath/sagetrac-mirror.git"
SAGE_REPO_ANONYMOUS="https://github.com/sagemath/sage.git"
export SAGE_REPO_ANONYMOUS
fi
if [ -z "$SAGE_REPO_AUTHENTICATED" ]; then
SAGE_REPO_AUTHENTICATED="ssh://git@trac.sagemath.org:2222/sage.git"
SAGE_REPO_AUTHENTICATED="https://github.com/sagemath/sage.git"
export SAGE_REPO_AUTHENTICATED
fi

Expand Down
2 changes: 1 addition & 1 deletion src/sage/cpython/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def connect(*args, **kwargs):
if fix_for_ticket_30157():
raise RuntimeError(
'patch for Github issue #30157 failed; please report this '
'bug to https://trac.sagemath.org')
'bug to https://github.com/sagemath/sage/issues')

# Undo the monkey-patch
try:
Expand Down
2 changes: 1 addition & 1 deletion src/sage/dynamics/arithmetic_dynamics/projective_ds.py
Original file line number Diff line number Diff line change
Expand Up @@ -2336,7 +2336,7 @@ def canonical_height(self, P, **kwds):
# is always nonnegative, so if this value is within -err of 0, return 0.
if h < 0:
assert h > -err, "A negative height less than -error_bound was computed. " + \
"This should be impossible, please report bug on trac.sagemath.org."
"This should be impossible, please report bug on https://github.com/sagemath/sage/issues"
# This should be impossible. The error bound for Wells' is rigorous
# and the actual height is always >= 0. If we see something less than -err,
# something has g one very wrong.
Expand Down
4 changes: 2 additions & 2 deletions src/sage/repl/interpreter.py
Original file line number Diff line number Diff line change
Expand Up @@ -696,14 +696,14 @@ def __init__(self, app):
<sage.repl.interpreter.SageCrashHandler object at 0x...>
sage: sorted(sch.info.items())
[('app_name', 'Sage'),
('bug_tracker', 'http://trac.sagemath.org'),
('bug_tracker', 'https://github.com/sagemath/sage/issues'),
('contact_email', '[email protected]'),
('contact_name', 'sage-support'),
('crash_report_fname', 'Crash_report_Sage.txt')]
"""
contact_name = 'sage-support'
contact_email = '[email protected]'
bug_tracker = 'http://trac.sagemath.org'
bug_tracker = 'https://github.com/sagemath/sage/issues'
CrashHandler.__init__(self,
app, contact_name, contact_email, bug_tracker, show_crash_traceback=True)
self.crash_report_fname = 'Sage_crash_report.txt'
Expand Down

0 comments on commit 6a01bbd

Please sign in to comment.