Merge branch 'develop' into develop

.devcontainer/devcontainer.json

@@ -0,0 +1,35 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/debian
+{
+	"name": "Conda",
+	"image": "mcr.microsoft.com/vscode/devcontainers/base:0-bullseye",
+
+	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode",
+
+	// Setup conda environment
+	"onCreateCommand": ".devcontainer/onCreate-conda.sh",
+
+	// Install additional features.
+	"features": {
+		// For config options, see https://github.com/devcontainers/features/tree/main/src/conda
+		"ghcr.io/devcontainers/features/conda": {
+            "version": "latest",
+			"addCondaForge": "true"
+        }
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"guyskk.language-cython",
+				"ms-python.isort",
+				"ms-toolsai.jupyter",
+				"ms-python.vscode-pylance",
+				"ms-python.pylint",
+				"ms-python.python",
+				"lextudio.restructuredtext",
+				"trond-snekvik.simple-rst"
+			]
+		}
+	}
+}

.devcontainer/onCreate-conda.sh

@@ -0,0 +1,14 @@
+# Do not keep running on errors
+set -e
+
+# Create conda environment
+./bootstrap-conda
+conda install mamba -n base -c conda-forge -y
+mamba env create --file src/environment-dev.yml || mamba env update --file src/environment-dev.yml
+conda init bash
+
+# Build sage
+conda run -n sage-dev ./bootstrap
+conda run -n sage-dev ./configure --with-python=/opt/conda/envs/sage-dev/bin/python --prefix=/opt/conda/envs/sage-dev
+conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup 
+conda run -n sage-dev pip install --no-build-isolation -v -v -e ./src

.devcontainer/portability-updateContent.sh

@@ -5,14 +5,14 @@
 # The script assumes that it is run from SAGE_ROOT.
 #
 # If "config.log" or "logs" are symlinks (for example, created by 'tox -e local-...',
-# or after https://trac.sagemath.org/ticket/33262), they might point outside of
+# or after https://github.com/sagemath/sage/issues/33262), they might point outside of
 # the dev container, so remove them. Likewise for upstream.
 for f in config.log logs upstream; do
     if [ -L $f ]; then
         rm -f $f
     fi
 done
-# If possible (ensured after https://trac.sagemath.org/ticket/33262), keep the
+# If possible (ensured after https://github.com/sagemath/sage/issues/33262), keep the
 # logs in the container.
 if [ ! -d logs ]; then
     ln -s /sage/logs logs