Merge branch 'dev' into web_spice_calls

DOI-USGS · Jan 30, 2025 · 9ce522a · 9ce522a
2 parents 1a5363e + 8e8ef4d
commit 9ce522a
Show file tree

Hide file tree

Showing 844 changed files with 76,999 additions and 27,429 deletions.
diff --git a/.github/pr_label_checker.py b/.github/pr_label_checker.py
@@ -42,7 +42,7 @@ def get_pr_attributes(response: Response) -> tuple:
     Get necessary PR attributes.
     """
     pull_response_json = response.json()
-    if len(pull_response_json) == 0:
+    if not pull_response_json:
         # No PRs attributed to the commit
         print(False)
         sys.exit(0)
@@ -64,6 +64,7 @@ def search_for_linked_issues(pull_body: str) -> list:
     # Split the PR body by heading 
     pull_body_list = pull_body.split('##')
     regex_pattern = rf'{ISSUES_URL}(\d)|(#[^\D]\d*)'
+    issue_numbers = []
     for section in pull_body_list:
         # Find section with heading 'Related Issue'
         if section != None and 'Related Issue' in section:
@@ -75,10 +76,7 @@ def search_for_linked_issues(pull_body: str) -> list:
             filtered_list = list(filter(None, flattened_list))
             # Remove '#' from items
             issue_numbers = list(map(lambda item: item.replace('#', ''), filtered_list))
-            return issue_numbers
-    # No linked issues
-    print(False)
-    sys.exit(0)
+    return issue_numbers
 
 
 def get_linked_issues(issue_numbers: list) -> list:
@@ -113,10 +111,6 @@ def get_issue_labels(response_list: list) -> list:
             if label_name not in combined_issue_labels:
                 # Add label if it does not exist
                 combined_issue_labels.append(label_name)
-    if not combined_issue_labels:
-        # No labels to return
-        print(False)
-        sys.exit(0)
     return combined_issue_labels
 
 def update_pr_labels(pull_number: str, combined_issue_labels: list):
@@ -163,9 +157,11 @@ def is_pr_bugfix(response: Response) -> bool:
         response = get_prs_associated_with_commit()
         pull_number, pull_body = get_pr_attributes(response)
         issue_numbers = search_for_linked_issues(pull_body)
-        response_list = get_linked_issues(issue_numbers)
-        combined_issue_labels = get_issue_labels(response_list)
-        update_pr_labels(pull_number, combined_issue_labels)
+        if issue_numbers:
+            response_list = get_linked_issues(issue_numbers)
+            combined_issue_labels = get_issue_labels(response_list)
+            if combined_issue_labels:
+                update_pr_labels(pull_number, combined_issue_labels)
 
         # Check if PR is a bugfix
         response = get_pr(pull_number)

diff --git a/.github/workflows/gitlab-codebuild.yml b/.github/workflows/gitlab-codebuild.yml
@@ -17,9 +17,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Run script
         run: |
-          git config --global user.name "abc"
-          git config --global user.email "abc@example.com"
-          git clone https://isis-codebuild-ci:[email protected]/astamile1/isis-codebuild-ci.git
+          git config --global user.name "Github_CI"
+          git config --global user.email "project_14468_bot_3f7d8e1a392afd88ead5f3f3154e809d@noreply.gitlab.com"
+          git clone https://isis-codebuild-ci:[email protected]/astrogeology/isis-codebuild-ci.git
           cd isis-codebuild-ci
           git checkout -b PR_$PR_NUMBER
           echo -e "\nenv: \n  shell: bash \n  variables: \n    PR_NUMBER: $PR_NUMBER \n    MERGE_BRANCH: $GITHUB_BASE_REF" >> buildspec.yml

diff --git a/.github/workflows/autopr_bugfix.yml → .github/workflows/gitlab-lts.yml b/.github/workflows/autopr_bugfix.yml → .github/workflows/gitlab-lts.yml
@@ -1,4 +1,9 @@
-name: Cherrypick bugfixes to release branch
+name: Github to Gitlab CI - Run CodeBuild (LTS)
+
+env:
+  GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
+  ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+
 on:
   push:
     branches:
@@ -37,32 +42,30 @@ jobs:
     # Print the result to the log
     - name: See result
       run: echo "${{ steps.execute_py_script.outputs.result }}"
-  release_pull_request:
+  build:
     needs: check_labels
     # Only run this step if the code was a bugfix
     if: contains(needs.check_labels.outputs.result, 'true')
     runs-on: ubuntu-latest
-    name: release_pull_request
     steps:
-    - name: checkout
-      uses: actions/[email protected]
-      # Fetch all info including branches + tags
-      with:
-        fetch-depth: 0
-    - name: 'Get Previous tag'
-      id: get_latest_tag
-      uses: "WyriHaximus/github-action-get-previous-tag@v1"
-    - id: get_short_version
-      # Get the major / minor version without patch info i.e. 6.0 from 6.0.1
-      run: |
-        major_minor=$(echo ${{steps.get_latest_tag.outputs.tag}} | cut -d '.' -f 1,2)
-        echo "::set-output name=major_minor::$major_minor"
-    - name: Create PR to branch
-      uses: adamtharani/github-action-cherry-pick@master
-      # PR to the latest feature release.  Merges are enabled
-      with:
-        pr_branch: ${{steps.get_short_version.outputs.major_minor}}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        DRY_RUN: false
-
+      - uses: actions/checkout@v4
+      - name: Run script
+        env:
+          LTS_VERSION: 9.0.0_LTS  # formatted as x.x.x_LTS
+          BASE_LTS: 9.0
+          GITHUB_SHA: ${{ secrets.GITHUB_SHA }}
+        run: |
+          git config --global user.name "Github_CI"
+          git config --global user.email "project_14468_bot_3f7d8e1a392afd88ead5f3f3154e809d@noreply.gitlab.com"
+          git clone https://isis-codebuild-ci:[email protected]/astrogeology/isis-codebuild-ci.git
+          echo $LTS_VERSION
+          cd isis-codebuild-ci
+          if [[ "git ls-remote --exit-code origin $LTS_VERSION" == 2 ]]; then
+            git checkout -b $LTS_VERSION
+          else
+            git checkout $LTS_VERSION
+            git reset --hard origin/main
+          fi
+          echo -e "\nenv: \n  shell: bash \n  variables: \n    LTS_VERSION: $LTS_VERSION \n    BASE_LTS: $BASE_LTS \n    ANACONDA_API_TOKEN: $ANACONDA_TOKEN \n    GITHUB_SHA: $GITHUB_SHA" >> buildspec-lts.yml
+          git commit -a -m "$LTS_VERSION"
+          git push origin $LTS_VERSION --force
diff --git a/.github/workflows/gitlab-release.yml b/.github/workflows/gitlab-release.yml
@@ -0,0 +1,32 @@
+name: Github to Gitlab CI - Run CodeBuild
+
+env:
+  GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
+  ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} 
+
+on:
+  release:
+    types: [prereleased, released]
+  push:
+    branches:
+      - '*.*.*_RC*'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run script
+        env:
+          ISIS_VERSION: ${{ github.event.release.tag_name || github.ref_name }}
+        run: |
+          git config --global user.name "Github_CI"
+          git config --global user.email "project_14468_bot_3f7d8e1a392afd88ead5f3f3154e809d@noreply.gitlab.com"
+          git clone https://isis-codebuild-ci:[email protected]/astrogeology/isis-codebuild-ci.git
+          echo $ISIS_VERSION
+          cd isis-codebuild-ci
+          git checkout -b RELEASE_$ISIS_VERSION
+          echo -e "\nenv: \n  shell: bash \n  variables: \n    ISIS_VERSION: $ISIS_VERSION \n    ANACONDA_API_TOKEN: $ANACONDA_TOKEN" >> buildspec-release.yml
+          git commit -a -m "$ISIS_VERSION"
+          git push origin RELEASE_$ISIS_VERSION --force
+
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
diff --git a/.zenodo.json b/.zenodo.json
@@ -166,6 +166,11 @@
       "affiliation": "United States Geological Survey, Astro Geology Science Center",
       "name": "Fergason, Robin"
     },
+    {
+      "affiliation": "Italian National Institute for Astrophysics (INAF), Istituto di Astrofisica e Planetologia Spaziali (IAPS), Rome, Italy",
+      "name": "Frigeri, Alessandro",
+      "orcid": "0000-0002-9140-3977"   
+    },
     {
       "name": "Gaddis, Lisa"
     },
@@ -336,6 +341,10 @@
     {
       "name": "Miller-Ribelin, Elizabeth"
     },
+    {
+      "affiliation": "Japan Aerospace Exploration Agency, Institute of Space and Astronautical Science",
+      "name": "Murakami, Shin-ya",
+      "orcid": "0000-0002-7137-4849"
     {
       "affiliation": "United States Geological Survey, Astro Geology Science Center",
       "name": "Nelson, Gavin"

diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -176,4 +176,4 @@ Integrated Software for Imagers and Spectrometers Contributors
 
 -----
 This list was generated from the .zenodo.json file by running the
-isis/scripts/zenodo_to_authors.py Python program.
+isis/scripts/zenodo_to_authors.py Python program.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,17 +35,71 @@ release.
 
 ## [Unreleased]
 
+### Added
+
+### Changed
+
+### Fixed
+- Fixed kaguyatc2isis invalid BandBin values [#5629](https://github.com/DOI-USGS/ISIS3/issues/5629)
+- Fixed SpiceClient to handle redirect requests.
+- Fixed jigsaw to default OUTADJUSTMENTH5 option to false and allow this feature to run on read-only images [#5700](https://github.com/DOI-USGS/ISIS3/issues/5700)
+- Fixed Cube::fromIsd to add "LineScanTimes" table from HRSC isds [#5668](https://github.com/DOI-USGS/ISIS3/issues/5668)
+
+## [9.0.0] - 09-25-2024
+
+### Added
+- Added TOVECT output parameter which generate a geospatial CSV file with a VRT metadata sidecar file [#5571](https://github.com/DOI-USGS/ISIS3/issues/5571)  
+- Added Vectorize to ProcessGroundPolygon library
+- Added gtest files for the app and unit test 
+- Added Chandrayaan2 template for isisimport
+- Added majority replacement for reduce app [#5101](https://github.com/DOI-USGS/ISIS3/issues/5101).
+- Added HRSC support in socetlinescankeywords [#5465](https://github.com/DOI-USGS/ISIS3/issues/5465)
+- Added option to save and apply bundle adjustment values in `jigsaw` [#4474](https://github.com/DOI-USGS/ISIS3/issues/4474)
+- Added the ability to pass column types in csv2table to set the column types in the resulting ISIS table [#5631](https://github.com/DOI-USGS/ISIS3/pull/5631)
+
+### Changed
+- Refactored the pixel2map app
+- Updated pixel2map documentation
+- Changed PVL parsing to no longer allow valueless keywords [#5573](https://github.com/DOI-USGS/ISIS3/pull/5573)
+- Changed all `.trn` files with an `Auto`, `Debug` or `Optional` keyword with no value to have a value of `1` [#5573](https://github.com/DOI-USGS/ISIS3/pull/5573)
+- Changed 'User Parameters' group in camstats to UserParameters for PVL compliance [#5625](https://github.com/DOI-USGS/ISIS3/issues/5625).
+
+### Fixed
+- Fixed bug in the method BundleSolutionInfo::outputPointsCSV() where, when performing a rectangular (XYZ) bundle adjustment, the Lat/Lon/Radius point corrections written to points.csv are incorrect and do not match those written to bundleout.txt. Also modified the ctest FunctionalTestJigsawBundleXYZ to spot check six lines (points) in points.csv.
+Issue: [5646](https://github.com/DOI-USGS/ISIS3/issues/5646)
+- Fixed noseam bug where a debugging output statement was inadvertently left in noseam.cpp.
+Issue: [5660](https://github.com/DOI-USGS/ISIS3/issues/5660)
+- Fixed jigsaw bugs in which RADIUS is handled incorrectly in the jigsaw gui and in the bundleout.txt
+file. Slightly modified the FunctionalTestJigsawBundleXYZ ctest accordingly. Issue: [5642](https://github.com/DOI-USGS/ISIS3/issues/5642)
+- Fixed a bug in isisminer in which bad (e.g. self-intersecting) polygon geometries were not treated properly. Added pertinent unit tests to GisGeometry and Strategy classes. Issue: [5612](https://github.com/DOI-USGS/ISIS3/issues/5612)
+- Fixed a bug in kaguyasp2isis that doesn't work for data with a detached label.
+- Fixed FunctionalTestCamstatsDefaultParameters test by increasing the runtime speed [#5459](https://github.com/DOI-USGS/ISIS3/issues/5459)
+- Fixed XmlToJson namespaced key conversion [#5652](https://github.com/DOI-USGS/ISIS3/pull/5652)
+- Fixed PHOTOMET not accepting backplanes [#5281](https://github.com/DOI-USGS/ISIS3/issues/5281)
+- Fixed dstripe parallel test failing by converting tests to gtests [#5613](https://github.com/DOI-USGS/ISIS3/issues/5613)
+- Fixed autoseed SeedDomain = SampleLine only working for first overlap [#5673](https://github.com/DOI-USGS/ISIS3/issues/5673)
+
+## [8.3.0] - 2024-09-30
+
 ### Added
 - Added backplane options for SunIllumination and SurfaceObliqueDetectorResolution to phocube [#5467](https://github.com/DOI-USGS/ISIS3/issues/5467)
+- Added *.history to the ignore list in downloadIsisData
 
 ### Changed
+- Noseam has been refactored to be callable; old Makefile test has been removed and replaced by a gtest. Issue: [#5599](https://github.com/USGS-Astrogeology/ISIS3/issues/5599)
+- Explode has been refactored to be callable; old Makefile test has been removed and replaced by a gtest. Issue: [#5557](https://github.com/USGS-Astrogeology/ISIS3/issues/5557)
+- Isisminer has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5516](https://github.com/USGS-Astrogeology/ISIS3/issues/5516)
+- Algebra has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5594](https://github.com/USGS-Astrogeology/ISIS3/issues/5594)
+- Photrim has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5581](https://github.com/USGS-Astrogeology/ISIS3/issues/5581)
 - Bandtrim has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5571](https://github.com/USGS-Astrogeology/ISIS3/issues/5571)
 - Modified kaguyasp2isis to work with new (detached) data [#5436](https://github.com/DOI-USGS/ISIS3/issues/5436)
 - Added jigsaw error message for csminit'd images without csm parameters[#5486](https://github.com/DOI-USGS/ISIS3/issues/5486)
 - Changed `qwt` dependency version to 6.2.0 or below [#5498](https://github.com/DOI-USGS/ISIS3/issues/5498)
 - Pinned `suitesparse` dependency version to maximum not including 7.7.0 [#5496](https://github.com/DOI-USGS/ISIS3/issues/5496)
 
+
 ### Fixed
+- Fixed a bug in noproj.cpp which left a persisent lbl file after running noproj. [#5577] (https://github.com/DOI-USGS/ISIS3/issues/5577)
 - Fixed a bug in QVIEW's FindTool in which camera was prioritized over projction [#5508](https://github.com/DOI-USGS/ISIS3/issues/5508)
 - Fixed a bug in PolygonTools in which the program exited before attempting to fix an invalid Polygon [#5520](https://github.com/DOI-USGS/ISIS3/issues/5520)
 - Fixed a bug in QVIEW's Stretch tool where the default min/max type was not an available option [#5289](https://github.com/DOI-USGS/ISIS3/issues/5289)