diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 87dc20f7..0a0aaea3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 }} @@ -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' diff --git a/file_templates/copyright/COPYRIGHT b/file_templates/copyright/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/file_templates/copyright/COPYRIGHT +++ b/file_templates/copyright/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/fastapi_safir_app/example/LICENSE b/project_templates/fastapi_safir_app/example/LICENSE index 0dd9c566..b7acc140 100644 --- a/project_templates/fastapi_safir_app/example/LICENSE +++ b/project_templates/fastapi_safir_app/example/LICENSE @@ -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 diff --git a/project_templates/sitcom_personal_notebooks/notebooks_example/COPYRIGHT b/project_templates/sitcom_personal_notebooks/notebooks_example/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/sitcom_personal_notebooks/notebooks_example/COPYRIGHT +++ b/project_templates/sitcom_personal_notebooks/notebooks_example/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/square_pypi_package/example/LICENSE b/project_templates/square_pypi_package/example/LICENSE index 21a8f028..733d0334 100644 --- a/project_templates/square_pypi_package/example/LICENSE +++ b/project_templates/square_pypi_package/example/LICENSE @@ -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 diff --git a/project_templates/square_pypi_package/example/docs/documenteer.toml b/project_templates/square_pypi_package/example/docs/documenteer.toml index 8f1c47ff..27b7e859 100644 --- a/project_templates/square_pypi_package/example/docs/documenteer.toml +++ b/project_templates/square_pypi_package/example/docs/documenteer.toml @@ -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" diff --git a/project_templates/stack_package/example/COPYRIGHT b/project_templates/stack_package/example/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/stack_package/example/COPYRIGHT +++ b/project_templates/stack_package/example/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/stack_package/example_dataonly/COPYRIGHT b/project_templates/stack_package/example_dataonly/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/stack_package/example_dataonly/COPYRIGHT +++ b/project_templates/stack_package/example_dataonly/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/stack_package/example_dds/COPYRIGHT b/project_templates/stack_package/example_dds/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/stack_package/example_dds/COPYRIGHT +++ b/project_templates/stack_package/example_dds/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/stack_package/example_pythononly/COPYRIGHT b/project_templates/stack_package/example_pythononly/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/stack_package/example_pythononly/COPYRIGHT +++ b/project_templates/stack_package/example_pythononly/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/stack_package/example_standalone/COPYRIGHT b/project_templates/stack_package/example_standalone/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/stack_package/example_standalone/COPYRIGHT +++ b/project_templates/stack_package/example_standalone/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/stack_package/example_subpackage/COPYRIGHT b/project_templates/stack_package/example_subpackage/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/stack_package/example_subpackage/COPYRIGHT +++ b/project_templates/stack_package/example_subpackage/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/technote_aastex/testn-000/COPYRIGHT b/project_templates/technote_aastex/testn-000/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/technote_aastex/testn-000/COPYRIGHT +++ b/project_templates/technote_aastex/testn-000/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/technote_adasstex/testn-000/COPYRIGHT b/project_templates/technote_adasstex/testn-000/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/technote_adasstex/testn-000/COPYRIGHT +++ b/project_templates/technote_adasstex/testn-000/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/technote_latex/testn-000/COPYRIGHT b/project_templates/technote_latex/testn-000/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/technote_latex/testn-000/COPYRIGHT +++ b/project_templates/technote_latex/testn-000/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/technote_md/SConscript b/project_templates/technote_md/SConscript index 65a5a66a..efbbbddd 100644 --- a/project_templates/technote_md/SConscript +++ b/project_templates/technote_md/SConscript @@ -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", }, ) diff --git a/project_templates/technote_md/testn-000/COPYRIGHT b/project_templates/technote_md/testn-000/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/technote_md/testn-000/COPYRIGHT +++ b/project_templates/technote_md/testn-000/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/technote_md/testn-000/technote.toml b/project_templates/technote_md/testn-000/technote.toml index b1155bd7..f48c3657 100644 --- a/project_templates/technote_md/testn-000/technote.toml +++ b/project_templates/technote_md/testn-000/technote.toml @@ -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" diff --git a/project_templates/technote_md/{{cookiecutter.repo_name}}/technote.toml b/project_templates/technote_md/{{cookiecutter.repo_name}}/technote.toml index 8a82cd8a..daf8624d 100644 --- a/project_templates/technote_md/{{cookiecutter.repo_name}}/technote.toml +++ b/project_templates/technote_md/{{cookiecutter.repo_name}}/technote.toml @@ -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 %} diff --git a/project_templates/technote_rst/SConscript b/project_templates/technote_rst/SConscript index 65a5a66a..491d5053 100644 --- a/project_templates/technote_rst/SConscript +++ b/project_templates/technote_rst/SConscript @@ -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", }, ) diff --git a/project_templates/technote_rst/testn-000/COPYRIGHT b/project_templates/technote_rst/testn-000/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/technote_rst/testn-000/COPYRIGHT +++ b/project_templates/technote_rst/testn-000/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA) diff --git a/project_templates/technote_rst/testn-000/technote.toml b/project_templates/technote_rst/testn-000/technote.toml index b1155bd7..07d98e7b 100644 --- a/project_templates/technote_rst/testn-000/technote.toml +++ b/project_templates/technote_rst/testn-000/technote.toml @@ -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" @@ -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" diff --git a/project_templates/technote_rst/{{cookiecutter.repo_name}}/technote.toml b/project_templates/technote_rst/{{cookiecutter.repo_name}}/technote.toml index 8a82cd8a..daf8624d 100644 --- a/project_templates/technote_rst/{{cookiecutter.repo_name}}/technote.toml +++ b/project_templates/technote_rst/{{cookiecutter.repo_name}}/technote.toml @@ -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 %} diff --git a/project_templates/technote_spietex/testn-000/COPYRIGHT b/project_templates/technote_spietex/testn-000/COPYRIGHT index 018816aa..3bd45d3b 100644 --- a/project_templates/technote_spietex/testn-000/COPYRIGHT +++ b/project_templates/technote_spietex/testn-000/COPYRIGHT @@ -1 +1 @@ -Copyright 2023 Association of Universities for Research in Astronomy, Inc. (AURA) +Copyright 2024 Association of Universities for Research in Astronomy, Inc. (AURA)