From dc174ad1571a43d0f5d58d04345f6c12bcd9c14b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 01:28:15 +0000 Subject: [PATCH 01/12] Bump ASFHyP3/actions from 0.15.0 to 0.17.1 Bumps [ASFHyP3/actions](https://github.com/asfhyp3/actions) from 0.15.0 to 0.17.1. - [Release notes](https://github.com/asfhyp3/actions/releases) - [Changelog](https://github.com/ASFHyP3/actions/blob/develop/CHANGELOG.md) - [Commits](https://github.com/asfhyp3/actions/compare/v0.15.0...v0.17.1) --- updated-dependencies: - dependency-name: ASFHyP3/actions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/create-jira-issue.yml | 2 +- .github/workflows/labeled-pr.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/static-analysis.yml | 6 +++--- .github/workflows/tag-version.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index b7ffba8..f9c09ec 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.github/workflows/create-jira-issue.yml @@ -6,7 +6,7 @@ on: jobs: call-create-jira-issue-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.15.0 + uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.17.1 secrets: JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} diff --git a/.github/workflows/labeled-pr.yml b/.github/workflows/labeled-pr.yml index 2d4eb5b..e125e6f 100644 --- a/.github/workflows/labeled-pr.yml +++ b/.github/workflows/labeled-pr.yml @@ -12,4 +12,4 @@ on: jobs: call-labeled-pr-check-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.15.0 + uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.17.1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e9b5413..5d516c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: call-release-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.15.0 + uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.17.1 with: release_prefix: HyP3 Testing secrets: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index f4a0dde..7ca5b09 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -5,12 +5,12 @@ on: push jobs: call-secrets-analysis-workflow: # Docs: https://github.com/ASFHyP3/actions - uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.15.0 + uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.17.1 call-ruff-workflow: # Docs: https://github.com/ASFHyP3/actions - uses: ASFHyP3/actions/.github/workflows/reusable-ruff.yml@v0.15.0 + uses: ASFHyP3/actions/.github/workflows/reusable-ruff.yml@v0.17.1 call-mypy-workflow: # Docs: https://github.com/ASFHyP3/actions - uses: ASFHyP3/actions/.github/workflows/reusable-mypy.yml@v0.15.0 + uses: ASFHyP3/actions/.github/workflows/reusable-mypy.yml@v0.17.1 diff --git a/.github/workflows/tag-version.yml b/.github/workflows/tag-version.yml index b801397..7502207 100644 --- a/.github/workflows/tag-version.yml +++ b/.github/workflows/tag-version.yml @@ -7,6 +7,6 @@ on: jobs: call-bump-version-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.15.0 + uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.17.1 secrets: USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }} From b67012c03bff073846656d39b5954a254cedf955 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 7 Feb 2025 17:23:35 -0900 Subject: [PATCH 02/12] Update pyproject.toml --- pyproject.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1e21ea1..717f4f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,14 +70,17 @@ quote-style = "single" [tool.ruff.lint] extend-select = [ "I", # isort: https://docs.astral.sh/ruff/rules/#isort-i - + "D", # pydocstyle: https://docs.astral.sh/ruff/rules/#pydocstyle-d + # TODO: uncomment the following extensions and address their warnings: #"UP", # pyupgrade: https://docs.astral.sh/ruff/rules/#pyupgrade-up - #"D", # pydocstyle: https://docs.astral.sh/ruff/rules/#pydocstyle-d #"ANN", # annotations: https://docs.astral.sh/ruff/rules/#flake8-annotations-ann #"PTH", # use-pathlib-pth: https://docs.astral.sh/ruff/rules/#flake8-use-pathlib-pth ] +[tool.ruff.lint.extend-per-file-ignores] +"tests/*" = ["D100", "D103", "ANN"] + [tool.ruff.lint.pydocstyle] convention = "google" From 0ccef7571430d83ac0663bfd687bd27ad8f9d4b5 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 7 Feb 2025 17:24:20 -0900 Subject: [PATCH 03/12] Update environment.yml --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index a6f49d0..0380178 100644 --- a/environment.yml +++ b/environment.yml @@ -16,11 +16,11 @@ dependencies: - pytest-cov - pytest-dependency - pytest-timeout - - ruff - - mypy - rasterio - wheel - xarray - remotezip - rioxarray - opencv<4.9.0 # https://github.com/conda-forge/opencv-feedstock/issues/400 + - pip: + - -r requirements-static.txt From 624394a87d678dbeac50437ed68395d0ccb98d2d Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 7 Feb 2025 17:25:15 -0900 Subject: [PATCH 04/12] Create requirements-static.txt --- requirements-static.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 requirements-static.txt diff --git a/requirements-static.txt b/requirements-static.txt new file mode 100644 index 0000000..0a4e621 --- /dev/null +++ b/requirements-static.txt @@ -0,0 +1,2 @@ +ruff==0.9.5 +mypy==1.15.0 From 7e70f314e474ffbebc5e7af72c1890700e950735 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Sun, 9 Feb 2025 02:51:20 +0000 Subject: [PATCH 05/12] update dependabot config --- .github/dependabot.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2363253..f95d8a5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,9 +1,19 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + version: 2 updates: - - package-ecosystem: "github-actions" - directory: "/" + - package-ecosystem: pip + directory: / schedule: - # Check for updates to GitHub Actions every weekday - interval: "daily" + interval: weekly labels: - - "bumpless" + - bumpless + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + labels: + - bumpless From 4f94ccfb3f2399bace4762c633a88901cd762fc0 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Sun, 9 Feb 2025 02:56:14 +0000 Subject: [PATCH 06/12] add requirements-static.txt --- requirements-static.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 requirements-static.txt diff --git a/requirements-static.txt b/requirements-static.txt new file mode 100644 index 0000000..13ae602 --- /dev/null +++ b/requirements-static.txt @@ -0,0 +1,2 @@ +ruff==0.9.5 +mypy==1.14.1 From 591d710458c2cdfdeb37f089786a04562e157fbe Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Sun, 9 Feb 2025 03:09:18 +0000 Subject: [PATCH 07/12] install requirements-static.txt from environment.yml --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index a6f49d0..0380178 100644 --- a/environment.yml +++ b/environment.yml @@ -16,11 +16,11 @@ dependencies: - pytest-cov - pytest-dependency - pytest-timeout - - ruff - - mypy - rasterio - wheel - xarray - remotezip - rioxarray - opencv<4.9.0 # https://github.com/conda-forge/opencv-feedstock/issues/400 + - pip: + - -r requirements-static.txt From 8ab120cd5a9d3564ac694f159184afd7cf47028f Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Sun, 9 Feb 2025 03:31:20 +0000 Subject: [PATCH 08/12] bump version for ruff and mypy actions --- .github/workflows/static-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index f4a0dde..a1d067b 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -9,8 +9,8 @@ jobs: call-ruff-workflow: # Docs: https://github.com/ASFHyP3/actions - uses: ASFHyP3/actions/.github/workflows/reusable-ruff.yml@v0.15.0 + uses: ASFHyP3/actions/.github/workflows/reusable-ruff.yml@v0.17.1 call-mypy-workflow: # Docs: https://github.com/ASFHyP3/actions - uses: ASFHyP3/actions/.github/workflows/reusable-mypy.yml@v0.15.0 + uses: ASFHyP3/actions/.github/workflows/reusable-mypy.yml@v0.17.1 From 40210abaadf585270b353749cf96d2e3b90005c0 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Sun, 9 Feb 2025 03:52:15 +0000 Subject: [PATCH 09/12] update ruff config --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 1e21ea1..6a7dbc6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -85,6 +85,9 @@ convention = "google" case-sensitive = true lines-after-imports = 2 +[tool.ruff.lint.extend-per-file-ignores] +"tests/*" = ["D100", "D103", "ANN"] + [tool.mypy] python_version = "3.10" warn_redundant_casts = true From db244674f35ebaf7f20706e118447f81b0925210 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Mon, 10 Feb 2025 12:01:27 -0900 Subject: [PATCH 10/12] Delete duplicate ruff options --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1c36bc5..717f4f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,9 +88,6 @@ convention = "google" case-sensitive = true lines-after-imports = 2 -[tool.ruff.lint.extend-per-file-ignores] -"tests/*" = ["D100", "D103", "ANN"] - [tool.mypy] python_version = "3.10" warn_redundant_casts = true From 9f317cbcc2bc4fc6641754bf54a4f96c711fdc34 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Mon, 10 Feb 2025 21:22:19 +0000 Subject: [PATCH 11/12] comment out ruff docstring ext --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1c36bc5..f187465 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,10 +70,10 @@ quote-style = "single" [tool.ruff.lint] extend-select = [ "I", # isort: https://docs.astral.sh/ruff/rules/#isort-i - "D", # pydocstyle: https://docs.astral.sh/ruff/rules/#pydocstyle-d # TODO: uncomment the following extensions and address their warnings: #"UP", # pyupgrade: https://docs.astral.sh/ruff/rules/#pyupgrade-up + #"D", # pydocstyle: https://docs.astral.sh/ruff/rules/#pydocstyle-d #"ANN", # annotations: https://docs.astral.sh/ruff/rules/#flake8-annotations-ann #"PTH", # use-pathlib-pth: https://docs.astral.sh/ruff/rules/#flake8-use-pathlib-pth ] From 7c2929881d7977d966631ea947499a0b5d3ba2f1 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Mon, 10 Feb 2025 21:23:24 +0000 Subject: [PATCH 12/12] delete whitespace --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0d4e65c..b81c573 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,7 +70,7 @@ quote-style = "single" [tool.ruff.lint] extend-select = [ "I", # isort: https://docs.astral.sh/ruff/rules/#isort-i - + # TODO: uncomment the following extensions and address their warnings: #"UP", # pyupgrade: https://docs.astral.sh/ruff/rules/#pyupgrade-up #"D", # pydocstyle: https://docs.astral.sh/ruff/rules/#pydocstyle-d