Skip to content

Commit

Permalink
differences for PR #1690
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Jul 10, 2024
1 parent 83633ae commit 310fdc4
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion 12-homework.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ To prepare for our next session, please:
- Data Carpentry
- [Exploring Data with OpenRefine](https://datacarpentry.org/OpenRefine-ecology-lesson/03-exploring-data.html)
- [Basic Queries in SQL](https://datacarpentry.org/sql-ecology-lesson/01-sql-basic-queries.html)
- [Starting with Data in R](https://datacarpentry.org/R-ecology-lesson/02-starting-with-data.html)
- [Starting with Data in Python](https://datacarpentry.org/python-ecology-lesson/02-starting-with-data.html)
- [Dates as Data in Excel](https://datacarpentry.org/spreadsheet-ecology-lesson/03-dates-as-data.html)
- [Exploring and Understanding Data in R](https://datacarpentry.org/R-ecology-lesson/how-r-thinks-about-data.html)
- Library Carpentry
- [Working with Files and Directories in the Unix Shell](https://librarycarpentry.github.io/lc-shell/03-working-with-files-and-folders.html)
- [Faceting and filtering in Open Refine](https://librarycarpentry.github.io/lc-open-refine/04-faceting-and-filtering.html)
Expand Down
11 changes: 10 additions & 1 deletion demo_lessons.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,19 @@ Use the links below to jump to the starting points information for a particular
|---------- |--------------- |--------------- |------------------------- |
| [Data Organization in Spreadsheets](https://datacarpentry.org/spreadsheet-ecology-lesson/index.html) | \* [Dates as Data](https://datacarpentry.org/spreadsheet-ecology-lesson/03-dates-as-data.html)<br/> \* [Quality Control](https://datacarpentry.org/spreadsheet-ecology-lesson/04-quality-control.html) | \* [Introduction](https://datacarpentry.org/spreadsheet-ecology-lesson/00-intro.html)<br/> \* [Formatting Data Tables in Spreadsheets](https://datacarpentry.org/spreadsheet-ecology-lesson/01-format-data.html)<br/> \* [Formatting problems](https://datacarpentry.org/spreadsheet-ecology-lesson/02-common-mistakes.html)<br/> \* [Exporting data](https://datacarpentry.org/spreadsheet-ecology-lesson/05-exporting-data.html) | |
| [Data Cleaning with OpenRefine](https://datacarpentry.org/OpenRefine-ecology-lesson/index.html) | \* [Exploring Data with OpenRefine](https://datacarpentry.org/OpenRefine-ecology-lesson/03-exploring-data.html) | \* [Introduction](https://datacarpentry.org/OpenRefine-ecology-lesson/01-getting-started.html) | The other episodes depend on actions taken earlier in the lesson - consult [_Teaching Episodes with Dependencies_](#dependencies). |
| [Data Analysis and Visualization in R](https://datacarpentry.org/R-ecology-lesson/index.html) | \* [Introduction to R](https://datacarpentry.org/R-ecology-lesson/01-intro-to-r.html)<br/>\* [Starting with Data](https://datacarpentry.org/R-ecology-lesson/02-starting-with-data.html) | \* [Before We Start](https://www.datacarpentry.org/R-ecology-lesson/00-before-we-start.html) | [Manipulating Data](https://datacarpentry.org/R-ecology-lesson/03-dplyr.html) and [Data Visualization with ggplot2](https://datacarpentry.org/R-ecology-lesson/04-visualization-ggplot2.html) depend on actions taken earlier in the lesson - consult [_Teaching Episodes with Dependencies_](#dependencies). |
| [Data Analysis and Visualization in R](https://datacarpentry.org/R-ecology-lesson/index.html) | \* [Data Visualization with ggplot2](https://datacarpentry.org/R-ecology-lesson/visualizing-ggplot.html)<br/> \* [Exploring and Understanding Data](https://datacarpentry.org/R-ecology-lesson/how-r-thinks-about-data.html) | \* [Introduction to R and RStudio](https://datacarpentry.org/R-ecology-lesson/introduction-r-rstudio.html) | [Working with Data](https://datacarpentry.org/R-ecology-lesson/working-with-data.html) depends on actions taken earlier in the lesson - consult [_Teaching Episodes with Dependencies_](#dependencies). |
| [Data Management with SQL](https://www.datacarpentry.org/sql-ecology-lesson/index.html) | \* [Accessing Data With Queries](https://datacarpentry.org/sql-ecology-lesson/01-sql-basic-queries.html)<br/>\* [Aggregating and Grouping Data](https://datacarpentry.org/sql-ecology-lesson/02-sql-aggregation.html)<br/>\* [Combining Data With Joins](https://datacarpentry.org/sql-ecology-lesson/03-sql-joins.html) | \* [Databases using SQL](https://datacarpentry.github.io/sql-ecology-lesson/00-sql-introduction.html) | |
| [Data Analysis and Visualization in Python](https://www.datacarpentry.org/python-ecology-lesson/index.html) | \* [Short Introduction to Programming](https://datacarpentry.org/python-ecology-lesson/01-short-introduction-to-Python.html)<br/> \* [Starting with Data](https://datacarpentry.org/python-ecology-lesson/02-starting-with-data.html)<br/> \* [Indexing, Slicing, and Subsetting](https://datacarpentry.org/python-ecology-lesson/03-index-slice-subset.html)<br/> \* [Data Types and Formats](https://datacarpentry.org/python-ecology-lesson/04-data-types-and-format.html)<br/> \* [Combining DataFrames with Pandas](https://datacarpentry.org/python-ecology-lesson/05-merging-data.html)<br/> \* [Data Workflows and Automation](https://datacarpentry.org/python-ecology-lesson/06-loops-and-functions.html) | \* [Before we Start](https://datacarpentry.org/python-ecology-lesson/00-before-we-start.html) | The other episodes depend on actions taken earlier in the lesson - consult [_Teaching Episodes with Dependencies_](#dependencies). |

::::::::::::::::::::::::::::::::::::: instructor

The following is no longer recommended for new trainees, but is eligible for trainees who have previously registered for it:

| Lesson | Recommended Episodes | [**Not Eligible for Demos**](#ineligible) | Notes
|---------- |--------------- |--------------- |------------------------- |
| [Data Analysis and Visualization in R](https://tobyhodges.github.io/R-ecology-lesson-previous/) | \* [Introduction to R](https://tobyhodges.github.io/R-ecology-lesson-previous/01-intro-to-r.html)<br/>\* [Starting with Data](https://tobyhodges.github.io/R-ecology-lesson-previous/02-starting-with-data.html) | \* [Before We Start](https://tobyhodges.github.io/R-ecology-lesson-previous/00-before-we-start.html) | [Manipulating Data](https://tobyhodges.github.io/R-ecology-lesson-previous/03-dplyr.html) and [Data Visualization with ggplot2](https://tobyhodges.github.io/R-ecology-lesson-previous/04-visualization-ggplot2.html) depend on actions taken earlier in the lesson - consult [_Teaching Episodes with Dependencies_](#dependencies). |

:::::::::::::::::::::::::::::::::::::

### Data Carpentry: Genomics {#dc-genomics}

Expand Down
Empty file modified fig/carpentries-venn-diagram_20200904.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions md5sum.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"episodes/09-eia.md" "8c6a30032d53f8f1a3bdb4d3cdda658a" "site/built/09-eia.md" "2024-03-11"
"episodes/10-coffee.md" "3d5420a721f87b8886a1b367fe3c995e" "site/built/10-coffee.md" "2024-03-11"
"episodes/11-practice-teaching.md" "44856d335f7eed011d03af5a46fd16c1" "site/built/11-practice-teaching.md" "2024-03-11"
"episodes/12-homework.md" "4f1afe34e499d3b27bd65d832e545925" "site/built/12-homework.md" "2024-05-06"
"episodes/12-homework.md" "f22c06718ff9a549010d4e01f4bc17d0" "site/built/12-homework.md" "2024-07-10"
"episodes/13-second-welcome.md" "73b7d80f1f8e321362d96aff903fdf51" "site/built/13-second-welcome.md" "2024-03-11"
"episodes/14-checkout.md" "8f1377310ccc8e434d13fe55d833b1f0" "site/built/14-checkout.md" "2024-03-11"
"episodes/15-carpentries.md" "fc5bc85c64fc311c44f5fd812e374fa5" "site/built/15-carpentries.md" "2024-07-03"
Expand All @@ -34,11 +34,11 @@
"instructors/instructor-notes.md" "2f1f7f7e3fbc0ca739583e8877918100" "site/built/instructor-notes.md" "2024-03-11"
"learners/training_calendar.md" "12fbac99476e0c5a47a081c9b1626b1c" "site/built/training_calendar.md" "2024-07-08"
"learners/checkout.md" "d2e3a0d16bda9a2ccf07c557772b06bc" "site/built/checkout.md" "2024-06-27"
"learners/demo_lessons.md" "39702fdfb77681180e7b9d024904795a" "site/built/demo_lessons.md" "2024-04-17"
"learners/demo_lessons.md" "b4ba256cbce9e6a88aa0d7cdfb29ca65" "site/built/demo_lessons.md" "2024-07-10"
"learners/demos_rubric.md" "8c372a794aca88e640cc76d3181d363b" "site/built/demos_rubric.md" "2024-06-20"
"learners/members.md" "84e17620076b2093696780ef6190d3b5" "site/built/members.md" "2024-03-11"
"learners/fromthelearners.md" "4c586e5f20cd951c47872439263f5745" "site/built/fromthelearners.md" "2024-03-11"
"learners/reference.md" "61a622f37ef51d682c6d51a2068e086a" "site/built/reference.md" "2024-03-11"
"learners/setup.md" "5bce2b28295db23dd4f1a14a4c103876" "site/built/setup.md" "2024-03-11"
"learners/setup.md" "042264f3d7a4e98291cf4c3002ca2a32" "site/built/setup.md" "2024-07-10"
"pages/partners.md" "139ebb374919c12aa04e70dc23fb36d9" "site/built/partners.md" "2024-03-11"
"profiles/learner-profiles.md" "60b93493cf1da06dfd63255d73854461" "site/built/learner-profiles.md" "2024-03-11"
2 changes: 1 addition & 1 deletion setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ If you are having trouble choosing an episode, we recommend choosing one of the
- Data Carpentry
- [Exploring Data with OpenRefine](https://datacarpentry.org/OpenRefine-ecology-lesson/03-exploring-data.html)
- [Basic Queries in SQL](https://datacarpentry.org/sql-ecology-lesson/01-sql-basic-queries.html)
- [Starting with Data in R](https://datacarpentry.org/R-ecology-lesson/02-starting-with-data.html)
- [Starting with Data in Python](https://datacarpentry.org/python-ecology-lesson/02-starting-with-data.html)
- [Dates as Data in Excel](https://datacarpentry.org/spreadsheet-ecology-lesson/03-dates-as-data.html)
- [Exploring and Understanding Data in R](https://datacarpentry.org/R-ecology-lesson/how-r-thinks-about-data.html)
- Library Carpentry
- [Working with Files and Directories in the Unix Shell](https://librarycarpentry.github.io/lc-shell/03-working-with-files-and-folders.html)
- [Faceting and filtering in Open Refine](https://librarycarpentry.github.io/lc-open-refine/04-faceting-and-filtering.html)
Expand Down

0 comments on commit 310fdc4

Please sign in to comment.