Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make dist: Update git remotes #35384

Merged
merged 3 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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