Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.1.0 #304

Merged
merged 19 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
40e9e4a
drop six as we don't support python 2 anymore :tada:
jhkennedy Jan 12, 2024
c7c2ec1
add changelog
jhkennedy Jan 12, 2024
84c4c31
Merge pull request #296 from ASFHyP3/cleanup
jhkennedy Jan 12, 2024
5a0142f
Bump ASFHyP3/actions from 0.8.3 to 0.11.0
dependabot[bot] Jan 17, 2024
d2345ff
delete .trufflehog.txt
jtherrmann Feb 19, 2024
94798fc
Bump pypa/gh-action-pypi-publish from 1.8.11 to 1.8.12
dependabot[bot] Feb 27, 2024
f2a7707
Merge pull request #299 from ASFHyP3/dependabot/github_actions/pypa/g…
jtherrmann Jun 25, 2024
a4d6cac
Merge pull request #298 from ASFHyP3/dependabot/github_actions/ASFHyP…
jtherrmann Jun 25, 2024
e5d128e
Bump ASFHyP3/actions from 0.11.0 to 0.11.1
dependabot[bot] Jun 26, 2024
1dc67de
Bump pypa/gh-action-pypi-publish from 1.8.12 to 1.9.0
dependabot[bot] Jun 26, 2024
812069d
Update .github/workflows/changelog.yml
jtherrmann Jun 26, 2024
2e888ad
Merge pull request #301 from ASFHyP3/dependabot/github_actions/ASFHyP…
jtherrmann Jun 26, 2024
6e6de35
Merge branch 'develop' into dependabot/github_actions/pypa/gh-action-…
jtherrmann Jun 26, 2024
4cee0e1
Merge pull request #302 from ASFHyP3/dependabot/github_actions/pypa/g…
jtherrmann Jun 26, 2024
fab066d
drop support for python 3.8 and 3.9
AndrewPlayer3 Jun 26, 2024
b459fd7
changelog for py version drop
AndrewPlayer3 Jun 26, 2024
31243b4
Update CHANGELOG.md
jtherrmann Jun 26, 2024
9044ca6
Merge pull request #303 from ASFHyP3/deprecate_python38
AndrewPlayer3 Jun 26, 2024
79f4b24
Update CHANGELOG.md
jtherrmann Jun 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@ on:
jobs:
call-changelog-check-workflow:
# Docs: https://github.com/ASFHyP3/actions
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.8.3
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
4 changes: 2 additions & 2 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/reusable-version-info.yml@v0.8.3
uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.11.1

distribute:
runs-on: ubuntu-latest
Expand All @@ -30,7 +30,7 @@ jobs:
python -m build

- name: upload to PyPI.org
uses: pypa/gh-action-pypi-publish@v1.8.11
uses: pypa/gh-action-pypi-publish@v1.9.0
with:
user: __token__
password: ${{ secrets.TOOLS_PYPI_PAK }}
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/reusable-labeled-pr-check.yml@v0.8.3
uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.11.1
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/reusable-release-checklist-comment.yml@v0.8.3
uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.11.1
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/reusable-release.yml@v0.8.3
uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.11.1
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/reusable-secrets-analysis.yml@v0.8.3
uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.11.1

call-flake8-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-flake8.yml@v0.8.3
uses: ASFHyP3/actions/.github/workflows/reusable-flake8.yml@v0.11.1
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/reusable-bump-version.yml@v0.8.3
uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.11.1
with:
user: tools-bot
email: [email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ on:
jobs:
call-pytest-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.8.3
uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.11.1
with:
local_package_name: hyp3lib
python_versions: >-
["3.9", "3.10", "3.11", "3.12"]
["3.10", "3.11", "3.12"]
2 changes: 0 additions & 2 deletions .trufflehog.txt

This file was deleted.

8 changes: 7 additions & 1 deletion 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).

## [3.1.0]

### Removed
* Support for Python 3.8 and 3.9 has been dropped, 3.10 is now the minimum version.
* The `six` package has been dropped as a dependency as it's no longer used since we don't support Python 2 anymore.

## [3.0.0]

### Changed
Expand All @@ -14,7 +20,7 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* Updated GitHub Actions to current HyP3 standards.
* Updated formatting using Ruff to pass flake8 check.

### Remove
### Removed
* Support for Python 3.7 and 3.8 has been dropped in line with NumPy and the larger scientific python ecosystem, as described in [NEP-0029](https://numpy.org/neps/nep-0029-deprecation_policy.html) and [SEPC-0000](https://scientific-python.org/specs/spec-0000/)
* All hyp3lib functionality not currently being used by one of these GitHub orgs: ASFHyP3, asfadmin, ASFOpenSARLab, access-cloud-based-insar, dbekaert, ASFBinderRecipes, or insarlab. For a full list of the deleted files, see [here](https://github.com/ASFHyP3/hyp3-lib/pull/286).
* Removed now unused dependencies from `pyproject.toml` and `environment.yml`.
Expand Down
3 changes: 1 addition & 2 deletions 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.9
- python>=3.10
- pip
# For running
- boto3
Expand All @@ -14,7 +14,6 @@ dependencies:
- pillow
- requests
- scipy
- six
- statsmodels
- urllib3
# For packaging, and testing
Expand Down
4 changes: 1 addition & 3 deletions 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 = "hyp3lib"
requires-python = ">=3.9"
requires-python = ">=3.10"
readme = "README.md"
authors = [
{name="ASF APD/Tools Team", email="[email protected]"},
Expand All @@ -17,7 +17,6 @@ classifiers=[
"License :: OSI Approved :: BSD License",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand All @@ -32,7 +31,6 @@ dependencies = [
"pillow",
"requests",
"scipy",
"six",
"statsmodels",
"urllib3",
]
Expand Down
3 changes: 1 addition & 2 deletions src/hyp3lib/get_orb.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@
import sys
from datetime import datetime
from typing import Optional, Tuple
from urllib.parse import urlparse

import requests
from lxml import html
from requests.adapters import HTTPAdapter
from six.moves.urllib.parse import urlparse
from urllib3.util.retry import Retry

from hyp3lib import OrbitDownloadError
from hyp3lib.fetch import download_file


ESA_CREATE_TOKEN_URL = 'https://identity.dataspace.copernicus.eu/auth/realms/CDSE/protocol/openid-connect/token'
ESA_DELETE_TOKEN_URL = 'https://identity.dataspace.copernicus.eu/auth/realms/CDSE/account/sessions'

Expand Down