Skip to content

Commit

Permalink
Merge pull request #312 from ASFHyP3/develop
Browse files Browse the repository at this point in the history
Release v3.1.1
  • Loading branch information
jtherrmann authored Oct 15, 2024
2 parents 99f4a65 + 4a54ac4 commit 903344f
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ on:
jobs:
call-changelog-check-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
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/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
secrets:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/distribute.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
call-version-info-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2

distribute:
runs-on: ubuntu-latest
Expand All @@ -20,7 +20,7 @@ jobs:
with:
fetch-depth: 0

- uses: mamba-org/setup-micromamba@v1
- uses: mamba-org/setup-micromamba@v2
with:
environment-file: environment.yml

Expand All @@ -30,7 +30,7 @@ jobs:
python -m build
- name: upload to PyPI.org
uses: pypa/gh-action-pypi-publish@v1.9.0
uses: pypa/gh-action-pypi-publish@v1.10.3
with:
user: __token__
password: ${{ secrets.TOOLS_PYPI_PAK }}
Expand All @@ -46,7 +46,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: mamba-org/setup-micromamba@v1
- uses: mamba-org/setup-micromamba@v2
with:
environment-file: environment.yml

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 @@ -13,4 +13,4 @@ on:
jobs:
call-labeled-pr-check-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
2 changes: 1 addition & 1 deletion .github/workflows/release-checklist-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
call-release-checklist-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
permissions:
pull-requests: write
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
call-release-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
release_prefix: HyP3-lib
secrets:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on: push
jobs:
call-secrets-analysis-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2

call-flake8-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
local_package_names: hyp3lib
2 changes: 1 addition & 1 deletion .github/workflows/tag-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
call-bump-version-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
user: tools-bot
email: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
call-pytest-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
local_package_name: hyp3lib
python_versions: >-
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ 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).

## [3.1.1]

### Fixed
* Pin Python version to `<3.13` because the standard library [`cgi` module](https://docs.python.org/3.12/library/cgi.html) has been removed in Python 3.13. See <https://github.com/ASFHyP3/hyp3-lib/issues/300>.

## [3.1.0]

### Removed
Expand Down
5 changes: 3 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ channels:
- conda-forge
- nodefaults
dependencies:
- python>=3.10
# FIXME: standard lib `cgi` module removed in 3.13: https://github.com/ASFHyP3/hyp3-lib/issues/300
- python>=3.10,<3.13
- pip
# For running
- boto3
Expand All @@ -17,7 +18,7 @@ dependencies:
- statsmodels
- urllib3
# For packaging, and testing
- build
- python-build
- flake8
- flake8-import-order
- flake8-blind-except
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ build-backend = "setuptools.build_meta"

[project]
name = "hyp3lib"
requires-python = ">=3.10"
# FIXME: standard lib `cgi` module removed in 3.13: https://github.com/ASFHyP3/hyp3-lib/issues/300
requires-python = ">=3.10,<3.13"
readme = "README.md"
authors = [
{name="ASF APD/Tools Team", email="[email protected]"},
Expand Down

0 comments on commit 903344f

Please sign in to comment.