Skip to content

Commit

Permalink
help pip to not install conflicting requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
hnesk committed Nov 1, 2020
1 parent 06de711 commit 6e52c91
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install system dependencies
run: sudo make deps-ubuntu
# - name: Install system dependencies (screenshot)
# run: sudo apt install xrandr imagemagick
- name: Install dependencies and browse-ocrd
run: make deps-dev deps install
- name: Lint with flake8
Expand All @@ -42,9 +44,9 @@ jobs:
with:
name: Unit Test Results (Python ${{ matrix.python-version }})
path: unittest.xml
- name: Run browse-ocrd
run: browse-ocrd tests/example/workspaces/kant_aufklaerung_1784_missing_xml/mets.xml
- name: Screenshot
uses: OrbitalOwen/[email protected]
with:
file-name: 'desktop.jpg'
# - name: Run browse-ocrd
# run: browse-ocrd tests/example/workspaces/kant_aufklaerung_1784_missing_xml/mets.xml
# - name: Screenshot
# uses: OrbitalOwen/[email protected]
# with:
# file-name: 'desktop.jpg'
1 change: 1 addition & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
wheel
setuptools
unittest-xml-reporting
html-testRunner
flake8
mypy
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ocrd
Pillow
numpy
numpy<1.19.0,>=1.17.0
opencv-python-headless
PyGObject
python-magic
Expand Down

0 comments on commit 6e52c91

Please sign in to comment.