Commit 959786b
committed
setup.py: do not overwrite conda's PyQt5
The PyQt5 dependency conflicts with conda, where the same package is called
pyqt. Installing pyqt5 inside a conda environment that already contains pyqt
may be catastrophic. Removing the dependency makes pip installation into conda
environments safer; such installations frequently occur when users install an
add-on not available in the conda repos that requires a newer version of
Orange. The same issue appears when Anaconda users try to update Orange with
the Add-on dialog box. Or when someone who installed Orange with conda
downloads the master branch and does "pip install -e .".
Orange added the PyQt5 dependency about a year ago to make pip installations
friendlier. Unfortunately, that caused more problems than it fixed. This commit
modifies setup.py to only installs PyQt5 in a conda environment if PyQt5 could
not be imported. I presume this is safe.1 parent 53e2640 commit 959786b
3 files changed
+15
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
6 | 4 | | |
7 | 5 | | |
8 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
37 | 44 | | |
38 | 45 | | |
39 | 46 | | |
| |||
78 | 85 | | |
79 | 86 | | |
80 | 87 | | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
81 | 94 | | |
82 | 95 | | |
83 | 96 | | |
| |||
0 commit comments