From 0e345a2b6596828c7be2acf18e056e79e739b621 Mon Sep 17 00:00:00 2001 From: Jan Pearce Date: Fri, 5 Jan 2024 10:14:02 -0500 Subject: [PATCH 1/3] Update .gitignore to include many more file types --- .gitignore | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 125 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d00113f..b3bfa9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,131 @@ -# Ignore the following: +# Boilerplate list of files in a PreTeXt project for git to ignore +# ensure this file is tracked +!.gitignore + +# don't track unpublished builds or stage +output + +# don't track assets generated from source +generated-assets + +# don't track the executables.ptx file +executables.ptx + +# don't track node packages +node_modules + +# don't track error logs +.error_schema.log +cli.log +**/cli.log +logs + +# don't track OS related files (windows/macos/linux) +.DS_Store +.DS_Store? +._* +.AppleDouble +.LSOverride +.Spotlight-V100 +.Trashes +Icon +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db +*.stackdump +*.lnk +*.cab +*.msi +*.msix +*.msm +*.msp +[Dd]esktop.ini +.directory +.fuse_hidden* +.Trash-* +.nfs* +.idea/* + +# Don't include VSCode generated files +.vscode +*.code-workspace + +# Don't inlucde SublimeText files +# Cache files for Sublime Text +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache + +# Workspace files are user-specific +*.sublime-workspace + +# Project files should be checked into the repository, unless a significant +# proportion of contributors will probably not be using Sublime Text +*.sublime-project + +# SFTP configuration file +sftp-config.json +sftp-config-alt*.json + +# Package control specific files +Package Control.last-run +Package Control.ca-list +Package Control.ca-bundle +Package Control.system-ca-bundle +Package Control.cache/ +Package Control.ca-certs/ +Package Control.merged-ca-bundle +Package Control.user-ca-bundle +oscrypto-ca-bundle.crt +bh_unicode_properties.cache + +# Sublime-github package stores a github token in this file +# https://packagecontrol.io/packages/sublime-github +GitHub.sublime-settings + + +# Don't include Dropbox settings and caches +.dropbox +.dropbox.attr +.dropbox.cache + +# Additionals based upon Pretextbook .gitignore +user/* + +script/mjsre/node_modules/ +script/mjsre/package-lock.json +pretext/__pycache__/** + +# any file ending in ~ (backups, usually) +*~ + build_info -*.pyc -__pycache__/ +**/_build +**/rsbuild +**/build build/* published -.idea/* -source/doctrees/* -*~ + +# Codespaces set-up +.devcontainer.json + +# ignore temp files +temp-* + +# Ignore the following (from runestone .gitignore): + +*.pyc +__pycache__/ + sphinx-enki-info.txt sphinx_settings.json pavement.py + +# Don't track codechat config (will be generated automatically) +codechat_config.yaml From 124c3ecd63b5db6b3cd835a9ba99cac6f26971ab Mon Sep 17 00:00:00 2001 From: Jan Pearce Date: Fri, 5 Jan 2024 10:16:20 -0500 Subject: [PATCH 2/3] Delete pavement.py this file is in .gitignore and should not be committed. --- pavement.py | 106 ---------------------------------------------------- 1 file changed, 106 deletions(-) delete mode 100755 pavement.py diff --git a/pavement.py b/pavement.py deleted file mode 100755 index 846f4f6..0000000 --- a/pavement.py +++ /dev/null @@ -1,106 +0,0 @@ -import paver -from paver.easy import * -import paver.setuputils - -paver.setuputils.install_distutils_tasks() -from os import environ, getcwd -import os.path -import sys -from socket import gethostname -import pkg_resources -from runestone import get_master_url - -sys.path.append(getcwd()) -sys.path.append("../modules") - -updateProgressTables = True -try: - from runestone.server.chapternames import populateChapterInfob -except ImportError: - updateProgressTables = False - - -######## CHANGE THIS ########## -project_name = "cpp4python" -############################### - -master_url = None -doctrees = "./build/{}/doctrees".format(project_name) -dynamic_pages = True - -if master_url is None: - master_url = get_master_url() - -master_app = "runestone" -serving_dir = "./build/" + project_name -dest = "./published" - -options( - sphinx=Bunch( - docroot=".", - ), - build=Bunch( - builddir="./build/" + project_name, - sourcedir="./_sources/", - outdir="./build/" + project_name, - confdir=".", - project_name=project_name, - doctrees=doctrees, - template_args={ - "course_id": project_name, - "course_title": "C++\\ for\\ Python\\ Programmers", - "login_required": "false", - "appname": master_app, - "loglevel": 10, - "course_url": master_url, - "use_services": "true", - "python3": "true", - "dynamic_pages": dynamic_pages, - "dburl": "postgresql://bmiller@localhost/runestone", - "basecourse": "thinkcspy", - "downloads_enabled": "false", - "default_ac_lang": "python", - "enable_chatcodes": "false", - "allow_pairs": "false", - }, - ), -) - -if project_name == "": - print("Please edit pavement.py and give your project a name") - exit() - -version = pkg_resources.require("runestone")[0].version -options.build.template_args["runestone_version"] = version - -if ( - "DBHOST" in environ - and "DBPASS" in environ - and "DBUSER" in environ - and "DBNAME" in environ -): - options.build.template_args[ - "dburl" - ] = "postgresql://{DBUSER}:{DBPASS}@{DBHOST}/{DBNAME}".format(**environ) - -from runestone import build - -# build is called implicitly by the paver driver. - -template_args = { - "course_id": project_name, - "course_title": "C++\\ for\\ Python\\ Programmers", - "login_required": "false", - "appname": master_app, - "loglevel": 10, - "course_url": master_url, - "use_services": "true", - "python3": "true", - "dynamic_pages": dynamic_pages, - "dburl": "postgresql://bmiller@localhost/runestone", - "basecourse": "thinkcspy", - "downloads_enabled": "false", - "default_ac_lang": "python", - "enable_chatcodes": "false", - "allow_pairs": "false", -} \ No newline at end of file From c257d5d32adc538cc3e267337e3b9b6af83e2cce Mon Sep 17 00:00:00 2001 From: Bradley Miller Date: Fri, 17 May 2024 14:37:28 -0500 Subject: [PATCH 3/3] fix: fix project.ptx --- project.ptx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project.ptx b/project.ptx index d96d920..33abb24 100644 --- a/project.ptx +++ b/project.ptx @@ -21,7 +21,7 @@ epub pretext/cpp4python.ptx - pretext/publication-pub.xml + pretext/publication-rs-for-all.xml published/epub @@ -39,7 +39,7 @@ html source/cpp4python.ptx - publication/publication.ptx + pretext/publication-rs-for-all.xml output/subset