From 30217e3ba5998b6799f706af7bb245fc6005278e Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Tue, 28 Nov 2023 14:13:19 -0700 Subject: [PATCH 1/3] Refresh pre-commit --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c623a82..ea83283 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-yaml args: @@ -9,14 +9,14 @@ repos: - id: trailing-whitespace - id: check-toml - repo: https://github.com/psf/black - rev: 23.1.0 + rev: 23.11.0 hooks: - id: black # It is recommended to specify the latest version of Python # supported by your project here, or alternatively use # pre-commit's default_language_version, see # https://pre-commit.com/#top_level-default_language_version - language_version: python3.10 + language_version: python3.11 - repo: https://github.com/pycqa/isort rev: 5.12.0 hooks: @@ -24,6 +24,6 @@ repos: name: isort (python) - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.0.275 + rev: v0.1.6 hooks: - id: ruff From 489893d3e8b9867690d79f28fcbe5b05c6dcc286 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Tue, 28 Nov 2023 14:15:08 -0700 Subject: [PATCH 2/3] Drop python 3.10 --- .github/workflows/build.yaml | 4 ++-- .github/workflows/build_docs.yaml | 2 +- pyproject.toml | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 19c3629..070e06d 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.10", "3.11"] + python-version: ["3.11"] steps: - uses: actions/checkout@v3 @@ -73,7 +73,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Install dependencies run: | diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml index defa119..2ba0225 100644 --- a/.github/workflows/build_docs.yaml +++ b/.github/workflows/build_docs.yaml @@ -18,7 +18,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: '3.10' + python-version: '3.11' cache: "pip" cache-dependency-path: "setup.cfg" diff --git a/pyproject.toml b/pyproject.toml index 46207d0..941272f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "lsst-ctrl-bps-panda" -requires-python = ">=3.10.0" +requires-python = ">=3.11.0" description = "PanDA plugin for lsst-ctrl-bps." license = {text = "BSD 3-Clause License"} readme = "README.rst" @@ -16,7 +16,6 @@ classifiers = [ "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Topic :: Scientific/Engineering :: Astronomy", ] @@ -98,7 +97,7 @@ version = { attr = "lsst_versions.get_lsst_version" } [tool.black] line-length = 110 -target-version = ["py310"] +target-version = ["py311"] [tool.isort] profile = "black" @@ -151,7 +150,7 @@ select = [ "UP", # pyupgrade "C4", ] -target-version = "py310" +target-version = "py311" extend-select = [ "RUF100", # Warn about unused noqa ] From d30b49ff08a6c63842f03f67d67200d8270bd035 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Tue, 28 Nov 2023 14:16:03 -0700 Subject: [PATCH 3/3] Put caching configuration in correct part of build action --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 070e06d..6b0fbad 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -20,13 +20,13 @@ jobs: with: # Need to clone everything to determine version from git. fetch-depth: 0 - cache: "pip" - cache-dependency-path: "setup.cfg" - name: Set up Python uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + cache: "pip" + cache-dependency-path: "setup.cfg" - name: Update pip/wheel infrastructure run: |