Skip to content

Commit ccd3f8b

Browse files
author
Release Manager
committed
gh-37385: Remove some last traces of Trac <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> <!-- 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". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] 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: #37385 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee, Matthias Köppe
2 parents 64b991a + 8d3a589 commit ccd3f8b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+86
-105
lines changed

.gitpod-setup-trac-remote.sh

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,8 @@
33
# Exit on error
44
set -e
55

6-
# Setup trac as remote
7-
## In order to push to trac, generate a new key with `ssh-keygen -f tempkey` and save the private key to gitpod `gp env PRIVATE_SSH_KEY="$(<tempkey)"` (or by following https://www.gitpod.io/docs/environment-variables#using-the-account-settings)
8-
## then follow https://doc.sagemath.org/html/en/developer/trac.html#linking-your-public-key-to-your-trac-account to register the public key with trac.
9-
## Afterwards, create a new gitpod workspace.
10-
git remote remove trac 2> /dev/null || true # might still exists from a previous run/prebuild
11-
if [[ -n "${PRIVATE_SSH_KEY}" ]]; then
12-
# Setup ssh key for authentication with trac
13-
mkdir -p ~/.ssh
14-
echo $PRIVATE_SSH_KEY | sed 's/\(-----\(BEGIN\|END\) OPENSSH PRIVATE KEY-----\)/\n\1\n/g' > ~/.ssh/id_rsa
15-
sed -i '/^$/d' ~/.ssh/id_rsa
16-
chmod 600 ~/.ssh/id_rsa
17-
echo "PubkeyAcceptedKeyTypes +ssh-rsa" > ~/.ssh/config
18-
ssh-keyscan -H trac.sagemath.org >> ~/.ssh/known_hosts
6+
git remote remove trac 2> /dev/null || true # might still exists from a previous run/prebuild
197

20-
# Setup trac repo
21-
git remote add trac [email protected]:sage.git -t master -t develop -t $(git branch --show-current)
22-
git remote set-url --push trac [email protected]:sage.git
23-
git fetch trac
24-
git branch -u trac/$(git branch --show-current)
25-
else
26-
# Fallback to sagemath mirror
27-
git remote add trac https://github.com/sagemath/sagetrac-mirror.git -t master -t develop
28-
git remote set-url --push trac pushing-needs-ssh-key
29-
fi
8+
# Setup trac as remote
9+
git remote add trac https://github.com/sagemath/sagetrac-mirror.git -t master -t develop
10+
git remote set-url --push trac no-pushing--this-is-a-read-only-archive

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ environment.
1515

1616
All code is peer-reviewed, all functions must be documented and
1717
unit-tested on a variety of platforms and systems. Python is used as a
18-
base language, Git is used as the source code revision system, and
19-
Trac is used to track all support/development issues. All of these
20-
tools are very capable and used in many other small and large-scale
21-
projects. From a software engineering standpoint, SageMath is a
22-
wonderful project to be engaged in.
18+
base language, and development takes place on GitHub, with Git as the
19+
source code revision system. All of these tools are very capable and
20+
used in many other small and large-scale projects. From a software
21+
engineering standpoint, SageMath is a wonderful project to be engaged
22+
in.
2323

2424
The mailing lists are extremely supportive and responsive. There are
2525
several hundred people that have contributed code directly to SageMath

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ micro_release:
201201

202202
# Leaves everything that is needed to make the next "make" fast but removes
203203
# all the cheap build artifacts that can be quickly regenerated.
204-
# Trac #30960: We no longer uninstall sagelib.
204+
# Issue #30960: We no longer uninstall sagelib.
205205
fast-rebuild-clean: misc-clean
206206
rm -rf upstream/
207207
rm -rf build/pkgs/sagelib/src/build/temp.*

build/bin/sage-bootstrap-python

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@ SAGE_ORIG_PATH=${NEW_PATH%%':'}
2727
# So it needs to find a python that has the urllib module.
2828
# For example, on Debian buster, the python3-minimal package does NOT provide it.
2929
#
30-
# Also, Trac #20023 removed the vendored argparse library from sage_bootstrap,
30+
# Also, Issue #20023 removed the vendored argparse library from sage_bootstrap,
3131
# so we test that python is new enough (>= 2.7) to run it.
3232
#
3333
# See https://github.com/sagemath/sage/issues/29090
3434

35-
# Trac #29890: Our first choice is "python", not "python3". This is to avoid
35+
# Issue #29890: Our first choice is "python", not "python3". This is to avoid
3636
# a defect of sage_bootstrap on macOS regarding SSL URLs.
3737

38-
# Trac #30177: Also check for hashlib.sha1 to guard against broken python2
38+
# Issue #30177: Also check for hashlib.sha1 to guard against broken python2
3939
# from old homebrew installations. Also check whether the current directory
4040
# is accessible by this python; this is to guard on WSL against Pythons
4141
# installed somewhere else in Windows.
4242

43-
# Trac #29285: Do not accept pythons that manipulate PATH, such as
43+
# Issue #29285: Do not accept pythons that manipulate PATH, such as
4444
# the shims provided by pyenv.
4545

46-
# Trac #30008: Make it work even if the environment tries to sabotage UTF-8
46+
# Issue #30008: Make it work even if the environment tries to sabotage UTF-8
4747
# operation in Python 3.0.x-3.6.x by setting LC_ALL=C or similar.
4848

4949
if [ "$LC_ALL" = "C" -o "$LANG" = "C" -o "$LC_CTYPE" = "C" ]; then
@@ -54,7 +54,7 @@ if [ "$LC_ALL" = "C" -o "$LANG" = "C" -o "$LC_CTYPE" = "C" ]; then
5454
fi
5555

5656
PYTHONS="python python3 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python2.7 python3.6 python2"
57-
# Trac #32405: Prefer a Python that provides ssl with SNI, which allows developers
57+
# Issue #32405: Prefer a Python that provides ssl with SNI, which allows developers
5858
# to download from upstream URLs (configure --enable-download-from-upstream-url),
5959
# in particular from PyPI, which requires SNI.
6060
for PY in $PYTHONS; do

build/bin/sage-build-env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ if [ "x$SAGE_BUILD_ENV_SOURCED" = "x" ]; then
177177
fi
178178
fi
179179

180-
# Trac #31335: Avoid include paths leaking in from homebrew python3's distutils.cfg
180+
# Issue #31335: Avoid include paths leaking in from homebrew python3's distutils.cfg
181181
# by using setuptools' own copy of distutils instead of relying on stdlib distutils
182-
# Trac #32944: Only do this on homebrew.
182+
# Issue #32944: Only do this on homebrew.
183183
if [ -n "$HOMEBREW" ]; then
184184
export SETUPTOOLS_USE_DISTUTILS=local
185185
fi

build/bin/sage-dist-helpers

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ sdh_make_install() {
211211
}
212212

213213
sdh_setup_bdist_wheel() {
214-
# Trac #32046: Most uses of this function can be replaced by sdh_pip_install
214+
# Issue #32046: Most uses of this function can be replaced by sdh_pip_install
215215
mkdir -p dist
216216
rm -f dist/*.whl
217217
BDIST_DIR="$(mktemp -d)"
@@ -364,14 +364,14 @@ sdh_store_and_pip_install_wheel() {
364364
echo "sdh_actually_pip_install_wheel $distname $pip_options -r \"\$SAGE_SPKG_SCRIPTS/\$PKG_BASE/spkg-requirements.txt\"" >> "$script_dir"/spkg-pipinst
365365
else
366366
if [ -n "$SAGE_DESTDIR" ]; then
367-
# Trac #29585: Do the SAGE_DESTDIR staging of the wheel installation
367+
# Issue #29585: Do the SAGE_DESTDIR staging of the wheel installation
368368
# ONLY if SAGE_SUDO is set (in that case, we still do the staging so
369369
# that we do not invoke pip as root).
370370
# --no-warn-script-location: Suppress a warning caused by --root
371371
local sudo=""
372372
local root="--root=$SAGE_DESTDIR --no-warn-script-location"
373373
elif [ -n "$SAGE_SUDO" ]; then
374-
# Trac #32361: For script packages, we do have to invoke pip as root.
374+
# Issue #32361: For script packages, we do have to invoke pip as root.
375375
local sudo="$SAGE_SUDO"
376376
local root=""
377377
else
@@ -387,7 +387,7 @@ sdh_store_and_pip_install_wheel() {
387387
sdh_actually_pip_install_wheel() {
388388
distname=$1
389389
shift
390-
# Trac #32659: pip no longer reinstalls local wheels if the version is the same.
390+
# Issue #32659: pip no longer reinstalls local wheels if the version is the same.
391391
# Because neither (1) applying patches nor (2) local changes (in the case
392392
# of sage-conf, sage-setup, etc.) bump the version number, we need to
393393
# override this behavior. The pip install option --force-reinstall does too

build/bin/sage-pip-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ PIP=pip3
3030
# running pip. This is implemented in the Python script sage-flock
3131
LOCK="$SAGE_VENV/var/lock/$PIP.lock"
3232

33-
# Trac #33155: Pythons installed using the python.org macOS installers
33+
# Issue #33155: Pythons installed using the python.org macOS installers
3434
# for Python < 3.10 identify macOS Big Sur and newer as "10.16", causing
3535
# pip to refuse to install wheels tagged macosx_11_0_x86_64
3636
export SYSTEM_VERSION_COMPAT=0

build/bin/sage-spkg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#*****************************************************************************
6262

6363
# Avoid surprises with character ranges [a-z] in regular expressions
64-
# See Trac #15791; some locales can produce different results for
64+
# See Issue #15791; some locales can produce different results for
6565
# character ranges; using C.UTF-8 to ensure UTF-8 default encoding in Python
6666
# introduces extra complications, see #30053, so we don't do it, but
6767
# assume we are on Python3.x, for x at least 7.
@@ -162,7 +162,7 @@ write_to_tty()
162162
}
163163

164164
# Handle -n, -t, -q options for recursive make
165-
# See Trac #12016.
165+
# See Issue #12016.
166166
if echo "$MAKE $MAKEFLAGS -$MAKEFLAGS" |grep '[ ]-[A-Za-z]*[qnt]' >/dev/null; then
167167
if echo "$MAKE $MAKEFLAGS -$MAKEFLAGS" |grep '[ ]-[A-Za-z]*q' >/dev/null; then
168168
# Pretend the target is *not* up-to-date
@@ -436,7 +436,7 @@ for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS" "$SAGE_BUILD_DIR"; do
436436
fi
437437
done
438438

439-
# Trac #5852: check write permissions
439+
# Issue #5852: check write permissions
440440
if [ ! -w "$SAGE_BUILD_DIR" ]; then
441441
error_msg "Error: no write access to build directory $SAGE_BUILD_DIR"
442442
exit 1

build/make/Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ else
205205
AM_V_at =
206206
endif
207207

208-
# Trac #33125: Handle make options -n, -t, -q
208+
# Issue #33125: Handle make options -n, -t, -q
209209
ifeq ($(strip $(foreach flag,n t q,$(findstring $(flag),$(filter-out --%,$(MAKEFLAGS))))),)
210210
PLUS = +
211211
else
@@ -326,7 +326,7 @@ all-toolchain: base-toolchain
326326
# typical Python packages from source. Wheel packages only need pip.
327327
PYTHON_TOOLCHAIN = setuptools pip setuptools_scm wheel flit_core hatchling
328328

329-
# Trac #32056: Avoid installed setuptools leaking into the build of python3 by uninstalling it.
329+
# Issue #32056: Avoid installed setuptools leaking into the build of python3 by uninstalling it.
330330
# It will have to be reinstalled anyway because of its dependency on $(PYTHON).
331331
python3-SAGE_LOCAL-no-deps: setuptools-clean
332332
python3-SAGE_VENV-no-deps: setuptools-clean
@@ -582,7 +582,7 @@ pkg_deps = \
582582
# For packages listed in $(TOOLCHAIN_DEPS) we also pass --keep-existing to
583583
# sage-spkg, and --keep-files to sage-spkg-uninstall since those packages can
584584
# have a recursive self-dependency, and should not be deleted while upgrading.
585-
# See Trac #25857
585+
# See Issue #25857
586586

587587
# Positional arguments:
588588
# $(1): package name

build/make/install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fi
4343

4444
# Make the special target _clean-broken-gcc before trying to build any other
4545
# packages. This is necessary if configure detected a broken GCC installed
46-
# in Sage; Trac #25011
46+
# in Sage; Issue #25011
4747
$MAKE _clean-broken-gcc
4848

4949
# If "make" doesn't understand the -q option (although we require

0 commit comments

Comments
 (0)