Skip to content

[FIX] Remove pyqt5 install magic #6153

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

Merged
markotoplak merged 2 commits into from
Nov 28, 2022
Merged

[FIX] Remove pyqt5 install magic #6153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe9259b
Remove pyqt5 install magic
markotoplak Sep 30, 2022
76cc5ac
README - Add instructions to install PyQt
PrimozGodec Nov 25, 2022
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
11 changes: 10 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ conda config --set channel_priority strict
conda create python=3 --yes --name orange3
conda activate orange3

# Install PyQt and PyQtWebEngine
conda install pyqt
# Install Orange
conda install orange3
```
Expand All @@ -63,7 +65,9 @@ conda install orange3-<addon name>
### Installing with pip

We recommend using our [standalone installer](https://orange.biolab.si/download) or conda, but Orange is also installable with pip. You will need a C/C++ compiler (on Windows we suggest using Microsoft Visual Studio Build Tools).

Orange needs PyQt to run. Install either:
- PyQt5 and PyQtWebEngine: `pip install -r requirements-pyqt.txt`
- PyQt6 and PyQt6-WebEngine: `pip install PyQt6 PyQt6-WebEngine`

### Installing with winget (Windows only)

Expand Down Expand Up @@ -137,6 +141,8 @@ conda activate orange3

git clone ssh://git@github.com/$MY_GITHUB_USERNAME/orange3

# Install PyQT and PyQtWebEngine. You can also use PyQt6
pip install -r requirements-pyqt.txt
pip install -e orange3
```

Expand Down Expand Up @@ -175,6 +181,9 @@ create a conda environment, clone your forks, and install them:
conda create python=3 --yes --name orange3
conda activate orange3

# Install PyQT and PyQtWebEngine. You can also use PyQt6
pip install -r requirements-pyqt.txt

git clone ssh://git@github.com/$MY_GITHUB_USERNAME/orange-widget-base
pip install -e orange-widget-base

Expand Down
13 changes: 0 additions & 13 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@
except ImportError:
have_cython = False

try:
import PyQt5.QtCore # pylint: disable=unused-import
have_pyqt5 = True
except ImportError:
have_pyqt5 = False

is_conda = os.path.exists(os.path.join(sys.prefix, 'conda-meta'))

NAME = 'Orange3'

VERSION = '3.33.0'
Expand Down Expand Up @@ -91,11 +83,6 @@

requirements = ['requirements-core.txt', 'requirements-gui.txt']

# pyqt5 is named pyqt5 on pypi and pyqt on conda
# due to possible conflicts, skip the pyqt5 requirement in conda environments
# that already have pyqt
if not (is_conda and have_pyqt5):
requirements.append('requirements-pyqt.txt')

INSTALL_REQUIRES = sorted(set(
line.partition('#')[0].strip()
Expand Down