From 8653067f43dccc6ae55ce6a493bc27127c332869 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 29 Mar 2023 13:59:26 -0700 Subject: [PATCH 1/3] build/bin/sage-clone-source, src/bin/sage-env: Replace Trac by github --- build/bin/sage-clone-source | 8 +++++--- src/bin/sage-env | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build/bin/sage-clone-source b/build/bin/sage-clone-source index 1b71e81999a..35f93bf15e2 100755 --- a/build/bin/sage-clone-source +++ b/build/bin/sage-clone-source @@ -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 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 diff --git a/src/bin/sage-env b/src/bin/sage-env index 28f86bc52ef..a7da60df28f 100644 --- a/src/bin/sage-env +++ b/src/bin/sage-env @@ -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 From 3f6ff407a469d8993719701e846bbe12a30fc7ed Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 29 Mar 2023 13:59:55 -0700 Subject: [PATCH 2/3] src: Replace some remaining Trac references --- src/sage/cpython/__init__.py | 2 +- src/sage/dynamics/arithmetic_dynamics/projective_ds.py | 2 +- src/sage/repl/interpreter.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sage/cpython/__init__.py b/src/sage/cpython/__init__.py index 51974f1e438..5deff221609 100644 --- a/src/sage/cpython/__init__.py +++ b/src/sage/cpython/__init__.py @@ -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: diff --git a/src/sage/dynamics/arithmetic_dynamics/projective_ds.py b/src/sage/dynamics/arithmetic_dynamics/projective_ds.py index 4dd109036d4..895415d58ec 100644 --- a/src/sage/dynamics/arithmetic_dynamics/projective_ds.py +++ b/src/sage/dynamics/arithmetic_dynamics/projective_ds.py @@ -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. diff --git a/src/sage/repl/interpreter.py b/src/sage/repl/interpreter.py index fe4cff3add5..fd451a2bab5 100644 --- a/src/sage/repl/interpreter.py +++ b/src/sage/repl/interpreter.py @@ -696,14 +696,14 @@ def __init__(self, app): sage: sorted(sch.info.items()) [('app_name', 'Sage'), - ('bug_tracker', 'http://trac.sagemath.org'), + ('bug_tracker', 'https://github.com/sagemath/sage/issues'), ('contact_email', 'sage-support@googlegroups.com'), ('contact_name', 'sage-support'), ('crash_report_fname', 'Crash_report_Sage.txt')] """ contact_name = 'sage-support' contact_email = 'sage-support@googlegroups.com' - 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' From 217a60d52f3bb46059ed911906dbd4be763b56bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=B6ppe?= Date: Wed, 29 Mar 2023 16:08:26 -0700 Subject: [PATCH 3/3] build/bin/sage-clone-source: Fix up Co-authored-by: John H. Palmieri --- build/bin/sage-clone-source | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/bin/sage-clone-source b/build/bin/sage-clone-source index 35f93bf15e2..65dc1ffa93f 100755 --- a/build/bin/sage-clone-source +++ b/build/bin/sage-clone-source @@ -36,7 +36,7 @@ git clone --origin upstream "$SRC" "$DST" cd "$DST" git remote set-url upstream "$SAGE_REPO_ANONYMOUS" git remote set-url --push upstream "do not push to upstream" -git remote add trac trac https://github.com/sagemath/sagetrac-mirror.git +git remote add trac https://github.com/sagemath/sagetrac-mirror.git git remote set-url --push trac "do not push to trac" # Save space