Skip to content

Commit

Permalink
Merge pull request #66 from uc-python/develop
Browse files Browse the repository at this point in the history
Sep 2023 Updates
  • Loading branch information
augustopher authored Sep 4, 2023
2 parents 6b4d533 + a3e4cd3 commit e04ef57
Show file tree
Hide file tree
Showing 27 changed files with 1,228 additions and 1,362 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
shell: bash -l {0}
steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set Up Conda Environment
uses: conda-incubator/setup-miniconda@v2
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,5 @@ venv.bak/

# Custom
slides/

.DS_Store
23 changes: 19 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
slides: slides/.finished
slides/.finished: $(wildcard notebooks/**/*)
bash scripts/generate_slides.sh
touch slides/.finished
IMAGESIN=$(wildcard notebooks/images/*)
IMAGESOUT=$(patsubst notebooks/%,slides/%,$(IMAGESIN))
NBFILES=$(wildcard notebooks/*-*.ipynb)
HTMLFILES=$(patsubst notebooks/%.ipynb,slides/%.slides.html,$(NBFILES))

slides: html

images: slides/images $(IMAGESOUT)

slides/images:
mkdir -p slides/images

$(IMAGESOUT): slides/images/%: notebooks/images/%
cp -a $< $@

html: images $(HTMLFILES)

$(HTMLFILES): slides/%.slides.html: notebooks/%.ipynb
bash scripts/generate_slides.sh $<

clean:
rm -rf slides/
54 changes: 28 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,32 @@ The following are the primary learning objectives of students:

| Day | Topic | Time |
| :--------:| :----------------------------------------------------------------------------- | :-----------: |
| __Day 1__ | Introductions | 9:00 - 9:15 |
| | Python and Jupyter Overview | 9:15 - 9:45 |
| | Fundamentals | 9:45 - 10:30 |
| | Break | 10:30 - 10:45 |
| | Packages, Modules, Methods, Functions | 10:45 - 11:30 |
| | Importing Data | 11:30 - 12:00 |
| | Q\&A | 12:00 - 12:30 |
| __Day 2__ | Q\&A | 8:30 - 9:00 |
| | Selecting and Filtering Data | 9:00 - 10:00 |
| | Working with Columns | 10:00 - 10:45 |
| | Break | 10:45 - 11:00 |
| | Case Study, pt. 1 | 11:00 - 12:00 |
| | Q\&A | 12:00 - 12:30 |
| __Day 3__ | Q\&A | 8:30 - 9:00 |
| | Review | 9:00 - 9:30 |
| | Summarizing Data | 9:30 - 10:30 |
| | Break | 10:30 - 10:45 |
| | Summarizing Grouped Data | 10:45 - 11:15 |
| | Joining Data | 11:15 - 12:00 |
| | Q\&A | 12:00 - 12:30 |
| __Day 4__ | Q\&A | 8:30 - 9:00 |
| | Exporting Data | 9:00 - 9:30 |
| | Visualizing Data | 9:30 - 10:30 |
| | Break | 10:30 - 10:45 |
| | Case Study, pt. 2 | 10:45 - 11:30 |
| | Q\&A | 11:30 - 12:00 |
| __Day 1__ | Introductions | 12:30 - 12:45 |
| | Python and Jupyter Overview | 12:45 - 1:15 |
| | Fundamentals | 1:15 - 2:00 |
| | Break | 2:00 - 2:15 |
| | Packages, Modules, Methods, Functions | 2:15 - 3:00 |
| | Importing Data | 3:00 - 3:45 |
| | Q\&A | 3:45 - 4:15 |
| __Day 2__ | Q\&A | 12:45 - 1:15 |
| | Selecting and Filtering Data | 1:15 - 2:00 |
| | Working with Columns | 2:00 - 2:45 |
| | Break | 2:45 - 3:00 |
| | Case Study, pt. 1 | 3:00 - 3:45 |
| | Q\&A | 3:45 - 4:15 |
| __Day 3__ | Q\&A | 12:45 - 1:15 |
| | Review | 1:15 - 1:30 |
| | Summarizing Data | 1:30 - 2:15 |
| | Break | 2:15 - 2:30 |
| | Summarizing Grouped Data | 2:30 - 3:00 |
| | Joining Data | 3:00 - 3:45 |
| | Q\&A | 3:45 - 4:15 |
| __Day 4__ | Q\&A | 12:45 - 1:15 |
| | Exporting Data | 1:15 - 1:45 |
| | Visualizing Data | 1:45 - 2:45 |
| | Break | 2:45 - 3:00 |
| | Case Study, pt. 2 | 3:00 - 3:45 |
| | Q\&A | 3:45 - 4:15 |

### Course Preparation

Expand Down Expand Up @@ -80,3 +80,5 @@ If you have any specific questions prior to the class you can reach out to us di

* Ethan Swan: [GitHub](https://www.github.com/eswan18) & [Email](mailto:[email protected])
* Bradley Boehmke: [GitHub](https://www.github.com/bradleyboehmke) & [Email](mailto:[email protected])
* Gus Powers: [GitHub](https://www.github.com/augustopher) & [Email](mailto:[email protected])
* Jay Cunningham: [GitHub](https://github.com/cunningjames) & [Email](mailto:[email protected])
14 changes: 7 additions & 7 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ channels:
- defaults
- conda-forge
dependencies:
- python>=3.9
- pip>=20.3
- python=3.11
- pip>=22.1
- nbconvert>=6.1
- numpy=1.19
- pandas=1.2
- seaborn=0.11
- numpy=1.25
- pandas=2.0
- seaborn=0.12
- ipykernel>=6.4
- jinja2=2.11
- jedi=0.17.2
- jinja2>=2.11
- jedi>=0.17
Loading

0 comments on commit e04ef57

Please sign in to comment.