From aec2818e51d169064ace28f5b1380174301608e7 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Tue, 28 Oct 2025 16:32:57 -0700 Subject: [PATCH 1/6] Use modern license specifier --- pyproject.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f9a39b39..47ca8528 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,14 +6,14 @@ build-backend = "setuptools.build_meta" name = "lsst-ctrl-bps" requires-python = ">=3.11.0" description = "Pluggable execution of workflow graphs from Rubin pipelines." -license = {text = "BSD 3-Clause License"} +license = "BSD-3-Clause OR GPL-3.0-or-later" +license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"] readme = "README.md" authors = [ {name="Rubin Observatory Data Management", email="dm-admin@lists.lsst.org"}, ] classifiers = [ "Intended Audience :: Science/Research", - "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.11", @@ -49,7 +49,6 @@ where = ["python"] [tool.setuptools] zip-safe = true -license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"] [tool.setuptools.package-data] "lsst.ctrl.bps" = ["etc/*.yaml"] From 7299ade88f2fb76f29563a55faead7f9ee3153d6 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Tue, 28 Oct 2025 16:33:16 -0700 Subject: [PATCH 2/6] Add dependabot config --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..5ace4600 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From 4a9327247da0c2e9e95da75b84e262da9b80ffad Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Tue, 28 Oct 2025 16:33:43 -0700 Subject: [PATCH 3/6] Add 3.14 to build matrix --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 197353f3..b30fae46 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.11", "3.12", "3.13"] + python-version: ["3.11", "3.12", "3.13", "3.14"] steps: - uses: actions/checkout@v4 From c7db5ff73f25460fbe1e1a3629c44658fb75694f Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Tue, 28 Oct 2025 16:44:42 -0700 Subject: [PATCH 4/6] Declare it works with 3.14 --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 47ca8528..8108e9fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,6 +19,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Topic :: Scientific/Engineering :: Astronomy", ] keywords = ["lsst"] From e6aad515b3f7f92a40525067ccf8132d22742470 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Wed, 29 Oct 2025 13:11:54 -0700 Subject: [PATCH 5/6] Add codeql --- .github/workflows/codeql-analysis.yml | 74 +++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 00000000..ec212f35 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,74 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: + - main + pull_request: + # The branches below must be a subset of the branches above + branches: + - main + schedule: + - cron: '39 1 * * 3' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: + - 'python' + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] + # Learn more: + # 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 + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v3 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + # - run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 From 0e66559dd1505b50a13c54f4ab7c222866b10188 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Wed, 29 Oct 2025 13:17:01 -0700 Subject: [PATCH 6/6] Remove incorrect scipy intersphinx mapping --- doc/conf.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/conf.py b/doc/conf.py index 5d66b766..db0241de 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -15,3 +15,10 @@ # Try to pull in links for butler and pipe_base. intersphinx_mapping["lsst"] = ("https://pipelines.lsst.io/v/daily/", None) # noqa intersphinx_mapping["networkx"] = ("https://networkx.org/documentation/stable/", None) # noqa: F405 + +# As a temporary hack until we move to documenteer 2 delete scipy +# (since it no longer works) +try: + del intersphinx_mapping["scipy"] # noqa: F405 +except KeyError: + pass