diff --git a/pretext/constants.py b/pretext/constants.py index 461b12e7..7de74be5 100644 --- a/pretext/constants.py +++ b/pretext/constants.py @@ -261,7 +261,6 @@ "pretext-cli.yml": Path(".github", "workflows", "pretext-cli.yml"), "pretext-deploy.yml": Path(".github", "workflows", "pretext-deploy.yml"), "installPandoc.sh": Path(".devcontainer", "installPandoc.sh"), - "installSage.sh": Path(".devcontainer", "installSage.sh"), } DEPRECATED_PROJECT_RESOURCES = { @@ -270,6 +269,7 @@ ".devcontainer.json": Path(".devcontainer.json"), "installPretext": Path(".devcontainer", "installPretext"), "installLatex": Path(".devcontainer", "installLatex"), + "installSage.sh": Path(".devcontainer", "installSage.sh"), } GIT_RESOURCES = [ @@ -278,5 +278,4 @@ "pretext-deploy.yml", "devcontainer.json", "installPandoc.sh", - "installSage.sh", ] diff --git a/templates/devcontainer.json b/templates/devcontainer.json index f55a55aa..b6cac9dd 100644 --- a/templates/devcontainer.json +++ b/templates/devcontainer.json @@ -67,8 +67,9 @@ "editor.quickSuggestions": { "other": "off" }, - "files.autoSave": "afterDelay", + "editor.suggest.showProperties": false, "editor.snippetSuggestions": "bottom", + "files.autoSave": "afterDelay", "xml.validation.enabled": true, "redhat.telemetry.enabled": false, "CodeChat.CodeChatServer.Command": "CodeChat_Server" diff --git a/templates/installPandoc.sh b/templates/installPandoc.sh index d283b1a3..dd5c18ea 100644 --- a/templates/installPandoc.sh +++ b/templates/installPandoc.sh @@ -3,7 +3,7 @@ # This file was automatically generated with PreTeXt {VERSION}. # 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 +wget https://github.com/jgm/pandoc/releases/download/3.8.3/pandoc-3.8.3-1-amd64.deb -O pandoc.deb # wait for 60 second and then double check that no other script is using apt-get: sleep 60 @@ -12,6 +12,6 @@ while fuser /var/lib/dpkg/lock >/dev/null 2>&1; do sleep 15 done # Install pandoc -sudo apt-get install -y --no-install-recommends ./pandoc.deb +apt-get install -y --no-install-recommends ./pandoc.deb rm pandoc.deb diff --git a/templates/installSage.sh b/templates/installSage.sh deleted file mode 100644 index c66c497a..00000000 --- a/templates/installSage.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# This file was automatically generated with PreTeXt {VERSION}. -# 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