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

DM-42586: Handle empty ORCiD values in technote.toml #236

Merged
merged 3 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
strategy:
matrix:
python:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}

Expand All @@ -51,9 +51,9 @@ jobs:
with:
username: sqrereadonly
password: ${{ secrets.DOCKERHUB_SQREREADONLY_TOKEN }}
if: matrix.python == '3.10'
if: matrix.python == '3.11'

- name: Check tex builds
run: |
docker run --rm -v `pwd`:/workspace -w /workspace lsstsqre/lsst-texmf:latest sh -c './testTexDocs.sh'
if: matrix.python == '3.10'
if: matrix.python == '3.11'
2 changes: 1 addition & 1 deletion file_templates/copyright/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
2 changes: 1 addition & 1 deletion project_templates/fastapi_safir_app/example/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright (c) 2024 Association of Universities for Research in Astronomy, Inc. (AURA)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
2 changes: 1 addition & 1 deletion project_templates/square_pypi_package/example/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright (c) 2024 Association of Universities for Research in Astronomy, Inc. (AURA)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
title = "example"
copyright = "2023 Association of Universities for Research in Astronomy, Inc. (AURA)"
copyright = "2024 Association of Universities for Research in Astronomy, Inc. (AURA)"

[project.python]
package = "example"
Expand Down
2 changes: 1 addition & 1 deletion project_templates/stack_package/example/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
2 changes: 1 addition & 1 deletion project_templates/stack_package/example_dataonly/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
2 changes: 1 addition & 1 deletion project_templates/stack_package/example_dds/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
2 changes: 1 addition & 1 deletion project_templates/technote_aastex/testn-000/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
2 changes: 1 addition & 1 deletion project_templates/technote_adasstex/testn-000/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
2 changes: 1 addition & 1 deletion project_templates/technote_latex/testn-000/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
2 changes: 1 addition & 1 deletion project_templates/technote_md/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ env.Cookiecutter(
"first_author_author_id": "test",
"first_author_affil_name": "Rubin Observatory",
"first_author_affil_internal_id": "RubinObs",
"first_author_affil_address": ("950 N. Cherry Ave., Tucson, AZ 85719, USA",),
"first_author_affil_address": "950 N. Cherry Ave., Tucson, AZ 85719, USA",
},
)
2 changes: 1 addition & 1 deletion project_templates/technote_md/testn-000/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
2 changes: 1 addition & 1 deletion project_templates/technote_md/testn-000/technote.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ series_id = "TESTN"
canonical_url = "https://testn-000.lsst.io"
github_url = "https://github.com/lsst/testn-000"
github_default_branch = "main"
date_created = 2023-12-17T22:34:53Z
date_created = 2024-01-22T14:59:46Z
organization.name = "Vera C. Rubin Observatory"
organization.ror = "https://ror.org/048g3cy84"
license.id = "CC-BY-4.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ state = "draft"
[[technote.authors]]
name.given = "{{ cookiecutter.first_author_given }}"
name.family = "{{ cookiecutter.first_author_family }}"
orcid = "{{ cookiecutter.first_author_orcid }}"
{%- if cookiecutter.first_author_orcid %}orcid = "{{ cookiecutter.first_author_orcid }}"{% endif %}
internal_id = "{{ cookiecutter.author_id }}"
[[technote.authors.affiliations]]
name = "{{ cookiecutter.first_author_affil_name }}"
internal_id = "{{ cookiecutter.first_author_affil_internal_id }}"
address = "{{ cookiecutter.first_author_affil_address }}"
{%- if cookiecutter.first_author_affil_address %}address = "{{ cookiecutter.first_author_affil_address }}"{% endif %}
5 changes: 3 additions & 2 deletions project_templates/technote_rst/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ env.Cookiecutter(
"series": "TESTN",
"first_author_given": "First",
"first_author_family": "Author",
"first_author_orcid": "https://orcid.org/0000-0003-3001-676X",
# "first_author_orcid": "https://orcid.org/0000-0003-3001-676X",
"first_author_orcid": "",
"first_author_author_id": "test",
"first_author_affil_name": "Rubin Observatory",
"first_author_affil_internal_id": "RubinObs",
"first_author_affil_address": ("950 N. Cherry Ave., Tucson, AZ 85719, USA",),
"first_author_affil_address": "950 N. Cherry Ave., Tucson, AZ 85719, USA",
},
)
2 changes: 1 addition & 1 deletion project_templates/technote_rst/testn-000/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)
5 changes: 2 additions & 3 deletions project_templates/technote_rst/testn-000/technote.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ series_id = "TESTN"
canonical_url = "https://testn-000.lsst.io"
github_url = "https://github.com/lsst/testn-000"
github_default_branch = "main"
date_created = 2023-12-17T22:34:53Z
date_created = 2024-01-22T14:59:46Z
organization.name = "Vera C. Rubin Observatory"
organization.ror = "https://ror.org/048g3cy84"
license.id = "CC-BY-4.0"
Expand All @@ -15,9 +15,8 @@ state = "draft"
[[technote.authors]]
name.given = "First"
name.family = "Author"
orcid = "https://orcid.org/0000-0003-3001-676X"
internal_id = "ID from lsst-texmf/etc/authordb.yaml"
[[technote.authors.affiliations]]
name = "Rubin Observatory"
internal_id = "RubinObs"
address = "('950 N. Cherry Ave., Tucson, AZ 85719, USA',)"
address = "950 N. Cherry Ave., Tucson, AZ 85719, USA"
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ state = "draft"
[[technote.authors]]
name.given = "{{ cookiecutter.first_author_given }}"
name.family = "{{ cookiecutter.first_author_family }}"
orcid = "{{ cookiecutter.first_author_orcid }}"
{%- if cookiecutter.first_author_orcid %}orcid = "{{ cookiecutter.first_author_orcid }}"{% endif %}
internal_id = "{{ cookiecutter.author_id }}"
[[technote.authors.affiliations]]
name = "{{ cookiecutter.first_author_affil_name }}"
internal_id = "{{ cookiecutter.first_author_affil_internal_id }}"
address = "{{ cookiecutter.first_author_affil_address }}"
{%- if cookiecutter.first_author_affil_address %}address = "{{ cookiecutter.first_author_affil_address }}"{% endif %}
2 changes: 1 addition & 1 deletion project_templates/technote_spietex/testn-000/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA)
Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)