add new devcontainer and install scripts

Author: oscarlevin

pretext/constants.py

@@ -226,22 +226,27 @@
     "project.ptx": Path("project.ptx"),
     "codechat_config.yaml": Path("codechat_config.yaml"),
     ".gitignore": Path(".gitignore"),
-    ".devcontainer.json": Path(".devcontainer.json"),
+    "devcontainer.json": Path(".devcontainer/devcontainer.json"),
     "requirements.txt": Path("requirements.txt"),
     "pretext-cli.yml": Path(".github", "workflows", "pretext-cli.yml"),
-    "add-sage.sh": Path(".github", "scirpts", "add-sage.sh"),
-    "add-latex.sh": Path(".github", "scirpts", "add-latex.sh"),
+    "installPretext.sh": Path(".devcontainer", "instalPretext.sh"),
+    "installPandoc.sh": Path(".devcontainer", "instalPandoc.sh"),
+    "installLatex.sh": Path(".devcontainer", "instalLatex.sh"),
+    "installSage.sh": Path(".devcontainer", "installSage.sh"),
 }
 
 DEPRECATED_PROJECT_RESOURCES = {
     "deploy.yml": Path(".github", "workflows", "deploy.yml"),
     "test-build.yml": Path(".github", "workflows", "test-build.yml"),
+    ".devcontainer.json": Path(".devcontainer.json"),
 }
 
 GIT_RESOURCES = [
     ".gitignore",
     "pretext-cli.yml",
-    ".devcontainer.json",
-    "add-sage.sh",
-    "add-latex.sh",
+    "devcontainer.json",
+    "installPretext.sh",
+    "installPandoc.sh",
+    "installLatex.sh",
+    "installSage.sh",
 ]

pretext/resources/resource_hash_table.json

@@ -80,9 +80,11 @@
     "project.ptx": "d00aa86d7b2d0d06d5ce0b70ef784ad23c05a2618b888cd797552c477d4bd8c1",
     "codechat_config.yaml": "3bf28a68f3349b02f6a8141f07fcfd789073f5bc5da76672e2d86cd7759cdb6d",
     ".gitignore": "4a7a09d3441f01b6a9bf658e68d1deff640b6b2cf463af3f5e77c2507600b602",
-    ".devcontainer.json": "a2f8449a67baaa23d4b1db811db100033e96a6f509c8494077a21c8dcc35d046",
+    "devcontainer.json": "4a53842fe887d0698858abc8300f87adf1bcae225322fa7d17510efc011d75f0",
     "pretext-cli.yml": "0ea2df984dcfb76ecfaa9bfde26a0da22c006fca1fafd156ca6c57c75679b907",
-    "add-sage.sh": "910b916e5b31eaf9e805ba83a8dab8ad0eff8f479d54818309beb6b7db2c7932",
-    "add-latex.sh": "17ee4e4c2961cca3f5149632442d57d79c290b6330b967c335c3a8ac7d9141b8"
+    "installPretext.sh": "1326840f5ac6438c9327f6f4dbcaf3c28e2862efc5fdf4034e3187653136ad31",
+    "installPandoc.sh": "f91ead2ad66fd1caf90144b5b52d8473c7ebac1f02c03945a25484719e4d73d2",
+    "installLatex.sh": "1326840f5ac6438c9327f6f4dbcaf3c28e2862efc5fdf4034e3187653136ad31",
+    "installSage.sh": "d42af741c9b0fec43ec2ff3aa90e04f17adbd584e429c74ed988d61597e8d2ad"
   }
 }

templates/add-latex.sh

@@ -13,34 +13,17 @@
 //
 ///////////////////////////////////////////////////////////////
 {
-  "name": "PreTeXt-Codespaces",
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {},
 
-  // The default docker image has just pretext and prefigure installed.  No LaTeX and no SageMath.  Those can be installed using scripts or by switching to one of the larger images below.:
-   "image": "oscarlevin/pretext:lite",
-
-  // This Docker image includes some LaTeX support, but is still not to large.  Note that if you keep your codespace running, it will use up your GitHub free storage quota.  
-  // "image": "oscarlevin/pretext:small",
-
-   // If you need to generate sageplots, comment out the above line and uncomment the following line.
-  //"image": "oscarlevin/pretext:full",
-
-
-  // Add gh cli as a feature (to support codechat)
-  "features": {
-    "ghcr.io/devcontainers/features/github-cli:1": {}
-  },
-
-  // Respect the project's designated dependencies
-  "postCreateCommand": "git config --global --add safe.directory $(pwd) && pip install -r requirements.txt",
-
-  // If you need LaTeX support (to build pdfs or to generate latex-images), you can uncomment the next line (and comment out the "postCreateCommand" above.)
-  // "postCreateCommand": "git config --global --add safe.directory $(pwd) && bash ./.github/scripts/add-latex.sh",
-
-  // If you need sageplot support, instead of installing the pretext:full image above, you can uncomment the line below and comment out the line above.
-  // "postCreateCommand": "git config --global --add safe.directory $(pwd) && bash ./.github/scripts/add-sage.sh",
-
-  // For both LaTeX and sageplot support, use this "postCreateCommand":
-  // "postCreateCommand": "git config --global --add safe.directory $(pwd) && bash ./.github/scripts/add-latex.sh && bash ./.github/scripts/add-sage.sh",
+  // Comment or uncomment lines below if you don't or do need that feature.
+  "postCreateCommand": {
+    "install pretext": "bash ./.devcontainer/installPretext.sh",
+    "install pandoc": "bash ./.devcontainer/installPandoc.sh",
+    "install latex": "bash ./.devcontainer/installLatex.sh",
+    // "install sagemath": "bash ./.devcontainer/installSage.sh",
+    "working": "echo 'installing additional software into codespace.'"
+    },
 
 
   // Port forwarding
@@ -74,6 +57,7 @@
     }
   },
 
+  
   // Configure tool-specific properties.
   "customizations": {
     "codespaces": {
@@ -89,13 +73,9 @@
         "CodeChat.CodeChatServer.Command": "CodeChat_Server"
       },
       "extensions": [
-        "ms-vscode.live-server",
         "oscarlevin.pretext-tools",
         "CodeChat.codechat"
       ]
     }
   }
-
-  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-  // "remoteUser": "root"
 }

templates/add-sage.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# This file was automatically generated with PreTeXt 2.15.2.
+# If you modify this file, PreTeXt will no longer automatically update it.
+
+while fuser /var/lib/dpkg/lock >/dev/null 2>&1; do
+    echo "Waiting for apt-get to be free..."
+    sleep 15
+done
+sudo apt-get update 
+sudo apt-get install -y --no-install-recommends \
+                    python3-louis \
+                    libcairo2-dev \
+                    librsvg2-bin
+
+pip install --upgrade pip --break-system-packages
+
+pip install pretext[homepage,prefigure] --only-binary {greenlet}  --break-system-packages
+
+pip install codechat-server --break-system-packages
+
+while fuser /var/lib/dpkg/lock >/dev/null 2>&1; do
+    echo "Waiting for apt-get to be free..."
+    sleep 15
+done
+playwright install-deps
+
+playwright install
+
+# Install mermaid for diagrams
+npm install -g @mermaid-js/mermaid-cli
+
+# echo '/usr/lib/python3/dist-packages' > /usr/local/lib/python3.8/dist-packages/louis.pth
+
+prefig init

templates/.devcontainer.json templates/devcontainer.jsontemplates/.devcontainer.json renamed to templates/devcontainer.json

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# This file was automatically generated with PreTeXt 2.15.2.
+# If you modify this file, PreTeXt will no longer automatically update it.
+
+wget https://github.com/jgm/pandoc/releases/download/3.6.4/pandoc-3.6.4-1-amd64.deb -O pandoc.deb
+
+# wait for 30 second and then double check that no other script is using apt-get:
+sleep 60
+while fuser /var/lib/dpkg/lock >/dev/null 2>&1; do
+    echo "Waiting for apt-get to be free..."
+    sleep 15
+done
+# Install pandoc
+sudo apt-get install -y --no-install-recommends ./pandoc.deb 
+
+rm pandoc.deb

templates/installLatex.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# This file was automatically generated with PreTeXt 2.15.2.
+# If you modify this file, PreTeXt will no longer automatically update it.
+
+while fuser /var/lib/dpkg/lock >/dev/null 2>&1; do
+    echo "Waiting for apt-get to be free..."
+    sleep 15
+done
+sudo apt-get update 
+sudo apt-get install -y --no-install-recommends \
+                    python3-louis \
+                    libcairo2-dev \
+                    librsvg2-bin
+
+pip install --upgrade pip --break-system-packages
+
+pip install pretext[homepage,prefigure] --only-binary {greenlet}  --break-system-packages
+
+pip install codechat-server --break-system-packages
+
+while fuser /var/lib/dpkg/lock >/dev/null 2>&1; do
+    echo "Waiting for apt-get to be free..."
+    sleep 15
+done
+playwright install-deps
+
+playwright install
+
+# Install mermaid for diagrams
+npm install -g @mermaid-js/mermaid-cli
+
+# echo '/usr/lib/python3/dist-packages' > /usr/local/lib/python3.8/dist-packages/louis.pth
+
+prefig init

templates/installPandoc.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# This file was automatically generated with PreTeXt 2.15.2.
+# If you modify this file, PreTeXt will no longer automatically update it.
+
+# Conda should already be installed in the codespace.  We need to add the conda-forge channel
+
+conda config --add channels conda-forge
+conda config --set channel_priority strict
+
+# We don't want conda to open the base environment always:
+conda config --set auto_activate_base false
+
+# Now create a conda environment for sage (called sage):
+conda create --yes -n sage sage python=3.12
+
+conda init
+
+echo 'conda activate sage' >> ~/.bashrc
+
+source ~/.bashrc