Skip to content

Commit

Permalink
adding example data to tables in introduction
Browse files Browse the repository at this point in the history
  • Loading branch information
MathewBiddle committed Feb 22, 2022
1 parent 3f301b9 commit 5f2a5a9
Show file tree
Hide file tree
Showing 60 changed files with 3,760 additions and 116 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Thanks for contributing! :heart:

If this contribution is for instructor training, please email the link to this contribution to
checkout@carpentries.org so we can record your progress. You've completed your contribution
instructor.training@carpentries.org so we can record your progress. You've completed your contribution
step for instructor checkout by submitting this contribution!

Keep in mind that **lesson maintainers are volunteers** and it may take them some time to
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,7 @@ jobs:
# return
cd ..
- run: make lesson-check-all
if: always()
# waiting for https://github.com/carpentries/styles/issues/551
# to be addressed
# - run: make lesson-check-all
# if: always()
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ vendor/
.docker-vendor/
Gemfile.lock
.*history
.idea
31 changes: 31 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Abigail Cabunoc Mayes <[email protected]>
Abigail Cabunoc Mayes <[email protected]> <[email protected]>
Amy Brown <[email protected]> <[email protected]>
Andrew Walker <[email protected]> <[email protected]>
Andy Boughton <[email protected]> <[email protected]>
Ben Jolly <[email protected]>
Erin Becker <[email protected]>
Evan P. Williamson <[email protected]>
François Michonneau <[email protected]>
François Michonneau <[email protected]> <[email protected]>
Greg Wilson <[email protected]> <[email protected]>
James Allen <[email protected]> <[email protected]>
Jonah Duckles <[email protected]> <[email protected]>
Jonathan Cooper <[email protected]> <[email protected]>
Lauren Michael <[email protected]>
Leighton Pritchard <[email protected]>
Lex Nederbragt <[email protected]> <[email protected]>
Maneesha Sane <[email protected]>
Marianna Foos <[email protected]>
Maxim Belkin <[email protected]> <[email protected]>
Mike Jackson <[email protected]> <[email protected]>
Neal Davis <[email protected]> <[email protected]>
Pauline Barmby <[email protected]>
Philipp Von Bieberstein <[email protected]>
Raniere Silva <[email protected]> <[email protected]>
Raniere Silva <[email protected]> <[email protected]>
Rémi Emonet <[email protected]> <[email protected]>
Rémi Emonet <[email protected]> <[email protected]>
Sarah Stevens <[email protected]> <[email protected]>
Timothée Poisot <[email protected]> <[email protected]>
Yashasvi Girdhar <[email protected]>
18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: python
python:
- "3.6"
# Remember that the code is running on a 14.04 machine.
# - "3.4"
# command to install dependencies
install:
- pip install -r requirements.txt
# as per https://docs.travis-ci.com/user/installing-dependencies/
# command to run tests
before_script:
- "python bin/_travis.py"
script:
- python bin/workshop_check.py .
- python -m unittest bin/_test/bs4test.py
branches:
only:
- gh-pages
90 changes: 71 additions & 19 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,90 @@
#------------------------------------------------------------
# Values for this lesson.
# Values for this workshop.
#------------------------------------------------------------

# More detailed instructions are available at:
# https://carpentries.github.io/workshop-template/customization/index.html

# Which carpentry is this ("swc", "dc", "lc", or "cp")?
# swc: Software Carpentry
# dc: Data Carpentry
# lc: Library Carpentry
# cp: Carpentries (to use for instructor traning for instance)
# incubator: Carpentries Incubator
# dc: Data Carpentry
# lc: Library Carpentry
# cp: Carpentries (to use for instructor training for instance)
# incubator: for workshops teaching a lesson in The Carpentries Incubator
# Note that for regular workshops, you should use:
# https://github.com/carpentries/workshop-template
# and for instructor training events you should use:
# https://github.com/carpentries/training-template
# When setting this field to "incubator", please uncomment the
# incubator_lesson_site, incubator_pre_survey, and incubator_post_survey
# lines further down this file and add the URL to the relevant lesson site.
carpentry: ""

# Overall title for pages.
# This option is currently only needed for
# Data Carpentry and Software Carpentry workshops.
# The value of the variable will be ignored for Library Carpentry
# workshops.
# Possible values are:
# dc-astronomy: for Data Carpentry Astronomy
# dc-ecology: for Data Carpentry Ecology
# dc-genomics: for Data Carpentry Genomics
# dc-socsci: for Data Carpentry Social Sciences
# dc-geospatial: for Data Carpentry Geospatial
# swc-inflammation: for Software Carpentry based on the inflammation dataset
# swc-gapminder: for Software Carpentry based on the Gapminder dataset
curriculum: ""

# If there is both an R and python official version of a curriculum
# (as listed on https://software-carpentry.org/lessons/ and
# https://datacarpentry.org/lessons/), change the
# value of the variable below ("flavor") to get the schedule and installation
# instructions updated accordingly (valid values are 'r' or 'python').
# Note: this is only for Data Carpentry and SWC at this time.
flavor: ""

# If the workshop will be a lesson pilot (for a new official lesson or
# a lesson in The Carpentries Incubator), set pilot to "true"
pilot: false

# Overall title for the Workshop.
# This variable is used to (optionally) add a title in the "jumbotron"
# (the grey box at the top of the page), and to the extra pages.
# Most workshops don't use extra pages. More information about extra
# pages are included in the README:
# https://github.com/carpentries/workshop-template#creating-extra-pages
title: "Marine Biological Data Mobilization Workshop 2022"

# Life cycle stage of the lesson
# See this page for more details: https://cdh.carpentries.org/the-lesson-life-cycle.html
# Possible values: "pre-alpha", "alpha", "beta", "stable"
life_cycle: "stable"
#------------------------------------------------------------
# Incubator workshop settings (only relevant for workshops teaching a lesson
# in The Carpentries Incubator).
#
# For an Incubator workshop, uncomment the line below and add the URL of the lesson site.
# incubator_lesson_site: "put the URL of the lesson being taught here"
#
# For an Incubator workshop, uncomment the line below and add the URL of your pre-workshop survey
# incubator_pre_survey: "put the URL of your pre-workshop survey here"
#
# For an Incubator workshop, uncomment the line below and add the URL of your post-workshop survey
# incubator_post_survey: "put the URL of your post-workshop survey here"
#
#------------------------------------------------------------

#------------------------------------------------------------
# Generic settings (should not need to change).
#------------------------------------------------------------

# What kind of thing is this ("workshop" or "lesson")?
kind: "lesson"
kind: "workshop"

# Magic to make URLs resolve both locally and on GitHub.
# See https://help.github.com/articles/repository-metadata-on-github-pages/.
# Please don't change it: <USERNAME>/<PROJECT> is correct.
repository: <USERNAME>/<PROJECT>

# Email address, no mailto:
email: "[email protected]"
# (Don't change this -- the contact address for your workshop will be set
# in the index.md file)
email: "[email protected]"

# Sites.
amy_site: "https://amy.carpentries.org/"
Expand All @@ -41,6 +94,7 @@ carpentries_site: "https://carpentries.org/"
dc_site: "https://datacarpentry.org"
example_repo: "https://github.com/carpentries/lesson-example"
example_site: "https://carpentries.github.io/lesson-example"
incubator: "https://github.com/carpentries-incubator/"
lc_site: "https://librarycarpentry.org/"
swc_github: "https://github.com/swcarpentry"
swc_pages: "https://swcarpentry.github.io"
Expand All @@ -52,16 +106,14 @@ workshop_site: "https://carpentries.github.io/workshop-template"
cc_by_human: "https://creativecommons.org/licenses/by/4.0/"

# Surveys.
pre_survey: "https://carpentries.typeform.com/to/wi32rS#slug="
post_survey: "https://carpentries.typeform.com/to/UgVdRQ#slug="
instructor_pre_survey: "https://carpentries.typeform.com/to/QVOarK#slug="
instructor_post_survey: "https://carpentries.typeform.com/to/cjJ9UP#slug="
pre_survey: "https://carpentries.typeform.com/to/wi32rS?slug="
post_survey: "https://carpentries.typeform.com/to/UgVdRQ?slug="
instructor_pre_survey: "https://www.surveymonkey.com/r/instructor_training_pre_survey?workshop_id="
instructor_post_survey: "https://www.surveymonkey.com/r/instructor_training_post_survey?workshop_id="

# Set to 'true' for instructor training websites only.
instructor_training: false

# Start time in minutes (0 to be clock-independent, 540 to show a start at 09:00 am).
start_time: 780
start_time: 0

# Specify that things in the episodes collection should be output.
collections:
Expand Down
5 changes: 3 additions & 2 deletions _extras/about.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
layout: page
title: About
permalink: /about/
---
<!-- {% include carpentries.html %} -->
{% include links.md %}
{% include carpentries.html %}
Loading

0 comments on commit 5f2a5a9

Please sign in to comment.