Skip to content

Commit

Permalink
Merged PR 29625: Update reference version for macOS, update changedlo…
Browse files Browse the repository at this point in the history
…g in preparation for pypy...

Update reference version for macOS, update changedlog in preparation for pypylon 4.1.0rc1 build. Fixed an warning triggered by jfrog/setup-jfrog-cli tasklet
  • Loading branch information
bjoernrennfanz committed Nov 22, 2024
2 parents 9c85f7f + 2586ccc commit 1ea75b1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"pylon_sdks": ["8.0.1.16188"]
},
"macos": {
"pylon_sdks": ["7.3.1.0011"]
"pylon_sdks": ["7.3.2.0001"]
}
}
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ jobs:
env:
JF_URL: ${{ secrets.SDK_URL }}
JF_ACCESS_TOKEN: ${{ secrets.SDK_TOKEN }}
with:
disable-auto-build-publish: true
disable-job-summary: true

- name: Checkout repository
uses: actions/checkout@v4
Expand Down
6 changes: 4 additions & 2 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
Version 4.x.x
- Date xxxx-xx-xx
Version 4.1.0rc1
- Date 2024-11-22
- Updated to pylon Camera Software Suite 8.0.1 on linux and windows.
This contains pylon C++ SDK 9.0.3 and pylon Data Processing C++ SDK 3.0.1.
- Update to pylon 7.3.2 on macOS, which fixed a bug that caused a data encoding
error when using the Compression Beyond feature on GigE cameras.
- We now use python 3.9 limited api to provide multi abi version wheels of pypylon.
- Removed PylonImage.AttachUserBuffer
- Added PylonImage.AttachMemoryView
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
# which is not equal to the version on the outer tar.gz
"Linux": "9.0.3",
"Linux_armv7l": "6.2.0",
"Darwin": "7.3.1",
"Darwin_arm64": "7.3.1"
"Darwin": "7.3.2",
"Darwin_arm64": "7.3.2"
}

################################################################################
Expand Down

0 comments on commit 1ea75b1

Please sign in to comment.