From ef142ef288930a545fd5ccea399e3d4258ebfc56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 20:01:25 +0000 Subject: [PATCH 01/13] Bump ASFHyP3/actions from 0.8.2 to 0.11.0 Bumps [ASFHyP3/actions](https://github.com/asfhyp3/actions) from 0.8.2 to 0.11.0. - [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.8.2...v0.11.0) --- updated-dependencies: - dependency-name: ASFHyP3/actions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/changelog.yml | 2 +- .github/workflows/create-jira-issue.yml | 2 +- .github/workflows/distribute.yml | 2 +- .github/workflows/labeled-pr.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- .github/workflows/tag-version.yml | 2 +- .github/workflows/test-and-build.yml | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 600e8b80..3a6e8956 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -11,6 +11,6 @@ on: - develop jobs: call-changelog-check-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.8.2 + uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.11.0 secrets: USER_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index 3615af15..0b69efec 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.8.2 + uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.11.0 secrets: JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} diff --git a/.github/workflows/distribute.yml b/.github/workflows/distribute.yml index bad4d8b1..7be379b1 100644 --- a/.github/workflows/distribute.yml +++ b/.github/workflows/distribute.yml @@ -7,7 +7,7 @@ on: jobs: call-version-info-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.8.2 + uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.11.0 distribute: runs-on: ubuntu-latest diff --git a/.github/workflows/labeled-pr.yml b/.github/workflows/labeled-pr.yml index ee8a5f5e..66ba502e 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.8.2 + uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.11.0 diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 723ac27b..4cb50640 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -24,4 +24,4 @@ jobs: call-secrets-analysis-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.8.2 + uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.11.0 diff --git a/.github/workflows/tag-version.yml b/.github/workflows/tag-version.yml index 5053fe62..4714c1f1 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.8.2 + uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.11.0 secrets: USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }} diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index c9fa0d38..b28111c3 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -12,16 +12,16 @@ on: jobs: call-pytest-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.8.2 + uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.11.0 with: local_package_name: asf_tools call-version-info-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.8.2 + uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.11.0 call-docker-ghcr-workflow: needs: call-version-info-workflow - uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.8.2 + uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.11.0 with: version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }} secrets: From f5f2f6bbb9c1ac99fb9544f9051b50f21eb5a01c Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Mon, 19 Feb 2024 15:04:32 -0900 Subject: [PATCH 02/13] delete .trufflehog.txt --- .trufflehog.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .trufflehog.txt diff --git a/.trufflehog.txt b/.trufflehog.txt deleted file mode 100644 index f424c2c3..00000000 --- a/.trufflehog.txt +++ /dev/null @@ -1,3 +0,0 @@ -.*gitleaks.toml$ -.*\.pyt\.xml$ -.*water-extent-map-on-demand.ipynb$ From 885b7ad6cfc2b87066fdeae56277aeb82f88f499 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 19:20:22 +0000 Subject: [PATCH 03/13] Bump pypa/gh-action-pypi-publish from 1.8.12 to 1.8.14 Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.8.12 to 1.8.14. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.12...v1.8.14) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/distribute.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/distribute.yml b/.github/workflows/distribute.yml index 4ac1e70e..52f4c8e1 100644 --- a/.github/workflows/distribute.yml +++ b/.github/workflows/distribute.yml @@ -29,7 +29,7 @@ jobs: python -m build - name: upload to PyPI.org - uses: pypa/gh-action-pypi-publish@v1.8.12 + uses: pypa/gh-action-pypi-publish@v1.8.14 with: user: __token__ password: ${{ secrets.TOOLS_PYPI_PAK }} From 92441e7d9c9da984e9e9bf88d8b409f89273eaf0 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Tue, 30 Apr 2024 11:01:37 -0800 Subject: [PATCH 04/13] Update dependabot.yml to weekly --- .github/dependabot.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f2494b1b..82990ed2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,8 +1,13 @@ +# 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: github-actions + directory: / schedule: - interval: "daily" + interval: weekly labels: - - "bumpless" + - bumpless From 0cd5bf8139b31f605506c3fed8bd1664d7a2e315 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 19:35:04 +0000 Subject: [PATCH 05/13] Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.9.0 Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.8.14 to 1.9.0. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.14...v1.9.0) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/distribute.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/distribute.yml b/.github/workflows/distribute.yml index 52f4c8e1..dd1d1c69 100644 --- a/.github/workflows/distribute.yml +++ b/.github/workflows/distribute.yml @@ -29,7 +29,7 @@ jobs: python -m build - name: upload to PyPI.org - uses: pypa/gh-action-pypi-publish@v1.8.14 + uses: pypa/gh-action-pypi-publish@v1.9.0 with: user: __token__ password: ${{ secrets.TOOLS_PYPI_PAK }} From 89e0df95114cda810fc80d4401b1a0f592dded46 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Tue, 25 Jun 2024 13:17:15 -0500 Subject: [PATCH 06/13] pin python version to <3.12 because of sk-fuzzy --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 1f49abd9..bb83f9fe 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: # - esri # windows only - nodefaults dependencies: - - python>=3.8 + - python>=3.8, <3.12 - pip # For packaging, and testing # - arcpy # windows only From 1de1bff7c2767528f4790f3a3beee08a517ca655 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Tue, 25 Jun 2024 13:34:36 -0500 Subject: [PATCH 07/13] specify 3.10 and 3.11 as 3.12 doesn't work currently --- .github/workflows/test-and-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index b28111c3..4da42084 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -15,6 +15,8 @@ jobs: uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.11.0 with: local_package_name: asf_tools + python_versions: >- # Optional; default shown + ["3.10", "3.11"] call-version-info-workflow: uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.11.0 From c92e56abe9451c333ea1e1e3ae4edd0030a50894 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Wed, 26 Jun 2024 13:09:15 -0500 Subject: [PATCH 08/13] Minimum python version is now 3.10 --- environment.yml | 2 +- prototype/osl-env.yml | 2 +- pyproject.toml | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/environment.yml b/environment.yml index bb83f9fe..e63de9a7 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: # - esri # windows only - nodefaults dependencies: - - python>=3.8, <3.12 + - python>=3.10, <3.12 - pip # For packaging, and testing # - arcpy # windows only diff --git a/prototype/osl-env.yml b/prototype/osl-env.yml index 0d1937f7..8bc25a3f 100644 --- a/prototype/osl-env.yml +++ b/prototype/osl-env.yml @@ -3,7 +3,7 @@ channels: - conda-forge - nodefaults dependencies: - - python>=3.8 + - python>=3.10 - pip # For running - asf_search>=0.4 diff --git a/pyproject.toml b/pyproject.toml index d2ac7a58..2b03d564 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "asf_tools" -requires-python = ">=3.8" +requires-python = ">=3.10" authors = [ {name="ASF APD/Tools Team", email="uaf-asf-apd@alaska.edu"}, ] @@ -17,8 +17,6 @@ classifiers=[ "Natural Language :: English", "Operating System :: OS Independent", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", ] dependencies = [ From 570b1f724bcae1d731dffbab3e33ccd59d029474 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Wed, 26 Jun 2024 13:12:15 -0500 Subject: [PATCH 09/13] Changelog for Python Bump --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c0072a3..18771184 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/) and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.8.0] + +### Removed +- Support for Python 3.8 and 3.9 has been removed. ## [0.7.2] From dde243e1de1031508ed68bf9fe2d7408950d0dc7 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Wed, 26 Jun 2024 13:14:01 -0500 Subject: [PATCH 10/13] Version less than 3.12 --- prototype/osl-env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prototype/osl-env.yml b/prototype/osl-env.yml index 8bc25a3f..bfd30a2d 100644 --- a/prototype/osl-env.yml +++ b/prototype/osl-env.yml @@ -3,7 +3,7 @@ channels: - conda-forge - nodefaults dependencies: - - python>=3.10 + - python>=3.10, <3.12 - pip # For running - asf_search>=0.4 From c945ee65152ea3a89709c21d5cd521ad32f9ab73 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Wed, 26 Jun 2024 13:27:25 -0500 Subject: [PATCH 11/13] version workflow to 3.10 --- .github/workflows/tag-version.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tag-version.yml b/.github/workflows/tag-version.yml index 4714c1f1..5485d4ad 100644 --- a/.github/workflows/tag-version.yml +++ b/.github/workflows/tag-version.yml @@ -8,5 +8,7 @@ on: jobs: call-bump-version-workflow: uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.11.0 + with: + python_version: "3.10" secrets: USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }} From eada976887dcc029d6ea39bf2ea00430ad14dd82 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Wed, 26 Jun 2024 13:31:58 -0500 Subject: [PATCH 12/13] version workflow bump to 3.10 --- .github/workflows/tag-version.yml | 2 -- .github/workflows/test-and-build.yml | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tag-version.yml b/.github/workflows/tag-version.yml index 5485d4ad..4714c1f1 100644 --- a/.github/workflows/tag-version.yml +++ b/.github/workflows/tag-version.yml @@ -8,7 +8,5 @@ on: jobs: call-bump-version-workflow: uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.11.0 - with: - python_version: "3.10" secrets: USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }} diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 4da42084..35a5a996 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -20,6 +20,8 @@ jobs: call-version-info-workflow: uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.11.0 + with: + python_version: "3.10" call-docker-ghcr-workflow: needs: call-version-info-workflow From b2d9184a9f9aab671e8853a434c25af22529d6d5 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Wed, 26 Jun 2024 14:20:44 -0500 Subject: [PATCH 13/13] add 3.11 to pyproj --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 2b03d564..da7ccc57 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,6 +18,7 @@ classifiers=[ "Operating System :: OS Independent", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", ] dependencies = [ "astropy",