Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding colophon page for license, DOI and citation #570

Merged
merged 48 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
e34f032
Merge branch 'cf-convention:main' into main
cofinoa Nov 8, 2024
b30c326
Initial commit for adding colophon
cofinoa Nov 14, 2024
b973314
Add CITATION.cff file.
cofinoa Nov 14, 2024
b724218
Complete citation info with version 1.11 info
cofinoa Nov 14, 2024
0e41b4b
Include the colophon section
cofinoa Nov 14, 2024
2ec941e
Adding push event to temporary branch
cofinoa Nov 14, 2024
ff45221
Update zenodo metada
cofinoa Nov 14, 2024
dcbcc9d
Adding working directories to gh-pages
cofinoa Nov 18, 2024
34f5f44
Fix sed expressions
cofinoa Nov 18, 2024
992746a
Escaping path sep in sed expressions
cofinoa Nov 18, 2024
143fa19
FIx sed expressions
cofinoa Nov 18, 2024
81e5d77
Adding sudo
cofinoa Nov 18, 2024
0c0e97c
Fixing typo on else
cofinoa Nov 18, 2024
0436c55
Improve push events
cofinoa Nov 18, 2024
1bab38c
Merge branch 'main' into add-colophon-doi-citation
cofinoa Nov 18, 2024
6c8fe9b
Ignore README
cofinoa Nov 18, 2024
a372e8e
Merge branch 'main' into add-colophon-doi-citation
cofinoa Nov 18, 2024
bb38303
Refactor GitHub Actions Workflow: Centralize configuration with envir…
cofinoa Nov 25, 2024
13cd42a
Fix typos
cofinoa Nov 25, 2024
5a1042a
Update adoc_build.yml
cofinoa Nov 25, 2024
8052590
Update adoc_build.yml
cofinoa Nov 25, 2024
5cdbbfe
Update adoc_build.yml
cofinoa Nov 25, 2024
d056a75
Publish assest to release
cofinoa Nov 26, 2024
b8045f0
Comment condensed
cofinoa Nov 26, 2024
2376fe0
Merge branch 'main' into add-colophon-doi-citation
cofinoa Nov 26, 2024
ce71e51
Renaming GH action file workflow
cofinoa Nov 26, 2024
4a8b076
Merge branch 'main' into add-colophon-doi-citation
cofinoa Nov 26, 2024
df05d05
Improve Workflow: PR Event Handling and Cleanup
cofinoa Nov 27, 2024
c01ed60
Update events and clean-up
cofinoa Nov 28, 2024
6992c18
Move prepare and build index publish_doc
cofinoa Dec 1, 2024
66fa749
Enhance GitHub Actions workflow to handle PR-specific logic
cofinoa Dec 1, 2024
b73d3f7
Remove sticky comment functionality for PR artifact linking
cofinoa Dec 1, 2024
0550aa9
Merge branch 'main' into add-colophon-doi-citation
cofinoa Dec 1, 2024
c539435
Merge remote-tracking branch 'upstream/main'
cofinoa Dec 2, 2024
34cf53d
Merge branch 'main' into add-colophon-doi-citation
cofinoa Dec 2, 2024
6d70fa5
Merge branch 'cf-convention:main' into add-colophon-doi-citation
cofinoa Dec 2, 2024
f94e1b9
Update version and date, not yet final
cofinoa Dec 2, 2024
a361c85
Update related_identifiers at zenodo
cofinoa Dec 2, 2024
26f0756
Restore nbsp in authors and non-genuine DOI for draft
cofinoa Dec 2, 2024
52f6618
Updating author affiliation in authors section, following Zenodo meta…
cofinoa Dec 2, 2024
f142585
Include @JonathanGregory suggestion about draft word in version string
cofinoa Dec 2, 2024
dd33c87
Update year in reference
cofinoa Dec 2, 2024
2031ff8
Update version and date in CFF
cofinoa Dec 2, 2024
ac3d402
Preparing final tag
cofinoa Dec 2, 2024
3d0bdb4
Publish to final-preview directory
cofinoa Dec 2, 2024
352099f
Fix undefined case for set_final_tag input as false
cofinoa Dec 2, 2024
d1fb30b
Update DOI placeholder and current-version attribute
cofinoa Dec 2, 2024
9be2f79
updated LB affiliation
larsbarring Dec 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/GitHub.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: GitHub
about: For proposing changes to the the use of GitHub in this repository
title: "*add your own title here*"
labels: GitHub
assignees: ''

---

Before submitting an issue be sure you have read and understand the GitHub contributing guidelines: https://github.com/cf-convention/cf-conventions/blob/main/CONTRIBUTING.md. Please describe the change you propose should be made, and link the PR, when available.
13 changes: 0 additions & 13 deletions .github/ISSUE_TEMPLATE/github-usage-issue.md

This file was deleted.

32 changes: 13 additions & 19 deletions .github/workflows/adoc_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,16 @@ name: Asciidoctor Build Workflow
on:
# manually run workflow
workflow_dispatch:

# trigger on PR event against default branch (i.e. main) (will not run publish job)
# trigger on PR event against main branch
pull_request:
branches: [ main ]
# Trigger on a push to default branch (i.e. main) (a PR is merged), or when a release is

# published on github. These will run the publish job.
# Trigger on a push on branch except gh-pages branch
push:
branches: [ main ]
branches-ignore: [ gh-pages ]
# Trigger when a GitHub release is published.
release:
types:
- published

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: write
Expand Down Expand Up @@ -73,7 +69,11 @@ jobs:
- name: Copy index.html
run: |
sudo cp -p .github/gh-pages/index.html build/

# Update H1 header
- name: Update H1 header
run: |
PATH_REVISION="${GITHUB_REPOSITORY}/${GITHUB_REF_TYPE}/${GITHUB_REF_NAME}@${GITHUB_SHA:0:7}"
sudo sed -i s/Latest/"${PATH_REVISION//\//\\/}"/ build/index.html;
# Upload artifact containing cf-conventions.html, cf-conventions.pdf
- name: Save cf-conventions and conformance docs
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -126,10 +126,9 @@ jobs:
- name: Determine where the new documents should live
run: |
if [[ ${{ github.event_name }} == 'release' ]]; then
# ${GITHUB_REF##*/} -> turns refs/tags/vM.m.p into vM.m.p
echo "TARGET_DIR=${GITHUB_REF##*/}" >> "$GITHUB_ENV"
echo "TARGET_DIR=releases/${GITHUB_REF_NAME}" >> "$GITHUB_ENV"
else
echo "TARGET_DIR=." >> "$GITHUB_ENV"
echo "TARGET_DIR=${GITHUB_REF_TYPE}/${GITHUB_REF_NAME}" >> "$GITHUB_ENV"
fi
# Obtain the build artifacts from the previous jobs and place them in the
# build/ directory
Expand All @@ -139,12 +138,10 @@ jobs:
path: build/
# If we are doing a release, we need to create the release directory
- name: Make release directory
if: github.event_name == 'release'
run: mkdir -p ${{ env.TARGET_DIR }}
# If we are not doing a release, let's clean out the previous images
# directory in the root directory (OLD TO BE DEPRECATED)
- name: Remove old images directory
if: github.event_name != 'release'
run: sudo rm -rf ${{ env.TARGET_DIR }}/images
- name: Copy conventions and conformance documents
run: |
Expand All @@ -157,12 +154,9 @@ jobs:
# committed to the gh-pages branch
- name: Remove artifact directory
run: rm -rf build/
# If we are doing a release, update the index.html file to reflect the new
# latest release version.
- name: Update release index.html to point to new release
if: github.event_name == 'release'
run: |
sed -i s/Latest/"${GITHUB_REF##*/}"/ ${{ env.TARGET_DIR }}/index.html;
# Update root index.html: tree directories, excluding empty ones
- name: Update root index.html
run: tree -T ${GITHUB_REPOSITORY} --dirsfirst --prune --noreport -I index.html -I README.md -H . -o index.html
# Stage all changed files to git
- name: Add all changes to git
run: git add --all
Expand Down
308 changes: 74 additions & 234 deletions .zenodo.json

Large diffs are not rendered by default.

125 changes: 125 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
cff-version: 1.2.0
license:
- cc0-1.0
title: NetCDF Climate and Forecast (CF) Metadata Conventions
version: '1.11'
date-released: '2023-12-05'
doi: 10.5072/zenodo.130529
abstract: This document describes the CF conventions for climate and forecast metadata
designed to promote the processing and sharing of files created with the netCDF
Application Programmer Interface. The conventions define metadata that provide a
definitive description of what the data in each variable represents, and of the
spatial and temporal properties of the data. This enables users of data from different
sources to decide which quantities are comparable, and facilitates building applications
with powerful extraction, regridding, and display capabilities. The CF conventions
generalize and extend the COARDS conventions. The extensions include metadata that
provides a precise definition of each variable via specification of a standard name,
describes the vertical locations corresponding to dimensionless vertical coordinate
values, and provides the spatial coordinates of non-rectilinear gridded data. Since
climate and forecast data are often not simply representative of points in space/time,
other extensions provide for the description of coordinate intervals, multidimensional
cells and climatological time coordinates, and indicate how a data value is representative
of an interval or cell. This standard also relaxes the COARDS constraints on dimension
order and specifies methods for reducing the size of datasets.
authors:
- affiliation: NCAR
family-names: Eaton
given-names: Brian
- affiliation: University of Reading and UK Met Office Hadley Centre
family-names: Gregory
given-names: Jonathan
orcid: 0000-0003-1296-8644
- affiliation: PCMDI, LLNL
family-names: Drach
given-names: Bob
- affiliation: PCMDI, LLNL
family-names: Taylor
given-names: Karl
orcid: 0000-0002-6491-2135
- affiliation: PMEL, NOAA
family-names: Hankin
given-names: Steve
- affiliation: University of Reading
family-names: Blower
given-names: Jon
- affiliation: Unidata
family-names: Caron
given-names: John
- affiliation: USGS
family-names: Signell
given-names: Rich
- affiliation: UK Met Office
family-names: Bentley
given-names: Phil
- affiliation: MIT
family-names: Rappa
given-names: Greg
- affiliation: DKRZ
family-names: "H\xF6ck"
given-names: Heinke
orcid: 0000-0002-0131-1404
- affiliation: NCAS and CEDA
family-names: Pamment
given-names: Alison
orcid: 0000-0001-5040-4626
- affiliation: NCAS
family-names: Juckes
given-names: Martin
- affiliation: SMHI
family-names: Raspaud
given-names: Martin
- affiliation: Excalibur Laboratories Inc
family-names: Horne
given-names: Randy
- affiliation: University of Texas
family-names: Whiteaker
given-names: Timothy
- affiliation: USGS
family-names: Blodgett
given-names: David
- affiliation: UC Irvine
family-names: Zender
given-names: Charlie
- affiliation: EUMETSAT
family-names: Lee
given-names: Daniel
orcid: 0000-0002-1041-232X
- affiliation: NCAS and University of Reading
family-names: Hassell
given-names: David
orcid: 0000-0001-5106-7502
- affiliation: Corteva Agriscience
family-names: Snow
given-names: Alan D.
- affiliation: Max Planck Institute for Meteorology
family-names: "K\xF6lling"
given-names: Tobias
- affiliation: NOAA/CIRES/University of Colorado
family-names: Allured
given-names: Dave
- affiliation: HDF Group
family-names: Jelenak
given-names: Aleksandar
- affiliation: EUMETSAT
family-names: Soerensen
given-names: Anders Meier
- affiliation: OceanDataLab
family-names: Gaultier
given-names: Lucile
- affiliation: OceanDataLab
family-names: "Herl\xE9dan"
given-names: Sylvain
- affiliation: Puertos del Estado, Madrid
family-names: Manzano
given-names: Fernando
- affiliation: SMHI Rossby Centre, Swedish Meteorological and Hydrological Institute
cofinoa marked this conversation as resolved.
Show resolved Hide resolved
family-names: "B\xE4rring"
given-names: Lars
orcid: 0000-0001-7280-2502
- affiliation: NOAA
family-names: Barker
given-names: Christopher
- affiliation: National Centre for Atmospheric Science and University of Reading
family-names: Bartholomew
given-names: Sadie L.
orcid: 0000-0002-6180-3603
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ DATE_FORMAT := +%d&\#160;%B,&\#160;%Y
FINAL_TAG := -a final
else
DATE_FORMAT ?= +%d&\#160;%B,&\#160;%Y&\#160;%H:%M:%SZ
FINAL_TAG ?= -a draft
LOCAL_BRANCH=`git name-rev --name-only HEAD`
TRACKING_BRANCH=`git config branch.$LOCAL_BRANCH.merge`
TRACKING_REMOTE=`git config branch.$LOCAL_BRANCH.remote`
REMOTE_URL=`git config remote.$TRACKING_REMOTE.url`
#git config branch.$(git name-rev --name-only HEAD).remote
#git name-rev --name-only HEAD
FINAL_TAG ?= -a draft -a revnumber=v1.12.0-rc7-24-gb724218 -a revremark=${LOCAL_BRANCH}
endif

DATE_DOCPROD != LC_ALL=C date -u "$(DATE_FORMAT)"
Expand Down
27 changes: 25 additions & 2 deletions cf-conventions.adoc
Original file line number Diff line number Diff line change
@@ -1,13 +1,36 @@
include::version.adoc[]
= NetCDF Climate and Forecast (CF) Metadata Conventions
Brian{nbsp}Eaton; Jonathan{nbsp}Gregory; Bob{nbsp}Drach; Karl{nbsp}Taylor; Steve{nbsp}Hankin; Jon{nbsp}Blower; John{nbsp}Caron; Rich{nbsp}Signell; Phil{nbsp}Bentley; Greg{nbsp}Rappa; Heinke{nbsp}Höck; Alison{nbsp}Pamment; Martin{nbsp}Juckes; Martin{nbsp}Raspaud; Randy{nbsp}Horne; Timothy{nbsp}Whiteaker; David{nbsp}Blodgett; Charlie{nbsp}Zender; Daniel{nbsp}Lee; David{nbsp}Hassell; Alan{nbsp}D.{nbsp}Snow; Tobias{nbsp}Kölling; Dave{nbsp}Allured; Aleksandar{nbsp}Jelenak; Anders{nbsp}Meier{nbsp}Soerensen; Lucile{nbsp}Gaultier; Sylvain{nbsp}Herlédan; Fernando{nbsp}Manzano; Lars{nbsp}Bärring; Christopher{nbsp}Barker; Sadie{nbsp}Bartholomew
Version{nbsp}{current-version},{nbsp}{nbsp}{docprodtime}: See{nbsp}https://cfconventions.org{nbsp}for{nbsp}further{nbsp}information.
Brian Eaton; Jonathan Gregory; Bob Drach; Karl Taylor; Steve Hankin; Jon Blower; John Caron; Rich Signell; Phil Bentley; Greg Rappa; Heinke Höck; Alison Pamment; Martin Juckes; Martin Raspaud; Randy Horne; Timothy Whiteaker; David Blodgett; Charlie Zender; Daniel Lee; David Hassell; Alan D. Snow; Tobias Kölling; Dave Allured; Aleksandar Jelenak; Anders Meier Soerensen; Lucile Gaultier; Sylvain Herlédan; Fernando Manzano; Lars Bärring; Christopher Barker; Sadie Bartholomew
cofinoa marked this conversation as resolved.
Show resolved Hide resolved
:revnumber: {current-version}
:revdate: {docprodtime}
:doctype: book
:pdf-folio-placement: physical
:sectanchors:
:toc: macro
:toclevels: 3

<<<
Climate and Forecast Conventions version {current-version} {doi-text}

image:images/cc-zero.svg[, 10%]
This document is dedicated to the public domain following the link:https://creativecommons.org/publicdomain/zero/1.0/[Creative Commons Zero v1.0 Universal] Deed.

The Climate and Forecasting Conventions website https://cfconventions.org/ contains additional resources and provides further information.
ifdef::final[]
+
+
_Use the following reference to cite this version of the document:_ +
Eaton, B., Gregory, J., Drach, B., Taylor, K., Hankin, S. et al. (2023). NetCDF Climate and Forecast (CF) Metadata Conventions ({current-version}). CF Community. https://doi.org/10.5072/zenodo.130529
endif::[]
ifndef::final[]
+
+
_DON’T use the following reference to cite this version of the document, as it is only shown as a draft:_ +
Eaton, B., Gregory, J., Drach, B., Taylor, K., Hankin, S. et al. (2023). NetCDF Climate and Forecast (CF) Metadata Conventions ({current-version}). CF Community. https://doi.org/10.5072/zenodo.130529
cofinoa marked this conversation as resolved.
Show resolved Hide resolved
endif::[]

'''

toc::[]

:numbered!:
Expand Down
6 changes: 6 additions & 0 deletions default-theme-CF-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ page:
margin_inner: 0.75in
margin_outer: 0.59in
size: A4
numbering:
start-at: after-toc
base:
text_align: justify
font_color: 333333
Expand Down Expand Up @@ -274,3 +276,7 @@ footer:
content: '*{page-number}*'
right:
content: 'See https://cfconventions.org for further information'

running-content:
start-at: toc

Loading