From 295c6050c7c744d3842bd25de29da3fb87b260a5 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Thu, 17 Oct 2024 16:05:20 -0600 Subject: [PATCH 1/8] Change donation link to point to LF Charities and reference Jupyter Foundation --- about.html | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/about.html b/about.html index 14826e88..0521c96b 100644 --- a/about.html +++ b/about.html @@ -579,9 +579,9 @@ donate_box: headline: Donate description: - - Jupyter will always be 100% open source software, free for all to use and released under the liberal terms of the modified BSD license. If you have found Project Jupyter to be useful in your work, research or company, please consider making a donation to the project commensurate with your resources. - - All donations will be used strictly to fund the development of Project Jupyter's open source software, documentation and community. Our donations are managed by the NumFOCUS Foundation, which is the legal and fiscal umbrella for the project. - - NumFOCUS is a 501(c)3 non-profit foundation; if you are subject to US Tax law, your contributions will be tax-deductible. + - Jupyter will always be 100% open source software, free for all to use and released under the liberal terms of the modified BSD license. If you have found Project Jupyter to be useful in your work, research, or company, please consider making a donation to the project commensurate with your resources. + - All donations will be used strictly to fund the development of Project Jupyter's open source software, standards, documentation, and community. Our donations are managed by LF Charities, which is the legal and fiscal umbrella for the project. LF Charities is a Delaware nonprofit corporation and Section 509(a)(3) supporting organization that is tax exempt under Section 501(c)(3) of the Internal Revenue Code of the United States; if you are subject to US tax law, your contributions will be tax-deductible. + - Alternatively, corporations and other organizations may join the Jupyter Foundation, under the Linux Foundation, to support Project Jupyter and its mission. The Linux Foundation is a 501(c)(6) non-profit. --- {% include page-header.html @@ -835,19 +835,9 @@

{{ page.donate_box.headline }}

{{ graf }}

{% endfor %} -

- - Numfocus - Home Page - -

- + Support Project Jupyter
From ee77e04bcf31909d5ecb1cf2267dab6251342743 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Thu, 17 Oct 2024 16:14:15 -0600 Subject: [PATCH 2/8] Remove NumFOCUS reference in privacy doc --- privacy.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/privacy.md b/privacy.md index 71a1cfe2..eac11563 100644 --- a/privacy.md +++ b/privacy.md @@ -42,8 +42,7 @@ those services to process sensitive information. Jupyter has a [community page](https://jupyter.org/community) that recommends mailing lists, forums, chat rooms, and videoconference calls for users to meet and discuss Jupyter software. Some of these communities are -managed by third-party companies not directly affiliated with Project Jupyter -or NumFOCUS. +managed by third-party companies not directly affiliated with Project Jupyter. You should not need to create an account on any on those platforms to _read_ any public content. You do not need to create an account on any community From bfc31b4f28a0f282b3cd4ed8fe2efe602fe5c737 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Thu, 17 Oct 2024 16:17:31 -0600 Subject: [PATCH 3/8] Mention the Jupyter trademarks are registered by LF Charities --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 76201f68..07b26fd7 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -176,7 +176,7 @@

Legal

Project Jupyter logo

- The Jupyter Trademark is registered with the U.S. Patent & Trademark Office. © {{site.time | date: '%Y' }} + The Jupyter® and Jupyter Logo® trademarks are registered with the U.S. Patent & Trademark Office by LF Charities. © {{site.time | date: '%Y' }}

From a4af5ed8e4e0b09eb32f42415b36254b0a8ef868 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Thu, 17 Oct 2024 16:27:21 -0600 Subject: [PATCH 4/8] Update github workflow to use upload/download artifact v4 v2 is giving an error: Error: This request has been automatically failed because it uses a deprecated version of . Learn more: https://github.blog/changelog/2024-02-13-deprecation-notice-v1-and-v2-of-the-artifact-actions/ --- .github/workflows/validate.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 363d114d..c194a492 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -34,7 +34,7 @@ jobs: # run: cp -r assets _site/assets - name: Publish built site - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: Built site ${{ github.run_number }} path: ./_site @@ -48,7 +48,7 @@ jobs: steps: - name: Fetch built site - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: Built site ${{ github.run_number }} path: ./_site @@ -67,7 +67,7 @@ jobs: steps: - name: Fetch built site - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: Built site ${{ github.run_number }} path: ./_site @@ -99,7 +99,7 @@ jobs: - name: Fetch repository for `lighthouserc.json` uses: actions/checkout@v2 - name: Fetch built site - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: Built site ${{ github.run_number }} path: ./_site From ecb11410dff20f798a084fc23856eee8bf3ea645 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Thu, 17 Oct 2024 16:46:35 -0600 Subject: [PATCH 5/8] Ignore the opensource.org bsd link, since it seems to give 403 for the check from github --- .github/workflows/validate.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index c194a492..dae63c8f 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -87,7 +87,8 @@ jobs: --check-links-ignore "https://twitter.com/.*" \ --check-links-ignore "https://jupytercon.com" \ --check-links-ignore "https://www.netapp.com" \ - --check-links-ignore "https://github.com/[^/]+/?$" # 429 too many requests checking GitHub user profiles in about.html + --check-links-ignore "https://github.com/[^/]+/?$" # 429 too many requests checking GitHub user profiles in about.html \ + --check-links-ignore "https://opensource.org/licenses/BSD-3-Clause" # 403 forbidden from github lighthouse: From 6152c352c9fb2956c3960d0044306d3a44468b45 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Thu, 17 Oct 2024 17:26:09 -0600 Subject: [PATCH 6/8] Fix link check --- .github/workflows/validate.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index dae63c8f..72511779 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -76,6 +76,8 @@ jobs: run: pip install pytest-check-links # TODO: we are not checking absolute links as pytest plugins does not support them + # ignore github requests as we get 429 too many requests checking GitHub user profiles in about.html + # ignore opensource.org since we are getting a 403 forbidden from this check run on github - name: Check links run: | pytest _site/ --check-links \ @@ -87,8 +89,8 @@ jobs: --check-links-ignore "https://twitter.com/.*" \ --check-links-ignore "https://jupytercon.com" \ --check-links-ignore "https://www.netapp.com" \ - --check-links-ignore "https://github.com/[^/]+/?$" # 429 too many requests checking GitHub user profiles in about.html \ - --check-links-ignore "https://opensource.org/licenses/BSD-3-Clause" # 403 forbidden from github + --check-links-ignore "https://github.com/[^/]+/?$" \ + --check-links-ignore "https://opensource.org/licenses/BSD-3-Clause" lighthouse: From 886ec6ae784414854f2ed6d7204ac384bac293d2 Mon Sep 17 00:00:00 2001 From: M Bussonnier Date: Fri, 18 Oct 2024 10:33:57 +0200 Subject: [PATCH 7/8] bump ruby ? --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index a0891f56..fa7adc7a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.4 +3.3.5 From 8932e6809bdae8f1a55f157c0a3676ad65e3cfc7 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Fri, 18 Oct 2024 09:35:58 -0600 Subject: [PATCH 8/8] Simplify language describing LF Charities --- about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about.html b/about.html index 0521c96b..c61dac0d 100644 --- a/about.html +++ b/about.html @@ -580,7 +580,7 @@ headline: Donate description: - Jupyter will always be 100% open source software, free for all to use and released under the liberal terms of the modified BSD license. If you have found Project Jupyter to be useful in your work, research, or company, please consider making a donation to the project commensurate with your resources. - - All donations will be used strictly to fund the development of Project Jupyter's open source software, standards, documentation, and community. Our donations are managed by LF Charities, which is the legal and fiscal umbrella for the project. LF Charities is a Delaware nonprofit corporation and Section 509(a)(3) supporting organization that is tax exempt under Section 501(c)(3) of the Internal Revenue Code of the United States; if you are subject to US tax law, your contributions will be tax-deductible. + - All donations will be used strictly to fund the development of Project Jupyter's open source software, standards, documentation, and community. Our donations are managed by LF Charities, which is the legal and fiscal umbrella for the project. LF Charities is tax exempt under Section 501(c)(3) of the Internal Revenue Code of the United States; if you are subject to US tax law, your contributions will be tax-deductible. - Alternatively, corporations and other organizations may join the Jupyter Foundation, under the Linux Foundation, to support Project Jupyter and its mission. The Linux Foundation is a 501(c)(6) non-profit. ---