Merge branch 'topic/use_pylon_6.3.0'

basler · Jan 31, 2022 · 97bb9c7 · 97bb9c7
2 parents 1cbda30 + 99fda2e
commit 97bb9c7
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 28 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -38,6 +38,8 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     - PYTHON: "C:\\Python39"
     - PYTHON: "C:\\Python39-x64"
+    - PYTHON: "C:\\Python310"
+    - PYTHON: "C:\\Python310-x64"
 
 install:
   # 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)
@@ -52,7 +54,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.2.0.21487.exe
+  - appveyor-retry curl -sSfL -o pylon_installer.exe %PYLON_DOWNLOAD_URL_BASE%Basler_pylon_6.3.0.23157.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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Installer list
         run: |
           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_6_3}pylon_6.3.0.23157_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
@@ -47,13 +47,17 @@ jobs:
         env:
           PYLON_DOWNLOAD_URL_BASE: ${{ secrets.PYLON_DOWNLOAD_URL_BASE }}
           PYLON_DOWNLOAD_URL_BASE_6_2: ${{ secrets.PYLON_DOWNLOAD_URL_BASE_6_2 }}
+          PYLON_DOWNLOAD_URL_BASE_6_3: ${{ secrets.PYLON_DOWNLOAD_URL_BASE_6_3 }}
         run: |
           mkdir pylon-installer && cd pylon-installer
           while read line; do
             url=$(eval echo "$line")
             echo "download $url"
             curl -sSfL -O "$url"
           done <../pylon-installer.txt
+          echo "Download result"
+          ls -l
+          md5sum *
 
       - uses: actions/upload-artifact@v2
         with:
@@ -73,7 +77,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        a: [cp36m, cp37m, cp38, cp39]
+        a: [cp36m, cp37m, cp38, cp39, cp3_10]
         p: [manylinux_2_24_x86_64, manylinux_2_24_aarch64, manylinux_2_24_armv7l]
 
         include:
@@ -133,7 +137,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        a: [cp36, cp37, cp38, cp39]
+        a: [cp36, cp37, cp38, cp39, cp3_10]
     env:
       P: macosx-10.15-intel
       A: ${{ matrix.a }}
@@ -167,6 +171,10 @@ jobs:
               PYENV_VERSION="3.9"
               curl -sSfL -o python.pkg "https://www.python.org/ftp/python/3.9.1/python-3.9.1-macosx10.9.pkg"
               ;;
+            cp3_10)
+              PYENV_VERSION="3.10"
+              curl -sSfL -o python.pkg "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg"
+              ;;
             *)
               echo "Invalid python version $A"
               exit -1

diff --git a/README.md b/README.md
@@ -62,14 +62,14 @@ To install pypylon open your favourite terminal and run:
 
 The following versions are available on pypi:
 
- |                  | 3.4 | 3.5 | 3.6 | 3.6 | 3.7 | 3.8 | 3.9 |
- |------------------|-----|-----|-----|-----|-----|-----|-----|
- | Windows 32bit    | x   | x   | x   | x   | x   | x   | x   |
- | Windows 64bit    | x   | x   | 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   |
- | Mac OS***        | -   | -   | x   | x   | x   | x   | x   |
+ |                  | 3.4 | 3.5 | 3.6 | 3.6 | 3.7 | 3.8 | 3.9 | 3.10 |
+ |------------------|-----|-----|-----|-----|-----|-----|-----|------|
+ | Windows 32bit    | x   | x   | x   | x   | x   | x   | x   |  x   |
+ | Windows 64bit    | x   | x   | x   | x   | x   | x   | x   |  x   |
+ | Linux x86_64**   | -*  | -*  | x   | x   | x   | x   | x   |  x   |
+ | Linux armv7l**   | -*  | -*  | x   | x   | x   | x   | x   |  x   |
+ | Linux aarch64**  | -*  | -*  | x   | x   | x   | x   | x   |  x   |
+ | Mac OS***        | -   | -   | x   | x   | x   | x   | x   |  x   |
 
 
 > Additional Notes on binary packages:  

diff --git a/VersionInfo.py b/VersionInfo.py
@@ -1,9 +1,9 @@
 # The pylon version this source tree was designed for, by platform
 ReferencePylonVersion = {
-    "Windows": "6.2.0",
-    # ATTENTION: This version is the pylon core version reported by pylon-config, 
+    "Windows": "6.3.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.2.0",
-    "Linux_x86_64": "6.2.0",
+    "Linux_x86_64": "6.3.0",
     "Darwin": "6.1.2"
 }
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,9 @@
+Version 1.8.0rc1
+    - Date 2022-01-31
+    - Adapted linux and windows 64 bit builds to pylon 6.3.0 (which includes
+      the removal of BCON support).
+    - Added python 3.10 binary releases
+
 Version 1.7.4
     - Date 2021-10-19
     - setup.py: Some python2 relics have been removed and distutils is no

diff --git a/scripts/build/build-arch.sh b/scripts/build/build-arch.sh
@@ -61,8 +61,9 @@ if [ $BUILD_DISTRO = "debian" ]; then
         cp37m) BASE_IMAGE="python:3.7.5-stretch" ;;
         cp38) BASE_IMAGE="python:3.8.2-buster" ;;
         cp39) BASE_IMAGE="python:3.9.1-buster" ;;
+        cp3_10) BASE_IMAGE="python:3.10.0-buster" ;;
         *)
-        echo "Unsupported abi '$ABI_TAG'. Supported tags: cp27m, cp34m, cp35m, cp36m, cp37m, cp38, cp39"
+        echo "Unsupported abi '$ABI_TAG'. Supported tags: cp27m, cp34m, cp35m, cp36m, cp37m, cp38, cp39, cp3_10"
         exit 1
     esac
 else

diff --git a/setup.py b/setup.py
@@ -75,7 +75,6 @@ class BuildSupport(object):
         "camemu",
         "gentl",
         "extra",
-        "bcon",
         "cxp",
         }
 
@@ -380,12 +379,6 @@ class BuildSupportWindows(BuildSupport):
             ("PylonCamEmu_*.dll", ""),
             ],
 
-        "bcon": [
-            ("BconAdapterPleora.dll", ""),
-            ("bxapi_*.dll", ""),
-            ("PylonBcon_*.dll", ""),
-            ],
-
         "extra": [
             ("PylonGUI_*.dll", ""),
             ("PylonUtility_*.dll", ""),
@@ -616,11 +609,6 @@ class BuildSupportLinux(BuildSupport):
             ("libpylon_TL_camemu-*.so", ""),
             ],
 
-        "bcon": [
-            ("libbxapi*.so", ""),
-            ("libpylon_TL_bcon-*.so", ""),
-            ],
-
         "extra": [
             ("libpylonutility-*.so", ""),
             ],

diff --git a/src/pylon/pylon.i b/src/pylon/pylon.i
@@ -640,6 +640,18 @@ const Pylon::StringList_t & (Pylon::StringList_t str_list)
 
 %include <pylon/PylonVersionNumber.h>
 
+// The entire functionality of GenApi is placed in a namespace. The actual name
+// of this namespace is formed by a macro called 'GENAPI_NAMESPACE'. But there
+// is also the alias 'namespace GenApi = GENAPI_NAMESPACE;'. For a long time,
+// pylon used the macro exclusively. With version 6.3.0, pylon has started to
+// use the alias. In the genicam sources, however, the macro is used. While
+// these two have the same meaning for the actual C++ compiler, SWIG treats them
+// differently. This is important to us because we want SWIG to use the data
+// types it learned when parsing the Genicam sources when parsing the Pylon
+// sources. The following macro ensures that SWIG again uses 'GENAPI_NAMESPACE'
+// in all the places where pylon uses 'GenApi'.
+#define GenApi GENAPI_NAMESPACE
+
 %include "TypeMappings.i"
 %include "Container.i"
 %include "PixelType.i"