From ab6954b611c8492889bd78ac94bb7d199fa50d27 Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Wed, 4 Aug 2021 14:02:16 -0400 Subject: [PATCH 1/5] Update funding text per COMT-371798 See https://jira.lsstcorp.org/browse/COMT-371798 --- components/footer.js | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/components/footer.js b/components/footer.js index 86e13165..059b341a 100644 --- a/components/footer.js +++ b/components/footer.js @@ -54,26 +54,17 @@ export default function Footer() {

- NSF and{' '} - DOE provide financial support - for Rubin Observatory in its operations phase to carry out the - Legacy Survey of Space and Time including support for scientific - research with the data. NSF funding is managed by the Association of - Universities for Research in Astronomy ( - AURA) under a - cooperative agreement with NSF, and DOE funding is managed by SLAC - under contract by DOE. The operations phase of Rubin Observatory is - operated jointly by NSF’s{' '} + Rubin Observatory is a joint initiative of the National Science + Foundation (NSF) and the Department of Energy (DOE). Its primary + mission is to carry out the Legacy Survey of Space and Time, + providing an unprecedented data set for scientific research + supported by both agencies. Rubin is operated jointly by NSF’s{' '} NOIRLab and SLAC National Accelerator Laboratory ( - SLAC). -

-

- The National Science Foundation (NSF) is an independent federal - agency created by{' '} - Congress in 1950 to - promote the progress of science. NSF supports basic research and - people to create knowledge that transforms the future. + SLAC). NOIRLab is + managed for NSF by the Association of Universities for Research in + Astronomy (AURA) and SLAC is operated for DOE by Stanford + University.

From 74f2dd28486d96100afb48797709b44e0c6d02d2 Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Wed, 4 Aug 2021 14:02:50 -0400 Subject: [PATCH 2/5] Increment version 0.3.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ff83e17e..475aa485 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "squareone", - "version": "0.3.0", + "version": "0.3.1", "private": true, "scripts": { "dev": "next dev -p 3000", From a040ea0cdc4aa99aa3033abaf743d7a0929347d0 Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Wed, 4 Aug 2021 14:11:55 -0400 Subject: [PATCH 3/5] Add build status badge to README --- README.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 7b6314a8..c41b1286 100644 --- a/README.rst +++ b/README.rst @@ -1,10 +1,17 @@ -############# -rsp-squareone -############# +.. image:: https://github.com/lsst-sqre/squareone/actions/workflows/ci.yaml/badge.svg + :target: https://github.com/lsst-sqre/sqr-060/actions/ +.. image:: https://img.shields.io/badge/squareone-lsst.io-brightgreen.svg + :target: https://squareone.lsst.io + +######### +Squareone +######### Squareone is the next-generation landing page for the `Rubin Observatory`_ Science Platform. It's where you start on your journey to use the RSP's portal, notebooks, and APIs to do science with Rubin/LSST data. +Squareone is deployed with `Phalanx `_. + **Documentation:** https://squareone.lsst.io Technology stack From 29b2c2767e5b6493d31d6afc5a9ca0effceb8868 Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Wed, 4 Aug 2021 14:18:38 -0400 Subject: [PATCH 4/5] Update mention of git hooks --- README.rst | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index c41b1286..1ab7bc99 100644 --- a/README.rst +++ b/README.rst @@ -42,12 +42,11 @@ Install the JavaScript packages:: npm install -Install pre-commit hooks ------------------------- +Install git hooks +----------------- -You can automatically lint and format code using pre-commit_ hooks. -Squareone uses Git pre-commit hooks to automatically run eslint and prettier on staged commits. -These hooks are managed by husky, and should be installed automatically when you install Squareone locally. +Git hooks allow you to automatically lint and format code with eslint and prettier on each commit. +These hooks are managed by `husky `_, and should be installed automatically when you install Squareone locally. If not, you can manually install the hooks:: husky install @@ -97,7 +96,6 @@ You can serve the production build locally:: .. _Next.js: https://nextjs.org .. _Prettier: https://prettier.io/ -.. _pre-commit: https://pre-commit.com/ .. _Rubin Observatory: https://www.lsst.org .. _React: https://reactjs.org .. _styled-components: https://styled-components.com From a80f977e9984ee6029035aa826acc47df8f1ebbe Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Wed, 4 Aug 2021 14:38:31 -0400 Subject: [PATCH 5/5] Update change log --- CHANGELOG.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b1250fab..9b805578 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,13 @@ Change log ########## +0.3.1 (2021-08-04) +================== + +- Update funding text. + +- Refresh README with status badges and revise text on git hooks. + 0.3.0 (2021-07-12) ==================