[FIX] setup.py: do not overwrite conda's PyQt5 #5593
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
markotoplak
force-pushed
the
remove-pyqt5-dep2
branch
from
08f37fc
to
959786b
Compare
Codecov Report
@@ Coverage Diff @@
## master #5593 +/- ##
==========================================
- Coverage 85.92% 85.91% -0.01%
==========================================
Files 313 313
Lines 65360 65360
==========================================
- Hits 56159 56155 -4
- Misses 9201 9205 +4 |
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.
markotoplak
force-pushed
the
remove-pyqt5-dep2
branch
from
959786b
to
816f623
Compare
|
It looks ok for me. :) I also tested it both in conda environment and virtualevn and it seems it works. |
PrimozGodec
approved these changes
Sep 17, 2021
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Description of changes
This is an alternative to #5566.
This commit modifies setup.py to only installs PyQt5 in a conda environment if PyQt5 could not be imported. I presume this is safe.
While I dislike that requirements are now not so easily determined with this PR, it should not change anything for non-conda installs. For conda environments, it correctly handles the following:
pip install -e .in a conda installed orange3 environment will not install double (conflicting) PyQts (fixed with this PR)pip install orange3in a fresh conda environment will still install pyqt5 from pip (as before)Includes