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

fix opencv import error for numpy 2.0 #13105

Merged
merged 3 commits into from
Jun 23, 2024
Merged

fix opencv import error for numpy 2.0 #13105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db567b5
fix opencv import error for numpy 2.0
GreatV Jun 17, 2024
af1b142
update requirements.txt
GreatV Jun 17, 2024
bbb02e3
Merge branch 'main' into fix_opencv_error
GreatV Jun 22, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
python -m pip install --upgrade pip
pip install pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
pip install "paddlepaddle==2.5"
pip install paddlepaddle==0.0.0 -f https://www.paddlepaddle.org.cn/whl/linux/cpu-mkl/develop.html
pip install -e .
- name: Test with pytest
run: |
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ dependencies = [
"tqdm",
"numpy<2.0",
"rapidfuzz",
"opencv-python<=4.6.0.66",
"opencv-contrib-python<=4.6.0.66",
"opencv-python",
"opencv-contrib-python",
"cython",
"Pillow>=10.0.0",
"Pillow",
"pyyaml",
"python-docx",
"beautifulsoup4",
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ lmdb
tqdm
numpy<2.0
rapidfuzz
opencv-python<=4.6.0.66
opencv-contrib-python<=4.6.0.66
opencv-python
opencv-contrib-python
cython
Pillow>=10.0.0
Pillow
pyyaml
requests