Skip to content

Commit

Permalink
Merge pull request #60 from ASFHyP3/develop
Browse files Browse the repository at this point in the history
Release 0.2.0
  • Loading branch information
jtherrmann authored Jun 27, 2024
2 parents d52a2fc + 83af782 commit cdc1a71
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 17 deletions.
13 changes: 9 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@ on:

jobs:
call-changelog-check-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected]
secrets:
USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: ASFHyP3/actions/.github/workflows/[email protected]
2 changes: 1 addition & 1 deletion .github/workflows/create-jira-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeled-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/tag-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Empty file removed .trufflehog.txt
Empty file.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
1 change: 0 additions & 1 deletion cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -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('-', '_')}}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ jobs:
uses: ASFHyP3/actions/.github/workflows/[email protected]
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/[email protected]
with:
python_version: "3.10"

call-docker-ghcr-workflow:
needs: call-version-info-workflow
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.__project_name}}/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- nodefaults
dependencies:
- python>=3.8
- python>=3.10
- pip
# For packaging, and testing
- flake8
Expand Down
5 changes: 2 additions & 3 deletions {{cookiecutter.__project_name}}/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"},
]
Expand All @@ -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",
Expand Down

0 comments on commit cdc1a71

Please sign in to comment.