Skip to content

Commit 8c28b7f

Browse files
authored
Merge pull request #99 from lsst/tickets/DM-53079
DM-53079: Modernize license specifier
2 parents 6894bb1 + 9ef71d4 commit 8c28b7f

7 files changed

Lines changed: 95 additions & 15 deletions

File tree

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/workflows/build.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
python-version: ["3.11", "3.12", "3.13"]
16+
python-version: ["3.11", "3.12", "3.13", "3.14"]
1717

1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
# Need to clone everything to determine version from git.
2222
fetch-depth: 0
2323

2424
- name: Set up Python
25-
uses: actions/setup-python@v5
25+
uses: actions/setup-python@v6
2626
with:
2727
python-version: ${{ matrix.python-version }}
2828
cache: "pip"
@@ -57,7 +57,7 @@ jobs:
5757
pytest -r a -v --cov=python --cov=tests --cov-report=xml --cov-report=term --cov-branch \
5858
--junitxml=junit.xml -o junit_family=legacy
5959
- name: Upload coverage to codecov
60-
uses: codecov/codecov-action@v4
60+
uses: codecov/codecov-action@v5
6161
with:
6262
files: ./coverage.xml
6363
token: ${{ secrets.CODECOV_TOKEN }}
@@ -74,15 +74,15 @@ jobs:
7474
if: startsWith(github.ref, 'refs/tags/')
7575

7676
steps:
77-
- uses: actions/checkout@v4
77+
- uses: actions/checkout@v5
7878
with:
7979
# Need to clone everything to embed the version.
8080
fetch-depth: 0
8181

8282
- name: Set up Python
83-
uses: actions/setup-python@v5
83+
uses: actions/setup-python@v6
8484
with:
85-
python-version: "3.11"
85+
python-version: "3.13"
8686

8787
- name: Install dependencies
8888
run: |

.github/workflows/build_docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
build_sphinx_docs:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
with:
1515
# Need to clone everything for the git tags.
1616
fetch-depth: 0
1717

1818
- name: Set up Python
19-
uses: actions/setup-python@v5
19+
uses: actions/setup-python@v6
2020
with:
2121
python-version: '3.11'
2222
cache: "pip"
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches:
17+
- main
18+
pull_request:
19+
# The branches below must be a subset of the branches above
20+
branches:
21+
- main
22+
schedule:
23+
- cron: '39 1 * * 3'
24+
25+
jobs:
26+
analyze:
27+
name: Analyze
28+
runs-on: ubuntu-latest
29+
permissions:
30+
actions: read
31+
contents: read
32+
security-events: write
33+
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
language:
38+
- 'python'
39+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
40+
# Learn more:
41+
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
42+
43+
steps:
44+
- name: Checkout repository
45+
uses: actions/checkout@v5
46+
47+
# Initializes the CodeQL tools for scanning.
48+
- name: Initialize CodeQL
49+
uses: github/codeql-action/init@v4
50+
with:
51+
languages: ${{ matrix.language }}
52+
# If you wish to specify custom queries, you can do so here or in a config file.
53+
# By default, queries listed here will override any specified in a config file.
54+
# Prefix the list here with "+" to use these queries and those in the config file.
55+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
56+
57+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
58+
# If this step fails, then you should remove it and run the build manually (see below)
59+
- name: Autobuild
60+
uses: github/codeql-action/autobuild@v4
61+
62+
# ℹ️ Command-line programs to run using the OS shell.
63+
# 📚 https://git.io/JvXDl
64+
65+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
66+
# and modify them (or add more) to build your code if your project
67+
# uses a compiled language
68+
69+
# - run: |
70+
# make bootstrap
71+
# make release
72+
73+
- name: Perform CodeQL Analysis
74+
uses: github/codeql-action/analyze@v4

.github/workflows/do_not_merge.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
'DO NOT MERGE'. Remove this commit from the branch before merging
2727
or change the commit summary."
2828
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
3030

3131
- name: Check requirements.txt for branches
3232
shell: bash

.github/workflows/docstyle.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
numpydoc:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818

1919
- name: Set up Python
20-
uses: actions/setup-python@v5
20+
uses: actions/setup-python@v6
2121

2222
- name: Install numpydoc
2323
run: |

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@ build-backend = "setuptools.build_meta"
66
name = "lsst-ctrl-bps-panda"
77
requires-python = ">=3.11.0"
88
description = "PanDA plugin for lsst-ctrl-bps."
9-
license = {text = "BSD 3-Clause License"}
9+
license = "BSD-3-Clause OR GPL-3.0-or-later"
10+
license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"]
1011
readme = "README.rst"
1112
authors = [
1213
{name="Rubin Observatory Data Management", email="dm-admin@lists.lsst.org"},
1314
]
1415
classifiers = [
1516
"Intended Audience :: Science/Research",
16-
"License :: OSI Approved :: BSD License",
1717
"Operating System :: OS Independent",
1818
"Programming Language :: Python :: 3",
1919
"Programming Language :: Python :: 3.11",
2020
"Programming Language :: Python :: 3.12",
2121
"Programming Language :: Python :: 3.13",
22+
"Programming Language :: Python :: 3.14",
2223
"Topic :: Scientific/Engineering :: Astronomy",
2324
]
2425
keywords = ["lsst"]
@@ -51,7 +52,6 @@ where = ["python"]
5152

5253
[tool.setuptools]
5354
zip-safe = true
54-
license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"]
5555

5656
[tool.setuptools.package-data]
5757
"lsst.ctrl.bps.panda" = ["conf_example/*.yaml"]

0 commit comments

Comments
 (0)