Merge branch 'develop' into nb_7_packages_m4

Author: dimpase

.ci/create-changes-html.sh

@@ -62,21 +62,27 @@ for block in diff_blocks:
     match = re.search(r'^diff --git a/(.*) b/\1', block, flags=re.MULTILINE)
     if match:
         doc = match.group(1)
-        path = 'html/' + doc
         file_path = os.path.join('$DOC_REPOSITORY', doc)
-        with open(file_path, 'r') as file:
-            content = file.readlines()
+        try:
+            with open(file_path, 'r') as file:
+                content = file.readlines()
+        except FileNotFoundError:
+            content = []
         count = 0
         for line in block.splitlines():
             if line.startswith('@@ -'):
-                line_number = int(re.search(r'@@ -(\d+)', line).group(1))
-                for i in range(line_number, -1, -1):
-                    if content[i].startswith('<'):
-                        count += 1
-                        content[i] = f'<span id="hunk{count}" style="visibility: hidden;"></span>' + content[i]
-                        break
-        with open(file_path, 'w') as file:
-            file.writelines(content)
+                search_result = re.search(r'@@ -(\d+),(\d+) \+(\d+),(\d+)', line)
+                if search_result:
+                    line_number = int(search_result.group(3))
+                    for i in range(line_number - 1, -1, -1):
+                        if content[i].startswith('<'):
+                            count += 1
+                            content[i] = f'<span id="hunk{count}" style="visibility: hidden;"></span>' + content[i]
+                            break
+        if content:
+            with open(file_path, 'w') as file:
+                file.writelines(content)
+        path = 'html/' + doc
         hunks = '&nbsp;'.join(f'<a href="{path}#hunk{i+1}" class="hunk" target="_blank">#{i + 1}</a>' for i in range(count))
         out_blocks.append(f'<p class="diff"><a href="{path}">{doc}</a>&nbsp;' + hunks + '&emsp;</p>'
                             + '\n<pre><code class="language-diff">'

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
 	"remoteUser": "vscode",
 
 	// Setup conda environment
-	"onCreateCommand": ".devcontainer/onCreate-conda.sh",
+	"onCreateCommand": ".devcontainer/onCreate-conda.sh || true",
 
 	// Install additional features.
 	"features": {

.devcontainer/downstream-archlinux-latest/devcontainer.json

@@ -3,7 +3,7 @@
     "name": "archlinux:latest downstream Sage",
     "image": "archlinux:latest",
     // Create an empty bashrc to avoid the error "No such file or directory" when opening a terminal.
-    "onCreateCommand": "EXTRA_SYSTEM_PACKAGES='sagemath sagemath-doc' EXTRA_SAGE_PACKAGES='notebook pip' .devcontainer/onCreate.sh && touch ~/.bashrc",
+    "onCreateCommand": "sed -i '/^NoExtract/d' /etc/pacman.conf; EXTRA_SYSTEM_PACKAGES='sagemath sagemath-doc' EXTRA_SAGE_PACKAGES='notebook pip' .devcontainer/onCreate.sh && touch ~/.bashrc",
     // There's no SAGE_LOCAL, so remove the symlink 'prefix'.
     "updateContentCommand": "rm -f prefix && ln -sf /usr venv",
     "extensions": [

.devcontainer/onCreate-conda.sh

@@ -2,9 +2,8 @@
 set -e
 
 # Create conda environment
-./bootstrap-conda
 conda install mamba -n base -c conda-forge -y
-mamba env create --file src/environment-dev-3.11.yml || mamba env update --file src/environment-dev-3.11.yml
+mamba env create --file src/environment-dev-3.11-linux.yml || mamba env update --file src/environment-dev-3.11-linux.yml
 conda init bash
 
 # Build sage

.devcontainer/portability-almalinux-8-python3.9-minimal/devcontainer.json

@@ -0,0 +1,25 @@
+// The command "tox -e update_docker_platforms"
+//   creates .devcontainer/portability-*-*/devcontainer.json
+//      from .devcontainer/portability-devcontainer.json.in
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "almalinux-8-python3.9-minimal (≥ 8-core)",
+    "build": {
+        "dockerfile": "portability-Dockerfile",
+        // See tox.ini for definitions
+        "args": {
+            "SYSTEM_FACTOR": "almalinux-8-python3.9",
+            "PACKAGE_FACTOR": "minimal",
+            "DOCKER_TARGET": "with-targets",
+            "DOCKER_TAG": "dev"
+        }
+    },
+    "containerEnv": {
+        "MAKE": "make -j4"
+    },
+    "onCreateCommand": ".devcontainer/onCreate.sh",
+    "updateContentCommand": ".devcontainer/portability-updateContent.sh",
+    "extensions": [
+        "ms-python.python"
+    ]
+}

.devcontainer/portability-almalinux-8-python3.9-minimal/portability-Dockerfile

@@ -0,0 +1 @@
+../portability-Dockerfile

.devcontainer/portability-almalinux-8-python3.9-standard/devcontainer.json

@@ -0,0 +1,25 @@
+// The command "tox -e update_docker_platforms"
+//   creates .devcontainer/portability-*-*/devcontainer.json
+//      from .devcontainer/portability-devcontainer.json.in
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "almalinux-8-python3.9-standard (≥ 8-core)",
+    "build": {
+        "dockerfile": "portability-Dockerfile",
+        // See tox.ini for definitions
+        "args": {
+            "SYSTEM_FACTOR": "almalinux-8-python3.9",
+            "PACKAGE_FACTOR": "standard",
+            "DOCKER_TARGET": "with-targets",
+            "DOCKER_TAG": "dev"
+        }
+    },
+    "containerEnv": {
+        "MAKE": "make -j4"
+    },
+    "onCreateCommand": ".devcontainer/onCreate.sh",
+    "updateContentCommand": ".devcontainer/portability-updateContent.sh",
+    "extensions": [
+        "ms-python.python"
+    ]
+}

.devcontainer/portability-almalinux-8-python3.9-standard/portability-Dockerfile

@@ -0,0 +1 @@
+../portability-Dockerfile

.devcontainer/portability-almalinux-9-python3.11-minimal/devcontainer.json

@@ -0,0 +1,25 @@
+// The command "tox -e update_docker_platforms"
+//   creates .devcontainer/portability-*-*/devcontainer.json
+//      from .devcontainer/portability-devcontainer.json.in
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "almalinux-9-python3.11-minimal (≥ 8-core)",
+    "build": {
+        "dockerfile": "portability-Dockerfile",
+        // See tox.ini for definitions
+        "args": {
+            "SYSTEM_FACTOR": "almalinux-9-python3.11",
+            "PACKAGE_FACTOR": "minimal",
+            "DOCKER_TARGET": "with-targets",
+            "DOCKER_TAG": "dev"
+        }
+    },
+    "containerEnv": {
+        "MAKE": "make -j4"
+    },
+    "onCreateCommand": ".devcontainer/onCreate.sh",
+    "updateContentCommand": ".devcontainer/portability-updateContent.sh",
+    "extensions": [
+        "ms-python.python"
+    ]
+}

.devcontainer/portability-almalinux-9-python3.11-minimal/portability-Dockerfile

@@ -0,0 +1 @@
+../portability-Dockerfile