Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 0 additions & 44 deletions .github/workflows/executable_build_test.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
Expand Down
65 changes: 16 additions & 49 deletions .github/workflows/main-branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ on:
jobs:
release:
name: Create GitHub Release
runs-on: windows-2022
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

Expand All @@ -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
})
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 <sam.williams@sentera.com>", "Joseph Franck <joseph.franck@sentera.com>"]

Expand All @@ -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"
Expand Down
Loading