Skip to content
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

Update opencv-python to 4.5.5.64 and restrict numpy to 1.x #1905

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update opencv-python to 4.5.5.64 and restrict numpy to 1.x #1905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions bCNC/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pyserial>=3.5
numpy>=1.12
numpy>=1.12,<2
Pillow>=4.0
opencv-python==4.5.5.62
opencv-python==4.5.5.64
12 changes: 6 additions & 6 deletions flatpak/io.github.bcnc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
"name": "bcnc",
"buildsystem": "simple",
"build-commands": [
"pip3 install --prefix=${FLATPAK_DEST} pyserial",
"pip3 install --prefix=${FLATPAK_DEST} shxparser",
"pip3 install --prefix=${FLATPAK_DEST} svgelements",
"pip3 install --prefix=${FLATPAK_DEST} Pillow",
"pip3 install --prefix=${FLATPAK_DEST} numpy",
"pip3 install --prefix=${FLATPAK_DEST} opencv-python==4.5.5.62",
"pip3 install --prefix=${FLATPAK_DEST} pyserial>=3.5",
"pip3 install --prefix=${FLATPAK_DEST} shxparser>=0.0.2",
"pip3 install --prefix=${FLATPAK_DEST} 'svgelements>=1,<2'",
"pip3 install --prefix=${FLATPAK_DEST} Pillow>=4.0",
"pip3 install --prefix=${FLATPAK_DEST} 'numpy>=1.12,<2'",
"pip3 install --prefix=${FLATPAK_DEST} opencv-python==4.5.5.64",
"pip3 install --prefix=/app --upgrade .",
"install -p -m644 -D bCNC/bCNC.png ${FLATPAK_DEST}/share/icons/hicolor/192x192/apps/io.github.bcnc.png",
"install -p -m644 -D bCNC/bCNC.desktop ${FLATPAK_DEST}/share/applications/io.github.bcnc.desktop",
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
# (it can be installed, but does not work)
"pyserial ; sys_platform != 'win32'",
"pyserial<=3.0.1 ; sys_platform == 'win32'",
"numpy>=1.12",
"numpy>=1.12,<2",
"svgelements>=1,<2",
"shxparser>=0.0.2",
"Pillow>=4.0",
# Note there are no PyPI OpenCV packages for ARM
# (Raspberry PI, Orange PI, etc...)
"opencv-python==4.5.5.62 ; "
"opencv-python==4.5.5.64 ; "
+ "(\"arm\" not in platform_machine) and "
+ "(\"aarch64\" not in platform_machine)"
],
Expand Down