Skip to content

Commit

Permalink
Merge pull request #34 from BaptisteCecconi/master
Browse files Browse the repository at this point in the history
Final EN version after TCG approval and last edits for Endorsed Note doc.
  • Loading branch information
loumir authored Jun 18, 2021
2 parents 879a234 + 181450f commit 1960272
Show file tree
Hide file tree
Showing 5 changed files with 655 additions and 658 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ jobs:
- name: Move the auto-pdf-preview tag
uses: weareyipyip/walking-tag-action@v1
with:
TAG_NAME: auto-pdf-preview
TAG_MESSAGE: |
tag-name: auto-pdf-preview
tag-message: |
Last commit taken into account for the automatically updated PDF preview of this IVOA document.
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Update the PDF preview
uses: Xotl/cool-github-releases@v1
Expand All @@ -61,6 +61,6 @@ jobs:
It will be updated automatically after each merge of a PullRequest.
**DO NOT PUBLISH THIS PRE-RELEASE!**"
_Corresponding commit: ${{ github.sha }}_
assets: ${{ env.doc_name }}-draft.pdf
assets: ${{ env.doc_name }}-draft.pdf;ucd-list.txt
replace_assets: true
github_token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ DOCNAME = UCDlist
DOCVERSION = 1.4

# Publication date, ISO format; update manually for "releases"
DOCDATE = 2021-05-04
DOCDATE = 2021-06-16

# What is it you're writing: NOTE, WD, PR, REC, PEN, or EN
DOCTYPE = PEN
DOCTYPE = EN

# An e-mail address of the person doing the submission to the document
# repository (can be empty until a make upload is being made)
Expand Down
17 changes: 7 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![UCDList version](https://img.shields.io/badge/UCDList-REC--1.3-yellow.svg)
![UCDList version](https://img.shields.io/badge/UCDList-EN--1.4-yellow.svg)
[![Creative Commons License](https://i.creativecommons.org/l/by/4.0/80x15.png)](http://creativecommons.org/licenses/by/4.0/)

# UCDList
Expand All @@ -13,7 +13,8 @@ and used with success to provide semantic annotation for a huge collection of
table columns distributed in the astronomical community.

This version contains new UCD words discussed and accepted by the Semantics
Working Group during the UCD list v1.3 RFM.
Working Group during the [UCD list v1.3 RFM](https://wiki.ivoa.net/twiki/bin/view/IVOA/UCDList_1-3_RFM)
(Request For Modifications) and [v1.4 RFM](https://wiki.ivoa.net/twiki/bin/view/IVOA/UCDList_1-4_RFM).

The list of UCD1+ words is maintained by the UCD Scientific Board, following the
procedure defined in the [UCDList
Expand All @@ -25,11 +26,11 @@ Recommandation](http://www.ivoa.net/documents/latest/UCDlistMaintenance.html).
## Status?

The last stable version is
**[REC-1.3](http://www.ivoa.net/documents/UCD1+/20180527/index.html)**.
**[EN-1.4](https://www.ivoa.net/documents/UCD1+/20210616/index.html)**.

Next version will be 1.4, as an _Endorsed Note_. It is prepared in this reporsitory.
_It is not yet finalized and so, should not be considered
yet as stable for operational implementation._
Next version will be 1.5, as an _Endorsed Note_. It is prepared in this reporsitory.
_It is not yet finalized and so, should not be considered yet as stable for
operational implementation._

See also the section
[Releases](https://github.com/ivoa-std/UCDList/releases) of this GitHub Repository.
Expand Down Expand Up @@ -61,10 +62,6 @@ DOC) should be stored in this repository.

_This process has been described and demonstrated during the IVOA Interoperability Meeting of Oct. 2019 in Groningen ; see [slides](https://wiki.ivoa.net/internal/IVOA/InterOpOct2019GitHub/IVOA_Github.pdf))_

# Test data directory for solar data
Materials from solar data community (coll. V. Delouille, B. Cecconi, etc.)

Include testdata to study mapping of ucds for solar data , and possible inclusion of new terms for solar data collections

# License

Expand Down
Loading

0 comments on commit 1960272

Please sign in to comment.