From 12506e9d6fe0fa61f40ed5d8129eec2c327d7eb8 Mon Sep 17 00:00:00 2001 From: Miguel Xochicale Date: Wed, 14 Jun 2023 13:48:01 +0100 Subject: [PATCH 01/10] removes versions for opencv-contrib-python-headless (#58) --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index f3d45bb..153c76d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # doc/requirements.rst six>=1.10 numpy>=1.11 -opencv-contrib-python-headless>=4.2.0.32 +opencv-contrib-python-headless scikit-surgerycore>=0.1.7 scikit-surgeryimage>=0.10.1 scikit-surgeryvtk==2.0rc0 diff --git a/setup.py b/setup.py index a7e9657..3b5d38c 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ install_requires=[ 'six>=1.10', 'numpy>=1.11', - 'opencv-contrib-python-headless>=4.2.0.32', + 'opencv-contrib-python-headless', 'pyside6>=6.4.2', 'scikit-surgerycore>=0.1.7', 'scikit-surgeryimage>=0.10.1', From 86e118fd76e8054b5eae11823be3fd909efeb5c2 Mon Sep 17 00:00:00 2001 From: Miguel Xochicale Date: Wed, 14 Jun 2023 13:56:20 +0100 Subject: [PATCH 02/10] removes versions for scikit-surgeryarucotracker (#58) --- requirements.txt | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 153c76d..f4c498b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,6 @@ opencv-contrib-python-headless scikit-surgerycore>=0.1.7 scikit-surgeryimage>=0.10.1 scikit-surgeryvtk==2.0rc0 -scikit-surgeryarucotracker>=0.2.7 +scikit-surgeryarucotracker scikit-surgerycalibration>=0.2.1 pyside6>=6.4.2 \ No newline at end of file diff --git a/setup.py b/setup.py index 3b5d38c..257b3a2 100644 --- a/setup.py +++ b/setup.py @@ -52,12 +52,12 @@ install_requires=[ 'six>=1.10', 'numpy>=1.11', - 'opencv-contrib-python-headless', + 'opencv-contrib-python-headless, 'pyside6>=6.4.2', 'scikit-surgerycore>=0.1.7', 'scikit-surgeryimage>=0.10.1', 'scikit-surgeryvtk==2.0rc0', - 'scikit-surgeryarucotracker>=0.2.7', + 'scikit-surgeryarucotracker', 'scikit-surgerycalibration>=0.2.1' ], From 05eea73e85703fac8d9b1e86476ec84ef086f65b Mon Sep 17 00:00:00 2001 From: Miguel Xochicale Date: Wed, 14 Jun 2023 14:13:11 +0100 Subject: [PATCH 03/10] adds version for opencv-contrib-python-headless>=4.7.0.72 (#58) --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index f4c498b..75dc000 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,6 @@ opencv-contrib-python-headless scikit-surgerycore>=0.1.7 scikit-surgeryimage>=0.10.1 scikit-surgeryvtk==2.0rc0 -scikit-surgeryarucotracker +scikit-surgeryarucotracker>=4.7.0.72 scikit-surgerycalibration>=0.2.1 pyside6>=6.4.2 \ No newline at end of file diff --git a/setup.py b/setup.py index 257b3a2..8f0de6d 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ install_requires=[ 'six>=1.10', 'numpy>=1.11', - 'opencv-contrib-python-headless, + 'opencv-contrib-python-headless>=4.7.0.72, 'pyside6>=6.4.2', 'scikit-surgerycore>=0.1.7', 'scikit-surgeryimage>=0.10.1', From 71ceb7fbb527eaa5debaa7984ac20670be500e46 Mon Sep 17 00:00:00 2001 From: Miguel Xochicale Date: Wed, 14 Jun 2023 14:16:09 +0100 Subject: [PATCH 04/10] adds version for opencv-contrib-python-headless>=4.7.0.72 (#58) --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 75dc000..c4af020 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,10 +4,10 @@ # doc/requirements.rst six>=1.10 numpy>=1.11 -opencv-contrib-python-headless +opencv-contrib-python-headless>=4.7.0.72 scikit-surgerycore>=0.1.7 scikit-surgeryimage>=0.10.1 scikit-surgeryvtk==2.0rc0 -scikit-surgeryarucotracker>=4.7.0.72 +scikit-surgeryarucotracker scikit-surgerycalibration>=0.2.1 pyside6>=6.4.2 \ No newline at end of file From 52194db54097e7fc9ce107acb504ee397a4cd480 Mon Sep 17 00:00:00 2001 From: Miguel Xochicale Date: Wed, 14 Jun 2023 15:35:52 +0100 Subject: [PATCH 05/10] using opencv-contrib-python-headless>=4.5.5.64 (#58) --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c4af020..68f1274 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # doc/requirements.rst six>=1.10 numpy>=1.11 -opencv-contrib-python-headless>=4.7.0.72 +opencv-contrib-python-headless>=4.5.5.64 scikit-surgerycore>=0.1.7 scikit-surgeryimage>=0.10.1 scikit-surgeryvtk==2.0rc0 diff --git a/setup.py b/setup.py index 8f0de6d..d2664ed 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ install_requires=[ 'six>=1.10', 'numpy>=1.11', - 'opencv-contrib-python-headless>=4.7.0.72, + 'opencv-contrib-python-headless>=4.5.5.64, 'pyside6>=6.4.2', 'scikit-surgerycore>=0.1.7', 'scikit-surgeryimage>=0.10.1', From 6c5df68e4fb7033e07aac8bb79a67c9cea79c2f8 Mon Sep 17 00:00:00 2001 From: Miguel Xochicale Date: Wed, 14 Jun 2023 15:42:14 +0100 Subject: [PATCH 06/10] fix lib requirements in ci.yml (#56, #58) --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9be9630..6c5944b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -101,6 +102,7 @@ jobs: export DISPLAY=:1 sudo Xvfb $DISPLAY -screen 0 1024x768x24 Date: Wed, 14 Jun 2023 15:58:14 +0100 Subject: [PATCH 07/10] adds missing quote in setup.py (#58) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d2664ed..bb5733f 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ install_requires=[ 'six>=1.10', 'numpy>=1.11', - 'opencv-contrib-python-headless>=4.5.5.64, + 'opencv-contrib-python-headless>=4.5.5.64', 'pyside6>=6.4.2', 'scikit-surgerycore>=0.1.7', 'scikit-surgeryimage>=0.10.1', From d9cce2261d810ce2ccc7b93650959afe1d99fe1b Mon Sep 17 00:00:00 2001 From: Miguel Xochicale Date: Thu, 15 Jun 2023 11:58:22 +0100 Subject: [PATCH 08/10] removing one new line in README to check remote unit tests (#58) --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index eca322c..34772da 100644 --- a/README.rst +++ b/README.rst @@ -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 \ No newline at end of file From 4191d349bc84cd97da8353a470805c156e969e8f Mon Sep 17 00:00:00 2001 From: Miguel Xochicale Date: Tue, 20 Jun 2023 17:24:15 +0100 Subject: [PATCH 09/10] use opencv-contrib-python-headless>=4.2.0.32 and scikit-surgeryvtk>=2.0.1 (#58) --- requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 68f1274..372358d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,10 +4,10 @@ # doc/requirements.rst six>=1.10 numpy>=1.11 -opencv-contrib-python-headless>=4.5.5.64 +opencv-contrib-python-headless>=4.2.0.32 scikit-surgerycore>=0.1.7 scikit-surgeryimage>=0.10.1 -scikit-surgeryvtk==2.0rc0 +scikit-surgeryvtk==2.0.1 scikit-surgeryarucotracker scikit-surgerycalibration>=0.2.1 pyside6>=6.4.2 \ No newline at end of file diff --git a/setup.py b/setup.py index bb5733f..2216981 100644 --- a/setup.py +++ b/setup.py @@ -52,11 +52,11 @@ install_requires=[ 'six>=1.10', 'numpy>=1.11', - 'opencv-contrib-python-headless>=4.5.5.64', + 'opencv-contrib-python-headless>=4.2.0.32', 'pyside6>=6.4.2', 'scikit-surgerycore>=0.1.7', 'scikit-surgeryimage>=0.10.1', - 'scikit-surgeryvtk==2.0rc0', + 'scikit-surgeryvtk==2.0.1', 'scikit-surgeryarucotracker', 'scikit-surgerycalibration>=0.2.1' ], From e9b8dc9d74b4f73e83a005e53e68d92dd8b3275c Mon Sep 17 00:00:00 2001 From: Miguel Xochicale Date: Tue, 20 Jun 2023 17:31:30 +0100 Subject: [PATCH 10/10] correcting greater symbol for scikit-surgeryvtk>=2.0.1 (#58) --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 372358d..12ef6f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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.0.1 +scikit-surgeryvtk>=2.0.1 scikit-surgeryarucotracker scikit-surgerycalibration>=0.2.1 pyside6>=6.4.2 \ No newline at end of file diff --git a/setup.py b/setup.py index 2216981..44f0f4f 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ 'pyside6>=6.4.2', 'scikit-surgerycore>=0.1.7', 'scikit-surgeryimage>=0.10.1', - 'scikit-surgeryvtk==2.0.1', + 'scikit-surgeryvtk>=2.0.1', 'scikit-surgeryarucotracker', 'scikit-surgerycalibration>=0.2.1' ],