From dbf4b96a51f4d09979ed8aba8aed3a24b5a3e79f Mon Sep 17 00:00:00 2001 From: Julia Kent <46687291+jukent@users.noreply.github.com> Date: Tue, 28 Jun 2022 10:46:25 -0600 Subject: [PATCH 01/11] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 215fc07..88c9932 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # projectpythiatutorials.github.io Root site for the ProjectPythiaTutorials GitHub Pages + +projectpythiacookbooks.github.io From 7f9a26449d180335bf100a062e02c67fd374e122 Mon Sep 17 00:00:00 2001 From: Max Grover Date: Tue, 28 Jun 2022 12:01:53 -0500 Subject: [PATCH 02/11] update cookbook link info (#11) --- site/cookbook_gallery.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/cookbook_gallery.yaml b/site/cookbook_gallery.yaml index c0d8ddd..139475c 100644 --- a/site/cookbook_gallery.yaml +++ b/site/cookbook_gallery.yaml @@ -1,5 +1,5 @@ - title: Radar Cookbook - url: https://projectpythiatutorials.github.io/radar-cookbook/landing-page.html + url: https://cookbooks.projectpythia.org/radar-cookbook/README.html description: | This Project Pythia Cookbook covers the basics of working with weather radar data in Python. authors: @@ -9,5 +9,5 @@ domains: - radar packages: - - py-art - \ No newline at end of file + - Py-ART + From 68b66391b3d2aa98b02d0637a34c6e5fbc731b43 Mon Sep 17 00:00:00 2001 From: Julia Kent <46687291+jukent@users.noreply.github.com> Date: Wed, 29 Jun 2022 08:58:21 -0600 Subject: [PATCH 03/11] Add Status Badges to gallery cards (#14) * add submodule * using cookbook status badges * delete subdomain repos * rm gitmodules and

* url to cookbook_url * un-escaped html for badge div * play with css --- site/_extensions/gallery_generator.py | 39 ++++++++++++++++++++++++--- site/_static/custom.css | 10 ++++++- site/cookbook_gallery.yaml | 4 +-- site/index.md | 17 +++++++----- 4 files changed, 57 insertions(+), 13 deletions(-) diff --git a/site/_extensions/gallery_generator.py b/site/_extensions/gallery_generator.py index d638b0f..a294996 100644 --- a/site/_extensions/gallery_generator.py +++ b/site/_extensions/gallery_generator.py @@ -5,6 +5,29 @@ from truncatehtml import truncate +def _generate_url_from_repo(repo): + cookbook_url = f'https://cookbooks.projectpythia.org/{repo}/README.html' + return cookbook_url + + +def _generate_github_url_from_repo(repo): + github_url = f'https://github.com/ProjectPythiaCookbooks/{repo}' + return github_url + + +#def _get_thumbnail_url(repo): +# github_url = _generate_github_url_from_repo(repo) +# return f'{github_url}/thumbnail.png' + + +def _generate_status_badge_html(repo): + github_url = _generate_github_url_from_repo(repo) + + return f""" + nightly-build + Binder + """ + def _generate_sorted_tag_keys(all_items): key_set = set(itertools.chain(*[item['tags'].keys() for item in all_items])) @@ -71,13 +94,19 @@ def build_from_items(items, filename, title='Gallery', subtitle=None, subtext=No # Build the gallery file panels_body = [] for item in items: + repo = item['repo'] + #thumbnail = _get_thumbnail_url(repo) + cookbook_url = _generate_url_from_repo(repo) + status_badges = _generate_status_badge_html(repo) + if not item.get('thumbnail'): item['thumbnail'] = '/_static/images/ebp-logo.png' thumbnail = item['thumbnail'] + tag_list = sorted((itertools.chain(*item['tags'].values()))) tag_list_f = [tag.replace(' ', '-') for tag in tag_list] - tags = [f'{tag}' for tag in tag_list_f] + tags = [f'{tag}' for tag in tag_list_f] tags = '\n'.join(tags) tag_class_str = ' '.join(tag_list_f) @@ -122,7 +151,7 @@ def build_from_items(items, filename, title='Gallery', subtitle=None, subtext=No {institutions_str}

{item['description']}

{tags}

-

Visit Website

+

Visit Website

""" @@ -137,7 +166,7 @@ def build_from_items(items, filename, title='Gallery', subtitle=None, subtext=No
-

{item["title"]}

 +

{item["title"]}

{authors_str}
{institutions_str}

{short_description}

@@ -145,8 +174,10 @@ def build_from_items(items, filename, title='Gallery', subtitle=None, subtext=No {modal_str} +++ - +
{tags} + +
""" ) diff --git a/site/_static/custom.css b/site/_static/custom.css index 1e95ca1..b40f6c5 100644 --- a/site/_static/custom.css +++ b/site/_static/custom.css @@ -118,4 +118,12 @@ main.banner-main #project-pythia { height: 1px; width: 0px; } - \ No newline at end of file + +.badge.mybadges { + margin-bottom: 0; + font-weight: 0; +} + +.tagsandbadges { + padding: 0 0; +} diff --git a/site/cookbook_gallery.yaml b/site/cookbook_gallery.yaml index 139475c..6877dd4 100644 --- a/site/cookbook_gallery.yaml +++ b/site/cookbook_gallery.yaml @@ -1,5 +1,5 @@ - title: Radar Cookbook - url: https://cookbooks.projectpythia.org/radar-cookbook/README.html + repo: radar-cookbook description: | This Project Pythia Cookbook covers the basics of working with weather radar data in Python. authors: @@ -10,4 +10,4 @@ - radar packages: - Py-ART - + \ No newline at end of file diff --git a/site/index.md b/site/index.md index 7e94c4b..1d898f3 100644 --- a/site/index.md +++ b/site/index.md @@ -27,7 +27,7 @@ Domains Packages
@@ -44,12 +44,12 @@ Packages :footer: p-1 --- -:column: + tagged-card py-art radar +:column: + tagged-card Py-ART radar
-

Radar Cookbook

 +

Radar Cookbook

Author: Max Grover

This Project Pythia Cookbook covers the basics of working with weather radar data in Python.

@@ -58,9 +58,14 @@ Packages +++ - -py-art -radar +
+Py-ART +radar +
nightly-build + Binder +
+
```` From 7f79df62058b11bed78a94c3d8a77c31abdfbc43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 09:59:36 -0600 Subject: [PATCH 04/11] Bump peter-evans/create-or-update-comment from 1 to 2 (#4) Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 1 to 2. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v1...v2) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/preview.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 4264aba..14b3e53 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -57,7 +57,7 @@ jobs: github.event.workflow_run.conclusion != 'success' && steps.find-pull-request.outputs.number != '' && steps.fc.outputs.comment-id == '' - uses: peter-evans/create-or-update-comment@v1 + uses: peter-evans/create-or-update-comment@v2 with: issue-number: ${{ steps.find-pull-request.outputs.number }} body: | @@ -69,7 +69,7 @@ jobs: github.event.workflow_run.conclusion != 'success' && steps.find-pull-request.outputs.number != '' && steps.fc.outputs.comment-id != '' - uses: peter-evans/create-or-update-comment@v1 + uses: peter-evans/create-or-update-comment@v2 with: comment-id: ${{ steps.fc.outputs.comment-id }} edit-mode: replace @@ -119,7 +119,7 @@ jobs: github.event.workflow_run.conclusion == 'success' && steps.find-pull-request.outputs.number != '' && steps.fc.outputs.comment-id != '' - uses: peter-evans/create-or-update-comment@v1 + uses: peter-evans/create-or-update-comment@v2 with: comment-id: ${{ steps.fc.outputs.comment-id }} edit-mode: replace From ba2fde1216219366a1f099903955755f1c8fcd42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 09:59:53 -0600 Subject: [PATCH 05/11] Bump styfle/cancel-workflow-action from 0.9.1 to 0.10.0 (#5) Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.9.1 to 0.10.0. - [Release notes](https://github.com/styfle/cancel-workflow-action/releases) - [Commits](https://github.com/styfle/cancel-workflow-action/compare/0.9.1...0.10.0) --- updated-dependencies: - dependency-name: styfle/cancel-workflow-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b5b1918..1976b45 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: if: github.repository == 'ProjectPythiaCookbooks/projectpythiacookbooks.github.io' steps: - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.1 + uses: styfle/cancel-workflow-action@0.10.0 with: access_token: ${{ github.token }} - uses: actions/checkout@v2 From 739b108efae8bdee1ae00c16a620372c8c411a1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 10:00:10 -0600 Subject: [PATCH 06/11] Bump peter-evans/find-comment from 1 to 2 (#6) Bumps [peter-evans/find-comment](https://github.com/peter-evans/find-comment) from 1 to 2. - [Release notes](https://github.com/peter-evans/find-comment/releases) - [Commits](https://github.com/peter-evans/find-comment/compare/v1...v2) --- updated-dependencies: - dependency-name: peter-evans/find-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/preview.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 14b3e53..180178c 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -45,7 +45,7 @@ jobs: core.info(`Found pull request ${pullRequestNumber}, with head sha: ${pullRequestHeadSHA}`) } - name: Find Comment - uses: peter-evans/find-comment@v1 + uses: peter-evans/find-comment@v2 if: steps.find-pull-request.outputs.number != '' id: fc with: From eddf4e8d138d01cc18b5ec29fa8e7d80184a085f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 10:01:18 -0600 Subject: [PATCH 07/11] Bump actions/checkout from 2 to 3 (#7) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/preview.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1976b45..44387d1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,7 @@ jobs: uses: styfle/cancel-workflow-action@0.10.0 with: access_token: ${{ github.token }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: conda-incubator/setup-miniconda@master with: diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 180178c..dc42e33 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -14,7 +14,7 @@ jobs: run: shell: bash steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set message value run: | echo "comment_message=This pull request is being automatically built with [GitHub Actions](https://github.com/features/actions) and [Netlify](https://www.netlify.com/). To see the status of your deployment, click below." >> $GITHUB_ENV From 655aa01bee2135e46b67bf0c7b913dfd76e51794 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 10:01:35 -0600 Subject: [PATCH 08/11] Bump actions/upload-artifact from 2 to 3 (#8) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 44387d1..9e777cc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,7 +41,7 @@ jobs: rm -rf site.zip fi zip -r site.zip ./site/_build/html - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: site-zip path: ./site.zip From 8165bff945b7aa77a27d21e2d3ddb348bf61d25f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 10:01:51 -0600 Subject: [PATCH 09/11] Bump actions/github-script from 4 to 6 (#9) Bumps [actions/github-script](https://github.com/actions/github-script) from 4 to 6. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/preview.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index dc42e33..ab77f48 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -19,7 +19,7 @@ jobs: run: | echo "comment_message=This pull request is being automatically built with [GitHub Actions](https://github.com/features/actions) and [Netlify](https://www.netlify.com/). To see the status of your deployment, click below." >> $GITHUB_ENV - name: Find Pull Request - uses: actions/github-script@v4 + uses: actions/github-script@v6 id: find-pull-request with: script: | From 7f7df1ac251b005def7b4be116d561afbb8081d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 10:08:15 -0600 Subject: [PATCH 10/11] Bump dawidd6/action-download-artifact from 2.14.1 to 2.21.1 (#26) Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 2.14.1 to 2.21.1. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](https://github.com/dawidd6/action-download-artifact/compare/v2.14.1...v2.21.1) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/preview.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index ab77f48..ad67c34 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -82,7 +82,7 @@ jobs: github.event.workflow_run.conclusion == 'success' && steps.find-pull-request.outputs.number != '' && steps.fc.outputs.comment-id != '' - uses: dawidd6/action-download-artifact@v2.14.1 + uses: dawidd6/action-download-artifact@v2.21.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} workflow: ci.yaml From af2f14ce0bd4f3b3c4c0a8463f42e692cc942bf6 Mon Sep 17 00:00:00 2001 From: John Clyne Date: Wed, 29 Jun 2022 10:29:22 -0600 Subject: [PATCH 11/11] Fixed #217 - guidance on running cookbooks --- site/index.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/site/index.md b/site/index.md index 1d898f3..9c748da 100644 --- a/site/index.md +++ b/site/index.md @@ -4,6 +4,13 @@ Pythia Cookbooks provide example workflows on more advanced and domain-specific problems developed by the Pythia community. Cookbooks build on top of skills you learn in Pythia Foundations. +Cookbooks are created from Jupyter Notebooks that we strive to *binderize* +so each Cookbook can be executed in the cloud with a single click from your +browswer. See documentation +[here](https://foundations.projectpythia.org/preamble/how-to-use.html#interacting-with-jupyter-notebooks-in-the-cloud-via-binder) +for details. In some instances executing a Cookbook will require downloading +the Notebook to your local laptop or desktop as described [here](https://foundations.projectpythia.org/preamble/how-to-use.html#interacting-with-jupyter-books-locally). +