Skip to content

Commit

Permalink
Update to new theme
Browse files Browse the repository at this point in the history
  • Loading branch information
frossie committed Dec 16, 2024
1 parent 0b5145c commit d036b26
Show file tree
Hide file tree
Showing 18 changed files with 132 additions and 11,091 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"

- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"
40 changes: 8 additions & 32 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,36 +1,12 @@
name: CI

"on": [push, pull_request]
'on': [push, pull_request, workflow_dispatch]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # full history for metadata
submodules: true

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9

- name: Python install
run: |
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
python -m pip install "ltd-conveyor<2.0.0"
- name: Build
run: |
make html
- name: Upload
if: ${{ github.event_name == 'push' }}
env:
LTD_PASSWORD: ${{ secrets.LTD_PASSWORD }}
LTD_USERNAME: ${{ secrets.LTD_USERNAME }}
run: |
ltd upload --gh --dir _build/html --product sqr-056
call-workflow:
uses: lsst-sqre/rubin-sphinx-technote-workflows/.github/workflows/ci.yaml@v1
with:
handle: sqr-056
secrets:
ltd_username: ${{ secrets.LTD_USERNAME }}
ltd_password: ${{ secrets.LTD_PASSWORD }}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
_build/
.technote/
.tox/
venv/
.venv/
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
# - id: trailing-whitespace
- id: check-yaml
- id: check-toml
72 changes: 20 additions & 52 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,58 +1,26 @@
# Makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS = -n
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = _build

# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Try 'running pip install -r requirements.txt' to get the necessary Python dependencies.)
endif

# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .

.PHONY: help clean html epub changes linkcheck refresh-bib

help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " html to make standalone HTML files"
@echo " epub to make an epub"
@echo " linkcheck to check all external links for integrity"
@echo " refresh-bib to update LSST bibliographies in lsstbib/"

clean:
rm -rf $(BUILDDIR)/*
.PHONY:
init:
pip install tox pre-commit
pre-commit install

.PHONY:
html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
tox run -e html

epub:
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
@echo
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
.PHONY:
lint:
tox run -e lint,linkcheck

changes:
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo
@echo "The overview file is in $(BUILDDIR)/changes."
.PHONY:
add-author:
tox run -e add-author

linkcheck:
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."
.PHONY:
sync-authors:
tox run -e sync-authors

refresh-bib:
refresh-lsst-bib -d lsstbib
@echo
@echo "Commit the new bibliographies: git add lsstbib && git commit -m \"Update bibliographies.\""
.PHONY:
clean:
rm -rf _build
rm -rf .technote
rm -rf .tox
58 changes: 15 additions & 43 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
.. image:: https://img.shields.io/badge/sqr--056-lsst.io-brightgreen.svg
:target: https://sqr-056.lsst.io
:target: https://sqr-056.lsst.io/
.. image:: https://github.com/lsst-sqre/sqr-056/workflows/CI/badge.svg
:target: https://github.com/lsst-sqre/sqr-056/actions/
..
Uncomment this section and modify the DOI strings to include a Zenodo DOI badge in the README
.. image:: https://zenodo.org/badge/doi/10.5281/zenodo.#####.svg
:target: http://dx.doi.org/10.5281/zenodo.#####

#############################################################################
Guidelines for gated updates for SQuaRE services (including Science Platform)
Expand All @@ -18,61 +14,37 @@ The aim of this document is to expose the heuristics by which we consider what t

**Links:**

- Publication URL: https://sqr-056.lsst.io
- Publication URL: https://sqr-056.lsst.io/
- Alternative editions: https://sqr-056.lsst.io/v
- GitHub repository: https://github.com/lsst-sqre/sqr-056
- Build system: https://github.com/lsst-sqre/sqr-056/actions/


Build this technical note
=========================

You can clone this repository and build the technote locally with `Sphinx`_:
You can clone this repository and build the technote locally if your system has Python 3.11 or later:

.. code-block:: bash
git clone https://github.com/lsst-sqre/sqr-056
cd sqr-056
pip install -r requirements.txt
make init
make html
.. note::

In a Conda_ environment, ``pip install -r requirements.txt`` doesn't work as expected.
Instead, ``pip`` install the packages listed in ``requirements.txt`` individually.
Repeat the ``make html`` command to rebuild the technote after making changes.
If you need to delete any intermediate files for a clean build, run ``make clean``.

The built technote is located at ``_build/html/index.html``.

Editing this technical note
===========================

You can edit the ``index.rst`` file, which is a reStructuredText document.
The `DM reStructuredText Style Guide`_ is a good resource for how we write reStructuredText.

Remember that images and other types of assets should be stored in the ``_static/`` directory of this repository.
See ``_static/README.rst`` for more information.

The published technote at https://sqr-056.lsst.io will be automatically rebuilt whenever you push your changes to the ``master`` branch on `GitHub <https://github.com/lsst-sqre/sqr-056>`_.
Publishing changes to the web
=============================

Updating metadata
=================
This technote is published to https://sqr-056.lsst.io/ whenever you push changes to the ``main`` branch on GitHub.
When you push changes to a another branch, a preview of the technote is published to https://sqr-056.lsst.io/v.

This technote's metadata is maintained in ``metadata.yaml``.
In this metadata you can edit the technote's title, authors, publication date, etc..
``metadata.yaml`` is self-documenting with inline comments.

Using the bibliographies
========================

The bibliography files in ``lsstbib/`` are copies from `lsst-texmf`_.
You can update them to the current `lsst-texmf`_ versions with::

make refresh-bib

Add new bibliography items to the ``local.bib`` file in the root directory (and later add them to `lsst-texmf`_).
Editing this technical note
===========================

.. _Sphinx: http://sphinx-doc.org
.. _DM reStructuredText Style Guide: https://developer.lsst.io/restructuredtext/style.html
.. _this repo: ./index.rst
.. _Conda: http://conda.pydata.org/docs/
.. _lsst-texmf: https://lsst-texmf.lsst.io
The main content of this technote is in ``index.rst`` (a reStructuredText file).
Metadata and configuration is in the ``technote.toml`` file.
For guidance on creating content and information about specifying metadata and configuration, see the Documenteer documentation: https://documenteer.lsst.io/technotes.
28 changes: 3 additions & 25 deletions conf.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
#!/usr/bin/env python
#
# Sphinx configuration file
# see metadata.yaml in this repo to update document-specific metadata
# See the Documenteer docs for how to customize conf.py:
# https://documenteer.lsst.io/technotes/

import os
from documenteer.sphinxconfig.technoteconf import configure_technote

# Ingest settings from metadata.yaml and use documenteer's configure_technote()
# to build a Sphinx configuration that is injected into this script's global
# namespace.
metadata_path = os.path.join(os.path.dirname(__file__), 'metadata.yaml')
with open(metadata_path, 'r') as f:
confs = configure_technote(f)
g = globals()
g.update(confs)

# Add intersphinx inventories as needed
# http://www.sphinx-doc.org/en/stable/ext/intersphinx.html
# Example:
#
# intersphinx_mapping['python'] = ('https://docs.python.org/3', None)

html_css_files = [
'css/fe-table.css',
]
from documenteer.conf.technote import * # noqa F401 F403
13 changes: 9 additions & 4 deletions index.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
#############################################################################
Guidelines for gated updates for SQuaRE services (including Science Platform)
#############################################################################

.. abstract::

The aim of this document is to expose the heuristics by which we consider what the appropriate process is for various types of service updates. We also describe our extant processes around Science Platform and Science Platform adjacent services, as these are likely to be of most interest to developers outside our team.

..
Technote content.
Expand Down Expand Up @@ -36,11 +44,8 @@

Feel free to delete this instructional comment.

:tocdepth: 1

.. Please do not modify tocdepth; will be fixed when a new Sphinx theme is shipped.

.. sectnum::

.. TODO: Delete the note below before merging new content to the master branch.
Expand Down Expand Up @@ -191,4 +196,4 @@ The steps are:
.. Make in-text citations with: :cite:`bibkey`.
.. .. bibliography:: local.bib lsstbib/books.bib lsstbib/lsst.bib lsstbib/lsst-dm.bib lsstbib/refs.bib lsstbib/refs_ads.bib
.. :style: lsst_aa
.. :style: lsst_aa
14 changes: 0 additions & 14 deletions lsstbib/README.md

This file was deleted.

Loading

0 comments on commit d036b26

Please sign in to comment.