Skip to content

Commit b6dcdd3

Browse files
authored
Merge pull request #46 from lsst/tickets/DM-53079
DM-53079: Modernize license specifier
2 parents 712baaf + e627853 commit b6dcdd3

File tree

8 files changed

+26
-30
lines changed

8 files changed

+26
-30
lines changed

.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"]
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"
@@ -55,7 +55,7 @@ jobs:
5555
pytest -r a -v -n 3 --cov=python --cov=tests --cov-report=xml --cov-report=term --cov-branch \
5656
--junitxml=junit.xml -o junit_family=legacy
5757
- name: Upload coverage to codecov
58-
uses: codecov/codecov-action@v4
58+
uses: codecov/codecov-action@v5
5959
with:
6060
files: ./coverage.xml
6161
token: ${{ secrets.CODECOV_TOKEN }}
@@ -72,15 +72,15 @@ jobs:
7272
if: startsWith(github.ref, 'refs/tags/')
7373

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

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

8585
- name: Install dependencies
8686
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"

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@v2
45+
uses: actions/checkout@v5
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@v2
49+
uses: github/codeql-action/init@v4
5050
with:
5151
languages: ${{ matrix.language }}
5252
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,7 +57,7 @@ jobs:
5757
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5858
# If this step fails, then you should remove it and run the build manually (see below)
5959
- name: Autobuild
60-
uses: github/codeql-action/autobuild@v2
60+
uses: github/codeql-action/autobuild@v4
6161

6262
# ℹ️ Command-line programs to run using the OS shell.
6363
# 📚 https://git.io/JvXDl
@@ -71,4 +71,4 @@ jobs:
7171
# make release
7272

7373
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@v2
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: |

.github/workflows/mypy.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ build-backend = "setuptools.build_meta"
66
name = "lsst-ctrl-bps-parsl"
77
requires-python = ">=3.11.0"
88
description = "Parsl-based 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.md"
1112
authors = [
1213
{name="Rubin Observatory Data Management", email="[email protected]"},
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",
21+
"Programming Language :: Python :: 3.13",
22+
"Programming Language :: Python :: 3.14",
2123
"Topic :: Scientific/Engineering :: Astronomy",
2224
]
2325
keywords = ["lsst"]
@@ -41,7 +43,6 @@ where = ["python"]
4143

4244
[tool.setuptools]
4345
zip-safe = true
44-
license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"]
4546

4647
[tool.setuptools.package-data]
4748
"lsst.ctrl.bps.parsl" = ["etc/*.yaml"]

0 commit comments

Comments
 (0)