From 27da050b8a70a8ce2a90adb620363c6b1ca6e112 Mon Sep 17 00:00:00 2001 From: Nicholas Witthoeft Date: Thu, 16 Apr 2026 12:10:34 -0800 Subject: [PATCH 1/5] update imgparse --- poetry.lock | 10 +++++----- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index edfcd6f..1f6ca0f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.1.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.3.3 and should not be changed by hand. [[package]] name = "alabaster" @@ -406,7 +406,7 @@ files = [ [[package]] name = "imgparse" -version = "2.0.10" +version = "2.0.11" description = "Python image-metadata-parser utilities" optional = false python-versions = "^3.10" @@ -426,8 +426,8 @@ s3 = ["boto3", "s3path"] [package.source] type = "git" url = "https://github.com/SenteraLLC/py-image-metadata-parser.git" -reference = "v2.0.10" -resolved_reference = "803240c5b9b416ab97be247a1ec31c8616d5d46c" +reference = "v2.0.11" +resolved_reference = "6012f561469586cc0f95a1decb724a40d7763594" [[package]] name = "iniconfig" @@ -1450,4 +1450,4 @@ test = ["pytest", "pytest-cov"] [metadata] lock-version = "2.1" python-versions = ">=3.10,<4.0" -content-hash = "7e9583f6de50fef9d5c67ea21fe2d7f1f7a3d3cd3b52ff4e1038db4a77a606b4" +content-hash = "c47561bc80220e7e374288b544e235e81a6356a2d8675de2b090eaae1caf6a4d" diff --git a/pyproject.toml b/pyproject.toml index da31902..1a8a3e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ tifffile = "^2022.3.25" pandas = "^1.2.3" tqdm = "^4.59.0" opencv-contrib-python = ">=4.6.0,<4.7.0" -imgparse = {git = "https://github.com/SenteraLLC/py-image-metadata-parser.git", tag = "v2.0.10"} +imgparse = {git = "https://github.com/SenteraLLC/py-image-metadata-parser.git", tag = "v2.0.11"} imageio = "^2.19.3" imagecodecs = "2025.3.30" urllib3 = "<2" From 83bbe5ad42ff06a978798b6c55b7069387066f3f Mon Sep 17 00:00:00 2001 From: Nicholas Witthoeft Date: Thu, 16 Apr 2026 12:10:47 -0800 Subject: [PATCH 2/5] version update --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1a8a3e8..a68c43c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "imgcorrect" -version = "2.1.1" +version = "2.1.2" description = "Library to perform various corrections on imagery from supported sensors" authors = ["Samuel Williams ", "Joseph Franck "] From ae2046ff9d8268e5eafdcdb99daf42f669011ad3 Mon Sep 17 00:00:00 2001 From: Joseph Franck Date: Thu, 16 Apr 2026 15:23:30 -0500 Subject: [PATCH 3/5] update exiftool, update windows --- .github/workflows/executable_build_test.yaml | 2 +- .github/workflows/lint-test.yaml | 6 +++--- .github/workflows/main-branch.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/executable_build_test.yaml b/.github/workflows/executable_build_test.yaml index 317979c..8a6f10d 100644 --- a/.github/workflows/executable_build_test.yaml +++ b/.github/workflows/executable_build_test.yaml @@ -8,7 +8,7 @@ on: jobs: release: name: Build and Test Executables - runs-on: windows-2022 + runs-on: windows-2025 permissions: contents: write diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index aa135f6..cb8c9c2 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -16,9 +16,9 @@ jobs: - name: Install Exiftool run: | - wget https://exiftool.org/Image-ExifTool-13.55.tar.gz - gzip -dc Image-ExifTool-13.55.tar.gz | tar -xf - - cd Image-ExifTool-13.55 + wget https://exiftool.org/Image-ExifTool-13.56.tar.gz + gzip -dc Image-ExifTool-13.56.tar.gz | tar -xf - + cd Image-ExifTool-13.56 perl Makefile.PL sudo make install cd .. diff --git a/.github/workflows/main-branch.yaml b/.github/workflows/main-branch.yaml index 41659a2..828d66a 100644 --- a/.github/workflows/main-branch.yaml +++ b/.github/workflows/main-branch.yaml @@ -9,7 +9,7 @@ on: jobs: release: name: Create GitHub Release - runs-on: windows-2022 + runs-on: windows-2025 permissions: contents: write From 9c91f9e849b6635e9b680633a0705f49f896d500 Mon Sep 17 00:00:00 2001 From: Nicholas Witthoeft Date: Thu, 16 Apr 2026 12:11:58 -0800 Subject: [PATCH 4/5] update env yaml --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 5594269..1403935 100644 --- a/environment.yml +++ b/environment.yml @@ -23,4 +23,4 @@ dependencies: # subpackage dependencies # Sentera dependencies - pip: - - git+https://github.com/SenteraLLC/py-image-metadata-parser.git@v2.0.10 + - git+https://github.com/SenteraLLC/py-image-metadata-parser.git@v2.0.11 From 147fc37a0f95c825e77c96a85dcc4595630ca477 Mon Sep 17 00:00:00 2001 From: Joseph Franck Date: Thu, 16 Apr 2026 15:43:01 -0500 Subject: [PATCH 5/5] revert gha tests and exe builds --- .github/workflows/executable_build_test.yaml | 44 ------------- .github/workflows/main-branch.yaml | 65 +++++--------------- 2 files changed, 16 insertions(+), 93 deletions(-) delete mode 100644 .github/workflows/executable_build_test.yaml diff --git a/.github/workflows/executable_build_test.yaml b/.github/workflows/executable_build_test.yaml deleted file mode 100644 index 8a6f10d..0000000 --- a/.github/workflows/executable_build_test.yaml +++ /dev/null @@ -1,44 +0,0 @@ -name: Build and Test Executables -on: - push: - branches-ignore: - [main] - workflow_dispatch: - -jobs: - release: - name: Build and Test Executables - runs-on: windows-2025 - permissions: - contents: write - - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - - name: Install dependencies - shell: pwsh - run: | - python -m pip install --upgrade pip - pip install pyinstaller - pip install . - - - name: Build EXEs - shell: pwsh - run: | - pyinstaller correct_images_onefile.spec --noconfirm --clean - pyinstaller get_corrections_onefile.spec --noconfirm --clean - - - name: Test EXEs - shell: pwsh - run: | - dist/ImageryCorrector.exe tests/6x_images --output_path dist/6x_images_test_output - dist/GetCorrectionsCsv.exe tests/6x_images --output_path dist/6x_images_test_output_csv - diff --git a/.github/workflows/main-branch.yaml b/.github/workflows/main-branch.yaml index 828d66a..2b6fde9 100644 --- a/.github/workflows/main-branch.yaml +++ b/.github/workflows/main-branch.yaml @@ -9,13 +9,13 @@ on: jobs: release: name: Create GitHub Release - runs-on: windows-2025 + runs-on: ubuntu-22.04 permissions: contents: write steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v3.1.0 with: fetch-depth: 0 @@ -26,54 +26,21 @@ jobs: file: 'pyproject.toml' field: 'tool.poetry.version' - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - - name: Install dependencies - shell: pwsh - run: | - python -m pip install --upgrade pip - pip install pyinstaller - pip install . - - - name: Build EXEs - shell: pwsh - run: | - pyinstaller correct_images_onefile.spec --noconfirm --clean - pyinstaller get_corrections_onefile.spec --noconfirm --clean - pyinstaller correct_images_gui_onefile.spec --noconfirm --clean - - - name: Create zip files - shell: pwsh - run: | - Set-Location $env:GITHUB_WORKSPACE - $version = "${{ steps.read_toml.outputs.value }}" - - if (Test-Path "dist/ImageryCorrector-$version.zip") { Remove-Item "dist/ImageryCorrector-$version.zip" } - if (Test-Path "dist/GetCorrectionsCsv-$version.zip") { Remove-Item "dist/GetCorrectionsCsv-$version.zip" } - if (Test-Path "dist/SenteraRadiometricCorrectionsGUI-$version.zip") { Remove-Item "dist/SenteraRadiometricCorrectionsGUI-$version.zip" } - - Compress-Archive -Path "dist/ImageryCorrector.exe" -DestinationPath "dist/ImageryCorrector-$version.zip" - Compress-Archive -Path "dist/GetCorrectionsCsv.exe" -DestinationPath "dist/GetCorrectionsCsv-$version.zip" - Compress-Archive -Path "dist/SenteraRadiometricCorrectionsGUI.exe" -DestinationPath "dist/SenteraRadiometricCorrectionsGUI-$version.zip" - - - - name: Define TAG - shell: pwsh run: | - "TAG=v${{ steps.read_toml.outputs.value }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - + export VERSION="${{ steps.read_toml.outputs.value }}" + echo "TAG=v$VERSION" >> $GITHUB_ENV - name: Create Release - uses: softprops/action-gh-release@v2 + uses: actions/github-script@v6 with: - tag_name: ${{ env.TAG }} - name: ${{ env.TAG }} - target_commitish: ${{ github.sha }} - generate_release_notes: true - files: | - dist/ImageryCorrector-${{ steps.read_toml.outputs.value }}.zip - dist/GetCorrectionsCsv-${{ steps.read_toml.outputs.value }}.zip - dist/SenteraRadiometricCorrectionsGUI-${{ steps.read_toml.outputs.value }}.zip + result-encoding: string + retries: 3 + script: | + github.rest.repos.createRelease({ + owner: context.repo.owner, + repo: context.repo.repo, + tag_name: process.env.TAG, + target_commitish: context.sha, + name: process.env.TAG, + generate_release_notes: true + }) \ No newline at end of file