Skip to content

Commit

Permalink
updates to python/pdf process and problem solving section
Browse files Browse the repository at this point in the history
  • Loading branch information
cara.lee authored and cara.lee committed Jul 8, 2024
1 parent 508a6ce commit 3898c9c
Show file tree
Hide file tree
Showing 4,224 changed files with 894,257 additions and 2,451 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"ghcr.io/devcontainers/features/github-cli:1": {}
},

// Respect the project's designated dependencies
"postCreateCommand": "pip install -r requirements.txt",

// Port forwarding
// ---------------
// This is needed by the CodeChat Server.
Expand Down
74 changes: 74 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# <!-- Managed automatically by PreTeXt authoring tools -->
# (delete the above line to manage this file manually)

name: Deploy to GitHub pages
on:
# Uncomment to automatically deploy when a commit is pushed to
# the main (or otherwise configured) branch (and remove auto
# management line at top of this file)
# push:
# branches: ["main"]
# The below allows for manually deploying by running the action
# via GitHub.com
workflow_dispatch:

jobs:
# This job builds the book. You can download the resulting build "artifact" by
# navigating to your actions manager in Github, selecting this run, and clicking
# "download artifact" on the "website" artifact.
build:
runs-on: ubuntu-latest

steps:
- name: Checkout source
uses: actions/checkout@v4

- name: Build web with PreTeXt
uses: siefkenj/pretext-build-action@main
with:
pretext-command: build web
project-root: "."
output-dir: "."

- name: Stage with PreTeXt
uses: siefkenj/pretext-build-action@main
with:
pretext-command: deploy --stage-only
project-root: "."
output-dir: "."

- name: Bundle output/stage as artifact
uses: actions/upload-artifact@v4
with:
name: website
path: output/stage

# This job deploys the artifact built in the previous job to Github pages.
deploy:
runs-on: ubuntu-latest
needs: build
permissions:
contents: read
pages: write
id-token: write
concurrency:
group: "page"
cancel-in-progress: false
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- name: Download website artifact
uses: actions/download-artifact@v4
with:
name: website
path: website
- name: Setup Pages
uses: actions/configure-pages@v4
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: "./website"
- name: Deploy to Github Pages
id: deployment
uses: actions/deploy-pages@v4
35 changes: 35 additions & 0 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# <!-- Managed automatically by PreTeXt authoring tools -->
# (delete the above line to manage this file manually)

name: Test Build
on:
# Runs on pull requests, when a pull request is merged into main,
# and when a commit is otherwise pushed to main.
push:
branches: ["main"]
pull_request:
branches: ["*"]

jobs:
# This job builds the book. You can download the resulting build "artifact" by
# navigating to your actions manager in Github, selecting this run, and clicking
# "download artifact" on the "website" artifact.
build:
runs-on: ubuntu-latest

steps:
- name: Checkout source
uses: actions/checkout@v4

- name: Build web target with PreTeXt
uses: siefkenj/pretext-build-action@main
with:
pretext-command: build web
project-root: "."
output-dir: "."

- name: Bundle output/web as artifact
uses: actions/upload-artifact@v4
with:
name: website
path: output/web
8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# <!-- Managed automatically by PreTeXt authoring tools -->
# (delete the above line to manage this file manually)

# Boilerplate list of files in a PreTeXt project for git to ignore
# ensure this file is tracked
!.gitignore
Expand Down Expand Up @@ -94,8 +97,3 @@ GitHub.sublime-settings

# Don't track codechat config (will be generated automatically)
codechat_config.yaml

# Don't track jingreport.txt
jingreport.txt

generated/.html_assets.pkl
101 changes: 101 additions & 0 deletions .gitignore.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# 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
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*

# 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

# Don't track codechat config (will be generated automatically)
codechat_config.yaml

# Don't track jingreport.txt
jingreport.txt

generated/.html_assets.pkl
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions generated/.html_assets.pkl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
�}�.
Binary file modified generated/.pdf_assets.pkl
Binary file not shown.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# <!-- Managed automatically by PreTeXt authoring tools -->
pretext == 2.3.7
pretext == 2.4.1
4 changes: 2 additions & 2 deletions src/backmatter.ptx
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@
</biblio>
</references>

<!-- <solutions divisional="solution" admit="odd">
<solutions divisional="solution" admit="odd">
<title>Odd Answers</title>
</solutions>

<solutions divisional="solution" admit="all">
<!-- <solutions divisional="solution" admit="all">
<title>All Answers for Instructors Only</title>
</solutions> -->

Expand Down
4 changes: 1 addition & 3 deletions src/chap_one_logic_everyday_life.ptx
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@
<introduction>
<title>Chapter 1 Introduction</title>
<p>
In this chapter we'll learn several different tools. We'll look at logic, sets, Venn
diagrams, percentages, rates and proportions. Then we'll work with a problem solving process
that can be applied to many types of problems.
In this chapter we'll learn several different tools for decision making. We'll look at logic, sets, Venn diagrams, percentages, rates and proportions. Then we'll work with a problem solving process that can be applied to many types of situations.
</p>
<figure>
<caption>Alternative Video Lesson</caption>
Expand Down
Loading

0 comments on commit 3898c9c

Please sign in to comment.