Skip to content

Update 3.4 branch with latest updates in master #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 1, 2022
Merged

Update 3.4 branch with latest updates in master #669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b4ff4f4
Added pylint test
asenyaev Mar 22, 2022
f15990c
Pinned pylint version
asenyaev Mar 23, 2022
b01f2cf
Changed using custom test for pylint to opencv sample
asenyaev Mar 23, 2022
5946584
Added pre-downloaded 3rdparty files to source packages
asenyaev Mar 24, 2022
7a76aee
Revert changes for pre-downloaded files
asenyaev Mar 25, 2022
83fdc76
Skip only gapi if it was not found
asenyaev Mar 25, 2022
79819ba
Synchronize with scikit-build
Mar 21, 2022
fabee7f
add support for building windows/arm64 package
niyas-sait Mar 28, 2022
2485652
Pinned versions for dependencies
asenyaev Apr 7, 2022
d563f74
Downgraded cmake version
asenyaev Apr 8, 2022
31701ff
Downgraded cmake version to 3.1
asenyaev Apr 8, 2022
d87183f
Updated dependecies for the next release
asenyaev May 30, 2022
ac615ea
Updated dependecies for the next release
asenyaev May 31, 2022
964ad08
Check changes on 3.4 branch in PRs
asenyaev May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert changes for pre-downloaded files
  • Loading branch information
@asenyaev
asenyaev committed May 31, 2022
commit 7a76aeedba77cee9e3722cd6a200c8d0098443c8
2 changes: 0 additions & 2 deletions .github/workflows/build_wheels_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ jobs:

- name: Build a package
run: |
# Download all 3rdparty files
source scripts/source-packages-preparation.sh ${{ github.workspace }}
set -e
# Build and package
set -x
Expand Down
20 changes: 0 additions & 20 deletions scripts/source-packages-preparation.sh
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@ def main():
"-DPYTHON3_LIMITED_API=ON",
"-DBUILD_OPENEXR=ON",
"-DBUILD_PNG=ON",
# To have all 3rdparty files in one place for source packages
"-DOPENCV_DOWNLOAD_PATH=%s" % (os.path.join(os.path.dirname(os.path.abspath(__file__)), "opencv", "3rdparty")),
]
+ (
# If it is not defined 'linker flags: /machine:X86' on Windows x64
Expand Down