Skip to content

Commit

Permalink
Merge pull request #59 from SciKit-Surgery/58-opencv-contrib-python-h…
Browse files Browse the repository at this point in the history
…eadless

58 - opencv contrib python headless
  • Loading branch information
mxochicale authored Jun 20, 2023
2 parents 7ad7a42 + e9b8dc9 commit 67c536e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
sudo apt-get update
sudo apt-get install xvfb
sudo apt-get install libegl-dev
sudo apt-get install libxcb-cursor-dev
## Qt for X11 Requirements> https://doc.qt.io/qt-6/linux-requirements.html
sudo apt-get install libfontconfig1-dev libfreetype6-dev
sudo apt-get install libx11-dev libx11-xcb-dev
Expand All @@ -101,6 +102,7 @@ jobs:
export DISPLAY=:1
sudo Xvfb $DISPLAY -screen 0 1024x768x24 </dev/null &
export QT_DEBUG_PLUGINS=0
export QT_QPA_PLATFORM=xcb
export LD_LIBRARY_PATH=$pythonLocation"/lib/python${{ matrix.python-version }}/site-packages/PySide6/Qt/plugins/platforms"
coverage erase
coverage run -a --source ./sksurgeryutils -m pytest -v -s
Expand Down Expand Up @@ -144,4 +146,4 @@ jobs:
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
password: ${{ secrets.PYPI_API_TOKEN }}
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@ Supported by `Wellcome`_ and `EPSRC`_.
.. _`EPSRC`: https://www.epsrc.ac.uk/
.. _`contributing guidelines`: https://github.com/SciKit-Surgery/scikit-surgeryutils/blob/master/CONTRIBUTING.rst
.. _`license file`: https://github.com/SciKit-Surgery/scikit-surgeryutils/blob/master/LICENSE
.. _`issue`: https://github.com/SciKit-Surgery/scikit-surgeryutils/issues/new
.. _`issue`: https://github.com/SciKit-Surgery/scikit-surgeryutils/issues/new
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ numpy>=1.11
opencv-contrib-python-headless>=4.2.0.32
scikit-surgerycore>=0.1.7
scikit-surgeryimage>=0.10.1
scikit-surgeryvtk==2.0rc0
scikit-surgeryarucotracker>=0.2.7
scikit-surgeryvtk>=2.0.1
scikit-surgeryarucotracker
scikit-surgerycalibration>=0.2.1
pyside6>=6.4.2
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
'pyside6>=6.4.2',
'scikit-surgerycore>=0.1.7',
'scikit-surgeryimage>=0.10.1',
'scikit-surgeryvtk==2.0rc0',
'scikit-surgeryarucotracker>=0.2.7',
'scikit-surgeryvtk>=2.0.1',
'scikit-surgeryarucotracker',
'scikit-surgerycalibration>=0.2.1'
],

Expand Down

0 comments on commit 67c536e

Please sign in to comment.