Merged PR 13601: Merge feature/pypylon-next to master

Preparation for pylon 1.7.4

.appveyor.yml

@@ -40,10 +40,10 @@ environment:
     - PYTHON: "C:\\Python39-x64"
 
 install:
-  # Install an outdated version of readme_renderer because it is the last one with python 3.4 support (https://github.com/pypa/readme_renderer/releases/tag/25.0)
+  # Install an outdated version of colorama and readme_renderer because these are the last ones with python 3.4 support (https://github.com/pypa/readme_renderer/releases/tag/25.0)
   # Otherwise wheel/twine install fails on python 3.4
   # Install setuptools >= 38.6 because this version introduced long_description_content_type which is required by current pypi
-  - "%PYTHON%\\python.exe -m pip install \"readme_renderer==24.0\" \"setuptools>=38.6.0\""
+  - "%PYTHON%\\python.exe -m pip install \"colorama==0.4.1\" \"readme_renderer==24.0\" \"setuptools>=38.6.0\""
 
   # We need wheel installed to build wheels
   - "%PYTHON%\\python.exe -m pip install wheel twine"
@@ -52,7 +52,7 @@ install:
   - 7z x swigwin.zip -oC:\ > NUL
   - set PATH=C:\swigwin-4.0.1;%PATH%
   # install pylon
-  - appveyor-retry curl -sSfL -o pylon_installer.exe %PYLON_DOWNLOAD_URL_BASE%Basler_pylon_6.1.1.19832.exe
+  - appveyor-retry curl -sSfL -o pylon_installer.exe %PYLON_DOWNLOAD_URL_BASE%Basler_pylon_6.2.0.21487.exe
   - pylon_installer.exe /quiet /install
   # PYLON_DEV_DIR is not available in the shell after installation, so we set it manually
   - set PYLON_DEV_DIR=%PROGRAMFILES%\Basler\pylon 6\development

.github/workflows/main.yml

@@ -30,14 +30,12 @@ jobs:
     steps:
       - name: Installer list
         run: |
-          tee pylon-installer.txt <<EOF
-          pylon_6.1.0.19674_x86_setup.tar.gz
-          pylon_6.1.1.19861_x86_64_setup.tar.gz
-          pylon_6.1.3.20159_armhf_setup.tar.gz
-          pylon_6.1.3.20159_aarch64_setup.tar.gz
-          pylon-6.1.2.19990.zip
+          tee pylon-installer.txt <<"EOF"
+          ${PYLON_DOWNLOAD_URL_BASE_6_2}pylon_6.2.0.21487_x86_64_setup.tar.gz
+          ${PYLON_DOWNLOAD_URL_BASE}pylon_6.2.0.21487_armhf_setup.tar.gz
+          ${PYLON_DOWNLOAD_URL_BASE_6_2}pylon_6.2.0.21487_aarch64_setup.tar.gz
+          ${PYLON_DOWNLOAD_URL_BASE}pylon-6.1.2.19990.zip
           EOF
-
       - uses: actions/cache@v2
         id: cache
         with:
@@ -48,11 +46,13 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         env:
           PYLON_DOWNLOAD_URL_BASE: ${{ secrets.PYLON_DOWNLOAD_URL_BASE }}
+          PYLON_DOWNLOAD_URL_BASE_6_2: ${{ secrets.PYLON_DOWNLOAD_URL_BASE_6_2 }}
         run: |
           mkdir pylon-installer && cd pylon-installer
           while read line; do
-            echo "download $line"
-            curl -sSfL -O "${PYLON_DOWNLOAD_URL_BASE}${line}"
+            url=$(eval echo "$line")
+            echo "download $url"
+            curl -sSfL -O "$url"
           done <../pylon-installer.txt
 
       - uses: actions/upload-artifact@v2
@@ -74,16 +74,14 @@ jobs:
       fail-fast: false
       matrix:
         a: [cp36m, cp37m, cp38, cp39]
-        p: [manylinux_2_24_x86_64, manylinux_2_24_i686, manylinux_2_24_aarch64, manylinux_2_24_armv7l]
+        p: [manylinux_2_24_x86_64, manylinux_2_24_aarch64, manylinux_2_24_armv7l]
 
         include:
           #legacy builds without (out-of-the-box) manylinux/pep-600 support
           - {a: cp34m, p: linux_x86_64  }
-          - {a: cp34m, p: linux_i686    }
           - {a: cp34m, p: linux_aarch64 }
           - {a: cp34m, p: linux_armv7l  }
           - {a: cp35m, p: linux_x86_64  }
-          - {a: cp35m, p: linux_i686    }
           - {a: cp35m, p: linux_aarch64 }
           - {a: cp35m, p: linux_armv7l  }
 

README.md

@@ -66,7 +66,6 @@ The following versions are available on pypi:
  |------------------|-----|-----|-----|-----|-----|-----|-----|
  | Windows 32bit    | x   | x   | x   | x   | x   | x   | x   |
  | Windows 64bit    | x   | x   | x   | x   | x   | x   | x   |
- | Linux i686**     | -*  | -*  | x   | x   | x   | x   | x   |
  | Linux x86_64**   | -*  | -*  | x   | x   | x   | x   | x   |
  | Linux armv7l**   | -*  | -*  | x   | x   | x   | x   | x   |
  | Linux aarch64**  | -*  | -*  | x   | x   | x   | x   | x   |

VersionInfo.py

@@ -1,9 +1,9 @@
 # The pylon version this source tree was designed for, by platform
 ReferencePylonVersion = {
-    "Windows": "6.1.1",
+    "Windows": "6.2.0",
     # ATTENTION: This version is the pylon core version reported by pylon-config, 
     # which is not equal to the version on the outer tar.gz
-    "Linux": "6.1.0",
-    "Linux_x86_64": "6.1.1",
+    "Linux": "6.2.0",
+    "Linux_x86_64": "6.2.0",
     "Darwin": "6.1.2"
 }

changelog.txt

@@ -1,9 +1,15 @@
-Version ?.?.?
-    - Date ????-??-??
+Version 1.7.4rc1
+    - Date 2021-10-19
     - setup.py: Some python2 relics have been removed and distutils is no
       longer used because distutils is deprecated in python 3.10.
     - setup.py: Include vcruntime140_1.dll into the package for current MVSC
       compiler.
+    - Fixed double enumeration bug on linux
+    - Updated to pylon 6.2 on windows and linux and adapted some tests for it.
+    - Dropped linux x86 (32bit) support as it is no longer supported by pylon
+
+Version 1.7.3
+    - Internal Basler release
 
 Version 1.7.2
     - Date 2021-03-03

setup.py

@@ -626,7 +626,7 @@ class BuildSupportLinux(BuildSupport):
             ],
 
         "gentl": [
-            ("libpylon_TL_gtc*.so", ""),
+            ("libpylon_TL_gtc-*.so", ""),
             ],
         "cxp": [
             ],

tests/pylon_tests/emulated/grabresulttest.py

@@ -27,7 +27,9 @@ def test_emu_grabresult(self):
         self.assertEqual(1040, height)
         self.assertEqual(1024, width)
         self.assertEqual("B", form)
-        self.assertTrue(grabResult.GetArray()[0, 1] == 1)
+        actual = list(grabResult.Array[0:20, 0])
+        expected = [actual[0] + i for i in range(20)]
+        self.assertEqual(actual, expected)
         grabResult.Release()
         self.assertFalse(grabResult.IsValid())
         self.assertFalse(grabResult.IsUnique())
@@ -51,7 +53,9 @@ def test_copy(self):
         self.assertEqual(1040, height)
         self.assertEqual(1024, width)
         self.assertEqual("B", form)
-        self.assertTrue(grabResult.GetArray()[0, 1] == 1)
+        actual = list(grabResult.Array[0:20, 0])
+        expected = [actual[0] + i for i in range(20)]
+        self.assertEqual(actual, expected)
 
         cameraGrab.Release()
         self.assertTrue(grabResult.IsValid())
@@ -60,7 +64,9 @@ def test_copy(self):
         self.assertEqual(1040, height)
         self.assertEqual(1024, width)
         self.assertEqual("B", form)
-        self.assertTrue(grabResult.GetArray()[0, 1] == 1)
+        actual = list(grabResult.Array[0:20, 0])
+        expected = [actual[0] + i for i in range(20)]
+        self.assertEqual(actual, expected)
 
         grabResult.Release()
         self.assertFalse(grabResult.IsValid())

tests/pylon_tests/emulated/grabtest.py

@@ -12,7 +12,9 @@ def test_grabone(self):
         camera.ExposureTimeAbs.SetValue(10000.0)
         self.assertEqual(10000, camera.ExposureTimeAbs.GetValue())
         result = camera.GrabOne(1000)
-        self.assertEqual(9.5, numpy.mean(result.Array[0:20, 0]))
+        actual = list(result.Array[0:20, 0])
+        expected = [actual[0] + i for i in range(20)]
+        self.assertEqual(actual, expected)
         camera.Close()
 
     def test_grab(self):

tests/pylon_tests/emulated/instantcameratest.py

@@ -36,7 +36,9 @@ def test_grab_one(self):
         cam.Open()
         self.assertTrue(cam.GrabOne(1000))
         result = cam.GrabOne(1000)
-        self.assertEqual(9.5, numpy.mean(result.Array[0:20, 0]))
+        actual = list(result.Array[0:20, 0])
+        expected = [actual[0] + i for i in range(20)]
+        self.assertEqual(actual, expected)
         cam.Close()
 
     def test_grabbing(self):