From 79f7c8838d62d93a7b302bebcb7f084b3d3e3397 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Tue, 19 Oct 2021 13:45:32 +0200 Subject: [PATCH 1/5] Easier link to notebook, better tagging --- _layouts/tutorial_hands_on.html | 6 ++++++ topics/data-science/tutorials/cli-advanced/tutorial.md | 3 +++ topics/data-science/tutorials/cli-bashcrawl/tutorial.md | 2 ++ topics/data-science/tutorials/cli-basics/tutorial.md | 3 +++ topics/data-science/tutorials/r-advanced/tutorial.md | 2 ++ topics/data-science/tutorials/r-basics/tutorial.md | 1 + topics/data-science/tutorials/sql-advanced/tutorial.md | 4 ++++ topics/data-science/tutorials/sql-basic/tutorial.md | 4 ++++ topics/data-science/tutorials/sql-game/tutorial.md | 2 ++ topics/data-science/tutorials/sql-python/tutorial.md | 5 +++++ topics/data-science/tutorials/sql-r/tutorial.md | 5 +++++ 11 files changed, 37 insertions(+) diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html index 5a2b8863b4f520..43073f2ddd473a 100644 --- a/_layouts/tutorial_hands_on.html +++ b/_layouts/tutorial_hands_on.html @@ -181,6 +181,12 @@

{% icon comment aria=false %} {{locale['best-in-jupyter'] | default: "Best v
  • Select the notebook that appears in the list of files on the left.

    • +

    Downloading the notebook +

      +
    1. Right click this link: tutorial.ipynb
      2. +
    2. Save Link As..
      3. +
    +

    {% endif %} diff --git a/topics/data-science/tutorials/cli-advanced/tutorial.md b/topics/data-science/tutorials/cli-advanced/tutorial.md index 17e91db478065f..27d7976612da0a 100644 --- a/topics/data-science/tutorials/cli-advanced/tutorial.md +++ b/topics/data-science/tutorials/cli-advanced/tutorial.md @@ -67,6 +67,9 @@ contributors: - carpentries - hexylena - bazante1 +tags: +- jupyter-notebook +- bash --- This tutorial will walk you through the basics of how to use the Unix command line. diff --git a/topics/data-science/tutorials/cli-bashcrawl/tutorial.md b/topics/data-science/tutorials/cli-bashcrawl/tutorial.md index 7f1c5443467ff4..5f28ac738d184f 100644 --- a/topics/data-science/tutorials/cli-bashcrawl/tutorial.md +++ b/topics/data-science/tutorials/cli-bashcrawl/tutorial.md @@ -31,6 +31,8 @@ contributors: - hexylena tags: - game +- jupyter-notebook +- bash --- This is not a tutorial like most GTN content but a fun exercise for you to play around and learn a bit about the command line, and hopefully re-inforce the skills you covered in Basic and Advanced CLI skills. diff --git a/topics/data-science/tutorials/cli-basics/tutorial.md b/topics/data-science/tutorials/cli-basics/tutorial.md index a9ad206e369e82..7111953baddf3e 100644 --- a/topics/data-science/tutorials/cli-basics/tutorial.md +++ b/topics/data-science/tutorials/cli-basics/tutorial.md @@ -67,6 +67,9 @@ contributors: - carpentries - hexylena - bazante1 +tags: +- jupyter-notebook +- bash --- This tutorial will walk you through the basics of how to use the Unix command line. diff --git a/topics/data-science/tutorials/r-advanced/tutorial.md b/topics/data-science/tutorials/r-advanced/tutorial.md index 8f96a53bbba2b1..34b00594c5f4cc 100644 --- a/topics/data-science/tutorials/r-advanced/tutorial.md +++ b/topics/data-science/tutorials/r-advanced/tutorial.md @@ -44,6 +44,8 @@ contributors: - bebatut - fpsom - tobyhodges +tags: +- R --- # Introduction diff --git a/topics/data-science/tutorials/r-basics/tutorial.md b/topics/data-science/tutorials/r-basics/tutorial.md index 4a6f7ed84670e5..002ff7b64fc375 100644 --- a/topics/data-science/tutorials/r-basics/tutorial.md +++ b/topics/data-science/tutorials/r-basics/tutorial.md @@ -30,6 +30,7 @@ key_points: - It is important to understand how data are organised by R in a given object type (e.g. numeric, character, logical, etc.) and how the mode of that type determines how R will operate on that data. tags: - interactive-tools + - R subtopic: r contributors: - carpentries diff --git a/topics/data-science/tutorials/sql-advanced/tutorial.md b/topics/data-science/tutorials/sql-advanced/tutorial.md index 20a2987ddd84f5..6f8035b1ea561b 100644 --- a/topics/data-science/tutorials/sql-advanced/tutorial.md +++ b/topics/data-science/tutorials/sql-advanced/tutorial.md @@ -83,6 +83,10 @@ notebook: abbreviations: SQL: "Structured Query Language" + +tags: +- SQL +- jupyter-notebook --- > ### {% icon comment %} Comment diff --git a/topics/data-science/tutorials/sql-basic/tutorial.md b/topics/data-science/tutorials/sql-basic/tutorial.md index 5616d0a691c8e3..3ea254c8e2f788 100644 --- a/topics/data-science/tutorials/sql-basic/tutorial.md +++ b/topics/data-science/tutorials/sql-basic/tutorial.md @@ -64,6 +64,10 @@ notebook: abbreviations: SQL: "Structured Query Language" + +tags: +- SQL +- jupyter-notebook --- > ### {% icon comment %} Comment diff --git a/topics/data-science/tutorials/sql-game/tutorial.md b/topics/data-science/tutorials/sql-game/tutorial.md index a5d3b120441d65..046e72bb32fa61 100644 --- a/topics/data-science/tutorials/sql-game/tutorial.md +++ b/topics/data-science/tutorials/sql-game/tutorial.md @@ -28,6 +28,8 @@ contributors: - NUKnightLab tags: - game +- SQL +- jupyter-notebook --- This is not a tutorial like most GTN content but a fun exercise for you to play around and learn a bit about SQL in a more 'practical', and hopefully re-inforce the skills you covered in Basic and Advanced SQL skills. It makes use of the [NUKnightLab/sql-mysteries](https://github.com/NUKnightLab/sql-mysteries) SQL murder mystery project and released under open licenses: diff --git a/topics/data-science/tutorials/sql-python/tutorial.md b/topics/data-science/tutorials/sql-python/tutorial.md index d78cfb29b64dde..142f5265ebc400 100644 --- a/topics/data-science/tutorials/sql-python/tutorial.md +++ b/topics/data-science/tutorials/sql-python/tutorial.md @@ -33,6 +33,11 @@ subtopic: sql notebook: language: python + +tags: +- SQL +- Python +- jupyter-notebook --- > ### {% icon comment %} Comment diff --git a/topics/data-science/tutorials/sql-r/tutorial.md b/topics/data-science/tutorials/sql-r/tutorial.md index 1f923cbab4bf5f..07021ed020b6c1 100644 --- a/topics/data-science/tutorials/sql-r/tutorial.md +++ b/topics/data-science/tutorials/sql-r/tutorial.md @@ -38,6 +38,11 @@ subtopic: sql notebook: language: r + +tags: +- SQL +- R +- jupyter-notebook --- > ### {% icon comment %} Comment From e28ba51450b19eaf30053e209ef92e7343913b34 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Tue, 19 Oct 2021 13:49:20 +0200 Subject: [PATCH 2/5] fix unnecessary sql --- .../tutorials/sql-advanced/tutorial.md | 12 ------------ .../data-science/tutorials/sql-basic/tutorial.md | 14 -------------- 2 files changed, 26 deletions(-) diff --git a/topics/data-science/tutorials/sql-advanced/tutorial.md b/topics/data-science/tutorials/sql-advanced/tutorial.md index 6f8035b1ea561b..1d376e83c6ac1a 100644 --- a/topics/data-science/tutorials/sql-advanced/tutorial.md +++ b/topics/data-science/tutorials/sql-advanced/tutorial.md @@ -338,7 +338,6 @@ this query: {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -366,7 +365,6 @@ this query: {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -414,7 +412,6 @@ this query: {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -435,7 +432,6 @@ this query: {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -595,7 +591,6 @@ SELECT rowid, * FROM Person; {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -620,7 +615,6 @@ SELECT rowid, * FROM Person; {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -635,7 +629,6 @@ SELECT rowid, * FROM Person; {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -679,7 +672,6 @@ SELECT rowid, * FROM Person; {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -773,7 +765,6 @@ the tool shapes the hand that shapes the tool. {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -792,7 +783,6 @@ the tool shapes the hand that shapes the tool. {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -979,7 +969,6 @@ this technique is outside the scope of this chapter. {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -1009,7 +998,6 @@ this technique is outside the scope of this chapter. {: .question} ```sql -%%sql -- Try solutions here! ``` diff --git a/topics/data-science/tutorials/sql-basic/tutorial.md b/topics/data-science/tutorials/sql-basic/tutorial.md index 3ea254c8e2f788..9151eb6b111fbf 100644 --- a/topics/data-science/tutorials/sql-basic/tutorial.md +++ b/topics/data-science/tutorials/sql-basic/tutorial.md @@ -264,7 +264,6 @@ the convention that we will use for this lesson. {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -328,7 +327,6 @@ SELECT * FROM Person; ```sql -%%sql -- Try solutions here! ``` @@ -350,7 +348,6 @@ SELECT * FROM Person; {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -488,7 +485,6 @@ SELECT DISTINCT quant, person FROM Survey ORDER BY quant ASC; {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -514,7 +510,6 @@ SELECT DISTINCT quant, person FROM Survey ORDER BY quant ASC; {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -744,7 +739,6 @@ not to the entire rows as they are being processed. {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -768,7 +762,6 @@ not to the entire rows as they are being processed. {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -793,7 +786,6 @@ not to the entire rows as they are being processed. {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -881,7 +873,6 @@ issues. {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -933,7 +924,6 @@ issues. {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -970,7 +960,6 @@ issues. {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -1118,7 +1107,6 @@ detail in [the next section](#). {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -1153,7 +1141,6 @@ detail in [the next section](#). {: .question} ```sql -%%sql -- Try solutions here! ``` @@ -1171,6 +1158,5 @@ detail in [the next section](#). {: .question} ```sql -%%sql -- Try solutions here! ``` From 5d72e6741b9b28d4d35076220dc3808228d8b3c5 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Tue, 19 Oct 2021 13:58:22 +0200 Subject: [PATCH 3/5] clean up logging --- _plugins/notebook-page.rb | 4 +++- _plugins/sitemap.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_plugins/notebook-page.rb b/_plugins/notebook-page.rb index 7a5b663d888d23..c8846ebe871452 100644 --- a/_plugins/notebook-page.rb +++ b/_plugins/notebook-page.rb @@ -239,7 +239,7 @@ def renderMarkdownCells(site, notebook, metadata, page) def generate(site) if find_executable('notedown').nil? - puts "We could not find the notedown executable, so, notebooks will not be rendered." + puts "[GTN/Notebooks] We could not find the notedown executable, so, notebooks will not be rendered." return end @@ -267,6 +267,8 @@ def generate(site) notebook = fixRNotebook(notebook) end + puts "[GTN/Notebooks] Rendering #{notebook_language} #{fn}" + # Here we loop over the markdown cells and render them to HTML. This # allows us to get rid of classes like {: .tip} that would be left in # the output by Jupyter's markdown renderer, and additionally do any diff --git a/_plugins/sitemap.rb b/_plugins/sitemap.rb index c34c03d8c48f28..ebf5ff13d5cfd4 100644 --- a/_plugins/sitemap.rb +++ b/_plugins/sitemap.rb @@ -5,7 +5,7 @@ class SitemapGenerator < Generator safe true def generate(site) - puts "Generating Sitemap" + puts "[GTN/Sitemap] Generating" result = '' result += '' From efb25c88715ed5bbd6a5815725c28f099c6783d4 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Tue, 19 Oct 2021 13:58:29 +0200 Subject: [PATCH 4/5] disable notebooks in dev --- _plugins_dev/notebook-fake.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 _plugins_dev/notebook-fake.rb diff --git a/_plugins_dev/notebook-fake.rb b/_plugins_dev/notebook-fake.rb new file mode 100644 index 00000000000000..047d1cf464803c --- /dev/null +++ b/_plugins_dev/notebook-fake.rb @@ -0,0 +1,10 @@ +module Jekyll + class JupyterNotebookGenerator < Generator + safe true + + def generate(site) + puts "[GTN/Notebooks] Disabled" + end + end +end + From 24190207230937e2a54ae9d42af1ce4ba53617c3 Mon Sep 17 00:00:00 2001 From: Saskia Hiltemann Date: Tue, 19 Oct 2021 14:02:01 +0200 Subject: [PATCH 5/5] change order of R tutorials --- topics/data-science/tutorials/r-advanced/tutorial.md | 1 + topics/data-science/tutorials/r-basics/tutorial.md | 1 + 2 files changed, 2 insertions(+) diff --git a/topics/data-science/tutorials/r-advanced/tutorial.md b/topics/data-science/tutorials/r-advanced/tutorial.md index 34b00594c5f4cc..24404fb6e727d2 100644 --- a/topics/data-science/tutorials/r-advanced/tutorial.md +++ b/topics/data-science/tutorials/r-advanced/tutorial.md @@ -39,6 +39,7 @@ key_points: - Use the `dplyr` package to manipulate data frames. - Pipes can be used to combine simple operations into complex procedures. subtopic: r +priority: 2 contributors: - carpentries - bebatut diff --git a/topics/data-science/tutorials/r-basics/tutorial.md b/topics/data-science/tutorials/r-basics/tutorial.md index 002ff7b64fc375..d7aa8d72238867 100644 --- a/topics/data-science/tutorials/r-basics/tutorial.md +++ b/topics/data-science/tutorials/r-basics/tutorial.md @@ -32,6 +32,7 @@ tags: - interactive-tools - R subtopic: r +priority: 1 contributors: - carpentries - bebatut