Merge pull request #304 from ASFHyP3/develop

Release 3.1.0
ASFHyP3 · Jun 27, 2024 · 99f4a65 · 99f4a65
2 parents 8952357 + 79f4b24
commit 99f4a65
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 24 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -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]
diff --git 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.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 }}

diff --git a/.github/workflows/distribute.yml b/.github/workflows/distribute.yml
@@ -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
@@ -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 }}

diff --git a/.github/workflows/labeled-pr.yml b/.github/workflows/labeled-pr.yml
@@ -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
diff --git a/.github/workflows/release-checklist-comment.yml b/.github/workflows/release-checklist-comment.yml
@@ -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:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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:

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -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
diff --git a/.github/workflows/tag-version.yml b/.github/workflows/tag-version.yml
@@ -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]

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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"]
diff --git a/.trufflehog.txt b/.trufflehog.txt
diff --git 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).
 
+## [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
@@ -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`.

diff --git a/environment.yml b/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python>=3.9
+  - python>=3.10
   - pip
   # For running
   - boto3
@@ -14,7 +14,6 @@ dependencies:
   - pillow
   - requests
   - scipy
-  - six
   - statsmodels
   - urllib3
   # For packaging, and testing

diff --git a/pyproject.toml b/pyproject.toml
@@ -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]"},
@@ -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",
@@ -32,7 +31,6 @@ dependencies = [
     "pillow",
     "requests",
     "scipy",
-    "six",
     "statsmodels",
     "urllib3",
 ]

diff --git a/src/hyp3lib/get_orb.py b/src/hyp3lib/get_orb.py
@@ -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'