Merge pull request #235 from ASFHyP3/develop

Release v3.0.0
ASFHyP3 · Sep 5, 2023 · 7821194 · 7821194
2 parents 8ad6b87 + f436870
commit 7821194
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 13 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -12,6 +12,6 @@ on:
 
 jobs:
   call-changelog-check-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.7.1
+    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.8.2
     secrets:
       USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml
@@ -0,0 +1,15 @@
+name: Create Jira issue
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  call-create-jira-issue-workflow:
+    uses: ASFHyP3/actions/.github/workflows/[email protected]
+    secrets:
+      JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
+      JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
+      JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+      JIRA_PROJECT: ${{ secrets.JIRA_PROJECT }}
+      JIRA_FIELDS: ${{ secrets.JIRA_FIELDS }}
diff --git a/.github/workflows/distribute.yml b/.github/workflows/distribute.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   call-version-info-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.7.1
+    uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.8.2
 
   distribute:
     runs-on: ubuntu-latest
@@ -27,7 +27,7 @@ jobs:
           python -m build
 
       - name: upload to PyPI.org
-        uses: pypa/[email protected].5
+        uses: pypa/[email protected].8
         with:
           user: __token__
           password: ${{ secrets.TOOLS_PYPI_PAK }}

diff --git 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.7.1
+    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.8.2
diff --git a/.github/workflows/release-template-comment.yml b/.github/workflows/release-template-comment.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   call-release-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.7.1
+    uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.8.2
     permissions:
       pull-requests: write
     secrets:

diff --git 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.7.1
+    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.8.2
     with:
       release_prefix: HyP3 SDK
     secrets:

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -4,9 +4,9 @@ on: push
 
 jobs:
   call-flake8-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-flake8.yml@v0.7.1
+    uses: ASFHyP3/actions/.github/workflows/reusable-flake8.yml@v0.8.2
     with:
       local_package_names: hyp3_sdk
 
   call-secrets-analysis-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.7.1
+    uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.8.2
diff --git 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.7.1
+    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.8.2
     secrets:
       USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,6 +12,6 @@ on:
 
 jobs:
   call-pytest-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.7.1
+    uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.8.2
     with:
       local_package_name: hyp3_sdk
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ 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.0.0]
+### Removed
+* Removed the `Job.subscription_id` attribute in response to the Subscriptions feature being removed from HyP3.
+
 ## [2.1.1]
 ### Fixed
 * The `user_id` parameter has been moved to the end of the `HyP3.find_jobs` parameter list, to avoid

diff --git a/src/hyp3_sdk/jobs.py b/src/hyp3_sdk/jobs.py
@@ -23,7 +23,6 @@ def __init__(
             request_time: datetime,
             status_code: str,
             user_id: str,
-            subscription_id: Optional[str] = None,
             name: Optional[str] = None,
             job_parameters: Optional[dict] = None,
             files: Optional[List] = None,
@@ -38,7 +37,6 @@ def __init__(
         self.request_time = request_time
         self.status_code = status_code
         self.user_id = user_id
-        self.subscription_id = subscription_id
         self.name = name
         self.job_parameters = job_parameters
         self.files = files
@@ -66,7 +64,6 @@ def from_dict(input_dict: dict):
             request_time=parse_date(input_dict['request_time']),
             status_code=input_dict['status_code'],
             user_id=input_dict['user_id'],
-            subscription_id=input_dict.get('subscription_id'),
             name=input_dict.get('name'),
             job_parameters=input_dict.get('job_parameters'),
             files=input_dict.get('files'),