diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f2494b1..82990ed 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 diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 0120a6b..6047ddb 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -13,6 +13,4 @@ on: jobs: call-changelog-check-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.9.0 - secrets: - USER_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.11.1 diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index e87e1c2..129ff5f 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.9.0 + uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.11.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 64b1b10..3ba2160 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.9.0 + uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.11.1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8d8a30..2e7ba9d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: call-release-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.9.0 + uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.11.1 with: release_prefix: HyP3 Cookiecutter secrets: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 9719cea..a53886d 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -4,4 +4,4 @@ on: push jobs: call-secrets-analysis-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.9.0 + uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.11.1 diff --git a/.github/workflows/tag-version.yml b/.github/workflows/tag-version.yml index b97e0a7..7bc7924 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.9.0 + uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.11.1 secrets: USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }} diff --git a/.trufflehog.txt b/.trufflehog.txt deleted file mode 100644 index e69de29..0000000 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fa0e5a..99ca83e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ 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.2.0] +### Removed +* Support for Python 3.8 and 3.9 has been dropped. The minimum version is now 3.10. +### Fixed +* Removed the deprecated `jinja2_time.TimeExtension` from the cookiecutter config + ## [0.1.3] ### Changed * Upgraded to `hyp3lib=>3,<4`. diff --git a/cookiecutter.json b/cookiecutter.json index 0336e34..166a212 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -5,7 +5,6 @@ "short_description": "HyP3 plugin for {{cookiecutter.process_type}} processing", "public_url": "https://github.com/ASFHyP3/hyp3-{{cookiecutter.process_type}}", "copyright_year": "{% now 'utc', '%Y' %}", - "_extensions": ["jinja2_time.TimeExtension"], "__project_name": "hyp3-{{cookiecutter.process_type | lower}}", "__project_title": "HyP3 {{cookiecutter.process_type}}", "__package_name": "hyp3_{{cookiecutter.process_type | lower | replace('-', '_')}}", diff --git a/{{cookiecutter.__project_name}}/.github/workflows/test-and-build.yml b/{{cookiecutter.__project_name}}/.github/workflows/test-and-build.yml index 876a014..30ab6b8 100644 --- a/{{cookiecutter.__project_name}}/.github/workflows/test-and-build.yml +++ b/{{cookiecutter.__project_name}}/.github/workflows/test-and-build.yml @@ -16,10 +16,14 @@ jobs: uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.7.1 with: local_package_name: {{ cookiecutter.__package_name }} + python_versions: >- + ["3.10", "3.11", "3.12"] call-version-info-workflow: # Docs: https://github.com/ASFHyP3/actions uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.7.1 + with: + python_version: "3.10" call-docker-ghcr-workflow: needs: call-version-info-workflow diff --git a/{{cookiecutter.__project_name}}/environment.yml b/{{cookiecutter.__project_name}}/environment.yml index 71ce14a..f41a2b0 100644 --- a/{{cookiecutter.__project_name}}/environment.yml +++ b/{{cookiecutter.__project_name}}/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge - nodefaults dependencies: - - python>=3.8 + - python>=3.10 - pip # For packaging, and testing - flake8 diff --git a/{{cookiecutter.__project_name}}/pyproject.toml b/{{cookiecutter.__project_name}}/pyproject.toml index 4cff35f..ffb84d7 100644 --- a/{{cookiecutter.__project_name}}/pyproject.toml +++ b/{{cookiecutter.__project_name}}/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "{{ cookiecutter.__package_name }}" -requires-python = ">=3.8" +requires-python = ">=3.10" authors = [ {name="{{ cookiecutter.github_username }}", email="{{ cookiecutter.github_email }}"}, ] @@ -16,10 +16,9 @@ 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", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] dependencies = [ "hyp3lib>=3,<4",