From 35ecef6c7b2db1212407196bd90a0e0d310ed083 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:21:31 -0800 Subject: [PATCH] Restore pip check for spyder-base with a patch to setup.py that removes pyqt --- recipe/meta.yaml | 3 +++ recipe/spyder-base.patch | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 recipe/spyder-base.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7a21e6c..1d8ccf2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,6 +12,7 @@ source: patches: # See spyder-ide/spyder#8316 - osx-zmq.patch + - spyder-base.patch build: number: {{ build }} @@ -99,6 +100,8 @@ test: commands: - USER=test spyder -h # [unix] - spyder -h # [win] + # Pip fails when running but the package is installed correctly + - python -m pip check # [not aarch64] imports: - spyder diff --git a/recipe/spyder-base.patch b/recipe/spyder-base.patch new file mode 100644 index 0000000..ac032ce --- /dev/null +++ b/recipe/spyder-base.patch @@ -0,0 +1,21 @@ +diff --git a/setup.py b/setup.py +index 3c7e4f947..3fa9fb8f1 100644 +--- a/setup.py ++++ b/setup.py +@@ -232,8 +232,6 @@ def run(self): + 'pylint>=3.1,<4', + 'pylint-venv>=3.0.2', + 'pyls-spyder>=0.4.0', +- 'pyqt5>=5.15,<5.16', +- 'pyqtwebengine>=5.15,<5.16', + 'python-lsp-black>=2.0.0,<3.0.0', + 'python-lsp-server[all]>=1.12.0,<1.13.0', + 'pyuca>=1.2', +@@ -242,7 +240,6 @@ def run(self): + 'qdarkstyle>=3.2.0,<3.3.0', + 'qstylizer>=0.2.2', + 'qtawesome>=1.3.1,<1.4.0', +- 'qtconsole>=5.6.1,<5.7.0', + 'qtpy>=2.4.0', + 'rtree>=0.9.7', + 'setuptools>=49.6.0',