Merge pull request #149 from Fixstars-momoko/feature/add-ion-contrib-…

…python-test added the test for ion-contrib-python using Aravis library
Sensing-Dev · Oct 25, 2024 · 1d2d61e · 1d2d61e
2 parents 890682c + e00a3c6
commit 1d2d61e
Show file tree

Hide file tree

Showing 5 changed files with 628 additions and 6 deletions.
diff --git a/.github/workflows/develop-Linux.yml b/.github/workflows/develop-Linux.yml
@@ -180,7 +180,7 @@ jobs:
             gendc_separator_version=${gendc_separator_version:1}
           fi
           
-          pip install ion-python==$ionkit_version
+          pip install ion-contrib-python==$ionkit_version
           pip install gendc-python==$gendc_separator_version
           pip install numpy
           pip install opencv-python
@@ -199,6 +199,12 @@ jobs:
           cd ${{ github.workspace }}/download/installer/testcases/python
           python ionkit_test.py
 
+      - name: Test ion-kit with Aravis
+        run: |
+          cd ${{ github.workspace }}/download/installer/testcases/python
+          export GENICAM_FILENAME=${{ github.workspace }}/download/installer/testcases/python/arv-fake-camera.xml 
+          python ionkit_contrib_test.py ${{ github.workspace }}/download/installer/testcases/python/ionkit_contrib_test.py
+
       - name: Test OpenCV
         run: |
           cd ${{ github.workspace }}/download/installer/testcases/python

diff --git a/.github/workflows/develop-Windows.yml b/.github/workflows/develop-Windows.yml
@@ -246,19 +246,23 @@ jobs:
           if ( $gendc_separator_version.StartsWith("v") ){ 
             $gendc_separator_version = $gendc_separator_version.substring(1)
           }
-          pip install ion-python==$ionkit_version
+          pip install ion-contrib-python==$ionkit_version
           pip install gendc-python==$gendc_separator_version
           pip install numpy
           pip install opencv-python
           pip install aravis-python
 
-
-
       - name: Test ion-kit
         run: |
           cd ${{ github.workspace }}/download/installer/testcases/python
           python ionkit_test.py
 
+      - name: Test ion-kit with Aravis
+        run: |
+          cd ${{ github.workspace }}/download/installer/testcases/python
+          $ENV:GENICAM_FILENAME = "${{ github.workspace }}/download/installer/testcases/python/arv-fake-camera.xml"
+          python ionkit_contrib_test.py ${{ github.workspace }}/download/installer/testcases/python/ionkit_contrib_test.py
+
       - name: Test OpenCV
         run: |
           cd ${{ github.workspace }}/download/installer/testcases/python

diff --git a/installer/config.yml b/installer/config.yml
@@ -13,9 +13,9 @@ libraries:
 
   ion_kit:
     name: ion-kit
-    pkg_sha: "41913dcd5c752f2859c48893c8eb1fba04b4bb2faa0e327019ba1a3567c43127"
+    pkg_sha: "d85c31b70e128b7f22143cb2a91234f5e12e040094b5f74be950bf6620becd55"
     git_repo: "https://github.com/fixstars/ion-kit.git"
-    version: "v3.2.2"
+    version: "v3.2.3"
 
   opencv:
     name: opencv