Skip to content

Commit 21a6ed7

Browse files
Merge pull request #33 from UBC-DSCI/dev
Update main
2 parents 29a8f49 + 9d1bb84 commit 21a6ed7

File tree

96 files changed

+87560
-13233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+87560
-13233
lines changed

.github/workflows/build_book.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
on:
22
push:
33
branches:
4-
- myst
4+
- main
55
paths:
66
- source/**
7-
pull_request: null
8-
7+
98
jobs:
109
deploy-book:
1110
runs-on: ${{ matrix.os }}
@@ -27,7 +26,7 @@ jobs:
2726
- name: checkout
2827
uses: actions/checkout@v2
2928
with:
30-
ref: 'myst'
29+
ref: 'main'
3130

3231
- name: install from lockfile
3332
uses: mamba-org/provision-with-micromamba@main

install/environment.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: dsci100
22
channels:
33
- eoas_ubc
44
- conda-forge
5-
- defaults
65
dependencies:
76
- altair
87
- altair_data_server
@@ -12,17 +11,15 @@ dependencies:
1211
- git
1312
- jupyterlab
1413
- jupytext
15-
- jupyter-book>0.12
1614
- jupyter_contrib_nbextensions
1715
- mamba
1816
- nodejs
1917
- notebook
2018
- numpy
2119
- pandas
2220
- pip
23-
- pooch
2421
- python<3.10
2522
- jinja2==3.0.3
2623
- scikit-learn
27-
- watchdog
24+
- openpyxl
2825
# conda-lock --kind explicit --file environment.yml -p linux-64

notes/Readme_overview.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# OCESE summer notes
2+
3+
## resource links
4+
5+
### DSCI 100
6+
7+
* the instructor repo (ubc enterprise github) https://github.ubc.ca/dsci-100-instructor
8+
* the student repo) https://github.com/ubc-dsci/dsci-100-student
9+
10+
### python textbook repo and forks
11+
12+
* https://github.com/ubc-dsci/introduction-to-datascience-python
13+
* https://github.com/lheagy/introduction-to-datascience-python
14+
* https://github.com/phaustin/introduction-to-datascience-python
15+
16+
#### textbook branches
17+
18+
* dev: https://github.com/ubc-dsci/introduction-to-datascience-python/tree/dev
19+
* chapter 2 (reading,navya): https://github.com/ubc-dsci/introduction-to-datascience-python/tree/reading
20+
* tutorial: https://github.ubc.ca/UBC-DSCI/dsci-100-instructor/tree/py_tutorial_reading
21+
* worksheet: https://github.ubc.ca/UBC-DSCI/dsci-100-instructor/tree/py_worksheet_reading
22+
* issue: https://github.com/UBC-DSCI/introduction-to-datascience-python/issues/4
23+
* chapter 5 (classification1, gloria): https://github.com/ubc-dsci/introduction-to-datascience-python/tree/classification1
24+
* tutorial: https://github.ubc.ca/UBC-DSCI/dsci-100-instructor/tree/py_tutorial_classification1
25+
* worksheet: https://github.ubc.ca/UBC-DSCI/dsci-100-instructor/tree/py_worksheet_classification1
26+
* issue: https://github.com/UBC-DSCI/introduction-to-datascience-python/issues/3
27+
28+
29+
### R textbook
30+
31+
* the R textbook repo: https://github.com/ubc-dsci/introduction-to-datascience
32+
* rendered textbook (R version): https://datasciencebook.ca/
33+
34+
35+
### nbgrader
36+
37+
* rudaux: https://github.com/UBC-DSCI/rudaux
38+
* autotest (private): https://github.com/ubc-dsci/autotest
39+
40+

references.bib

Lines changed: 76 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ @book{children2012
280280
publisher = {Public Works \& Government Services Canada}
281281
}
282282

283-
@book{calls2015,
283+
@misc{calls2015,
284284
title={Calls to {A}ction},
285285
author={{Truth and Reconciliation Commission of Canada}},
286286
year={2015},
@@ -364,6 +364,13 @@ @book{wickham2016r
364364
url = {https://r4ds.had.co.nz/}
365365
}
366366

367+
@book{mckinney2012python,
368+
title={Python for data analysis: Data wrangling with Pandas, NumPy, and IPython},
369+
author={McKinney, Wes},
370+
year={2012},
371+
publisher={" O'Reilly Media, Inc."}
372+
}
373+
367374
@book{wickham2019advanced,
368375
title={Advanced {R}},
369376
author={Wickham, Hadley},
@@ -429,3 +436,71 @@ @book{openintro
429436
year = {2019},
430437
publisher = {OpenIntro, Inc.},
431438
url = {https://openintro.org/book/os/}}
439+
440+
@inproceedings{sklearn_api,
441+
author = {Lars Buitinck and Gilles Louppe and Mathieu Blondel and
442+
Fabian Pedregosa and Andreas Mueller and Olivier Grisel and
443+
Vlad Niculae and Peter Prettenhofer and Alexandre Gramfort
444+
and Jaques Grobler and Robert Layton and Jake VanderPlas and
445+
Arnaud Joly and Brian Holt and Ga{\"{e}}l Varoquaux},
446+
title = {{API} design for machine learning software: experiences from the scikit-learn
447+
project},
448+
booktitle = {ECML PKDD Workshop: Languages for Data Mining and Machine Learning},
449+
year = {2013},
450+
pages = {108--122},
451+
}
452+
453+
@Manual{reback2020pandas,
454+
author = {The pandas development team},
455+
title = {pandas-dev/pandas: Pandas},
456+
month = feb,
457+
year = 2020,
458+
publisher = {Zenodo},
459+
version = {latest},
460+
doi = {10.5281/zenodo.3509134},
461+
url = {https://doi.org/10.5281/zenodo.3509134}
462+
}
463+
464+
@InProceedings{ mckinney-proc-scipy-2010,
465+
author = { {W}es {M}c{K}inney },
466+
title = { {D}ata {S}tructures for {S}tatistical {C}omputing in {P}ython },
467+
booktitle = { {P}roceedings of the 9th {P}ython in {S}cience {C}onference },
468+
pages = { 56 - 61 },
469+
year = { 2010 },
470+
editor = { {S}t\'efan van der {W}alt and {J}arrod {M}illman },
471+
doi = { 10.25080/Majora-92bf1922-00a }
472+
}
473+
474+
@Manual{pep8-style-guide,
475+
year = {2001},
476+
author = {Guido van Rossum, Barry Warsaw, Nick Coghlan},
477+
title = {PEP 8 – Style Guide for Python Code},
478+
url = {https://peps.python.org/pep-0008/}
479+
}
480+
481+
@article{altair,
482+
doi = {10.21105/joss.01057},
483+
url = {https://doi.org/10.21105/joss.01057},
484+
year = {2018},
485+
publisher = {The Open Journal},
486+
volume = {3},
487+
number = {32},
488+
pages = {1057},
489+
author = {Jacob VanderPlas and Brian Granger and Jeffrey Heer and Dominik Moritz and Kanit Wongsuphasawat and Arvind Satyanarayan and Eitan Lees and Ilia Timofeev and Ben Welsh and Scott Sievert},
490+
title = {Altair: Interactive Statistical Visualizations for Python},
491+
journal = {Journal of Open Source Software}
492+
}
493+
494+
@article{beautifulsoup,
495+
title={Beautiful soup documentation},
496+
author={Richardson, Leonard},
497+
journal={April},
498+
year={2007}
499+
}
500+
501+
@article{tweepy,
502+
title={Tweepy: Twitter for Python!},
503+
author={Roesslein, Joshua},
504+
journal={URL: https://github.com/tweepy/tweepy},
505+
year={2020}
506+
}

source/_config.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ latex:
6565
latex_engine: pdflatex # one of 'pdflatex', 'xelatex' (recommended for unicode), 'luatex', 'platex', 'uplatex'
6666
use_jupyterbook_latex: true # use sphinx-jupyterbook-latex for pdf builds as default
6767

68+
6869
#######################################################################################
70+
6971
# Launch button settings
7072
launch_buttons:
71-
notebook_interface: classic # The interface interactive links will activate ["classic", "jupyterlab"]
72-
binderhub_url: https://mybinder.org # The URL of the BinderHub (e.g., https://mybinder.org)
73-
jupyterhub_url: "https://eosc211.jupyterhub.eoas.ubc.ca/jupyter" # The URL of the JupyterHub (e.g., https://datahub.berkeley.edu)
74-
thebe: false # Add a thebe button to pages (requires the repository to run on Binder)
75-
colab_url: "" # The URL of Google Colab (https://colab.research.google.com)
73+
binderhub_url: ""
74+
75+
7676

7777
repository:
7878
url: https://github.com/phaustin/eosc211_students # The URL to your book's repository
@@ -85,3 +85,8 @@ sphinx:
8585
extra_extensions: # A list of extra extensions to load by Sphinx (added to those already used by JB).
8686
local_extensions: # A list of local extensions to load by sphinx specified by "name: path" items
8787
config: # key-value pairs to directly over-ride the Sphinx configuration
88+
bibtex_reference_style: author_year
89+
90+
#######################################################################################
91+
bibtex_bibfiles:
92+
- ../references.bib

source/_toc.yml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
format: jb-book
2-
root: intro.md
2+
root: index.md
3+
options:
4+
numbered: true
35
parts:
46
- caption: First draft
57
chapters:
6-
- file: preface-text
7-
- file: setup
8-
- file: reading
9-
- file: wrangling
10-
- file: viz
11-
- file: version-control
12-
- file: classification1
13-
- file: classification2
14-
- file: regression1
15-
- file: regression2
16-
- file: clustering
17-
- file: inference
18-
- file: references
19-
- file: acknowledgements
20-
- file: authors
21-
- file: appendixA
22-
8+
- file: preface-text.md
9+
- file: foreword-text.md
10+
- file: acknowledgements.md
11+
- file: authors.md
12+
- file: setup.md
13+
- file: intro.md
14+
- file: reading.md
15+
- file: wrangling.md
16+
- file: viz.md
17+
- file: classification1.md
18+
- file: classification2.md
19+
- file: regression1.md
20+
- file: regression2.md
21+
- file: clustering.md
22+
- file: inference.md
23+
- file: references.md
24+
- file: appendixA.md

source/acknowledgements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ kernelspec:
1313
name: python3
1414
---
1515

16-
# Acknowledgments {-}
16+
# Acknowledgments -- TBD
1717

1818
We'd like to thank everyone that has contributed to the development of
1919
[*Data Science: A First Introduction*](https://datasciencebook.ca).

source/appendixA.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ kernelspec:
1313
name: python3
1414
---
1515

16-
# (APPENDIX) Appendix {-}
16+
# Appendix
1717

1818
# Downloading files from JupyterHub {#appendixA}
1919

source/authors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ kernelspec:
1313
name: python3
1414
---
1515

16-
# About the authors {-}
16+
# About the authors -- TBD
1717

1818
**Tiffany Timbers** is an Assistant Professor of Teaching in the Department of
1919
Statistics and Co-Director for the Master of Data Science program (Vancouver

0 commit comments

Comments
 (0)