Merge pull request #161 from IGNF/dev

Update workflows
IGNF · Oct 7, 2024 · a1b82e4 · a1b82e4
2 parents 4382275 + d426ada
commit a1b82e4
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 148 deletions.
diff --git a/.github/workflows/test_mac.yml → .github/workflows/test_conda.yml b/.github/workflows/test_mac.yml → .github/workflows/test_conda.yml
@@ -1,13 +1,18 @@
-name: test_macos
+name: test_conda
 
 on:
   push:
     branches: [main]
   pull_request:
 
 jobs:
-  test:
-    runs-on: macos-latest
+  test-on-conda:
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
     permissions:
       contents: read
       packages: write
@@ -16,9 +21,10 @@ jobs:
     - name: Checkout branch
       uses: actions/checkout@v4
 
-    - name: Install environment
+    - name: Install environment on ${{ matrix.os }} with python:${{ matrix.python-version }}
       uses: mamba-org/setup-micromamba@v1
       with:
+        python-version: ${{ matrix.python-version }}
         environment-file: borea_dependency/environment-dev.yml
         environment-name: borea
         cache-environment: true

diff --git a/.github/workflows/test_pip.yml b/.github/workflows/test_pip.yml
@@ -0,0 +1,111 @@
+name: test_pip
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+jobs:
+  test-on-pip:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+      fail-fast: false
+
+    steps:
+    - name: Checkout branch
+      uses: actions/checkout@v4
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install environment
+      run: |
+        sudo apt-get update
+        sudo apt-get install gdal-bin libgdal-dev
+        export CPLUS_INCLUDE_PATH=/usr/include/gdal
+        export C_INCLUDE_PATH=/usr/include/gdal
+        python -m venv boreaenv
+        source boreaenv/bin/activate
+        python -m pip install --upgrade pip
+        python -m pip install setuptools wheel
+        python -m pip install -r ./borea_dependency/requirements-dev.txt
+        python -m pip install GDAL==3.4.1
+
+    - name: test version python
+      run: |
+        source boreaenv/bin/activate
+        python --version
+        python -m pip list
+        python -c "from osgeo import gdal_array"
+
+    - name: Run unit tests with pytest
+      run: |
+        source boreaenv/bin/activate
+        ./ci/test_all.sh
+
+    - name: Run test example
+      run: |
+        source boreaenv/bin/activate
+        ./ci/test_example.sh
+
+    - name: Run regression test opk to opk
+      run: |
+        source boreaenv/bin/activate
+        python ./borea_tools/opk_to_opk.py -r ./dataset/23FD1305_alt_test.OPK -i NXYZOPKC -f 2 -e 2154 -y ./dataset/fr_ign_RAF20.tif -c ./dataset/Camera1.txt -m ./dataset/MNT_France_25m_h_crop.tif --fm height -n Test -w ./test/tmp/ -o NXYHPOKC --ou radian --oa False
+
+    - name: Run regression test opk to opk with multi epsg
+      run : |
+        source boreaenv/bin/activate
+        python ./borea_tools/opk_to_opk.py -r ./dataset/23FD1305_alt_test.OPK -i NXYZOPKC -f 2 -e 2154 --geoc 4964 -y ./dataset/fr_ign_RAF20.tif -c ./dataset/Camera1.txt -m ./dataset/MNT_France_25m_h_crop.tif --fm height -n Test -w ./test/tmp/ -o NXYHPOKC --ou radian --oa False
+
+    - name: Run regression test control opk
+      run: |
+        source boreaenv/bin/activate
+        python ./borea_tools/opk_control.py -r ./dataset/23FD1305_alt_test.OPK -i NXYZOPKC -f 2 -c ./dataset/Camera1.txt -e 2154 -y ./dataset/fr_ign_RAF20.tif -m ./dataset/MNT_France_25m_h_crop.tif --fm height -t ./dataset/terrain_test.mes -g ./dataset/GCP_test.app -d 13 -l PTXYH -p inter -w ./test/tmp/
+
+    - name: Run regression test opk to rpc
+      run: |
+        source boreaenv/bin/activate
+        python ./borea_tools/opk_to_rpc.py -r ./dataset/23FD1305_alt_test.OPK -i NXYZOPKC -f 2 -c ./dataset/Camera1.txt -e 2154 -y ./dataset/fr_ign_RAF20.tif -m ./dataset/MNT_France_25m_h_crop.tif --fm height -o 3
+
+    - name: Run regression test calc pt image to world
+      run: |
+        source boreaenv/bin/activate
+        python ./borea_tools/pt_image_to_world.py -n Test -s 814975.925 6283986.148 1771.280 -t altitude -o -0.245070686036 -0.069409621323 0.836320989726 -b opk -u degree -a True -e 2154 -y ./dataset/fr_ign_RAF20.tif -c ./dataset/Camera1.txt -m ./dataset/MNT_France_25m_h_crop.tif --fm height -p 24042.25 14781.17 -d height
+
+    - name: Run regression test calc pt world to image
+      run: |
+        source boreaenv/bin/activate
+        python ./borea_tools/pt_world_to_image.py -n Test -s 814975.925 6283986.148 1771.280 -t altitude -o -0.245070686036 -0.069409621323 0.836320989726 -b opk -u degree -a True -e 2154 -y ./dataset/fr_ign_RAF20.tif -c ./dataset/Camera1.txt -m ./dataset/MNT_France_25m_h_crop.tif --fm height -p 815601.510 6283629.280 54.960 -d height
+
+    - name: Run regression test calc file pt world to image
+      run: |
+        source boreaenv/bin/activate
+        python ./borea_tools/ptfile_world_to_image.py -r ./dataset/23FD1305_alt_test.OPK -i NXYZOPKC -f 2 -c ./dataset/Camera1.txt -e 2154 -y ./dataset/fr_ign_RAF20.tif -m ./dataset/MNT_France_25m_h_crop.tif --fm height -t ./dataset/terrain_test0.mes -g ./dataset/GCP_test.app -l PTXYH -n Coor2d_pt_terrain -w ./test/tmp/
+
+    - name: Run regression test calc file pt image to world
+      run: |
+        source boreaenv/bin/activate
+        python ./borea_tools/ptfile_image_to_world.py -r ./dataset/23FD1305_alt_test.OPK -i NXYZOPKC -f 2 -c ./dataset/Camera1.txt -e 2154 -y ./dataset/fr_ign_RAF20.tif -m ./dataset/MNT_France_25m_h_crop.tif --fm height -t ./dataset/terrain_test.mes -p square -n Coor3d_pt_image -w ./test/tmp/
+
+    - name: Run regression test spaceresection opk
+      run: |
+        source boreaenv/bin/activate
+        python ./borea_tools/spaceresection_opk.py -p 825439 6289034 1500 -d height -c ./dataset/Camera1.txt -e 2154 -y ./dataset/fr_ign_RAF20.tif -m ./dataset/MNT_France_25m_h_crop.tif --fm height -t ./test/data/dataset2/all_liaisons2.mes -g ./test/data/dataset2/all_liaisons2_world.mes -l PXYH -n SpaceResection -w ./test/tmp/ -o NXYZOPKC --ou degree --oa True
+
+    - name: Run regression test opk to conical
+      run: |
+        source boreaenv/bin/activate
+        python ./borea_tools/opk_to_conl.py -r ./dataset/23FD1305_alt_test.OPK -i NXYZOPKC -f 2 -e 2154 -y ./dataset/fr_ign_RAF20.tif -c ./dataset/Camera1.txt -m ./dataset/MNT_France_25m_h_crop.tif --fm height -w ./test/tmp/
+
+    - name: Run transform projextion of points file
+      run: |
+        source boreaenv/bin/activate
+        python ./borea_tools/transform_proj_points.py -g ./dataset/GCP_test.app -l PTXYZ -e 2154 -y ./dataset/fr_ign_RAF20.tif --oe 4326 --oz height -n GCP_4326 -w ./test/tmp
diff --git a/.github/workflows/test_ubu.yml b/.github/workflows/test_ubu.yml
diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml