Skip to content

Update backend_qt4agg import to backend_qt5agg #303

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
merged 2 commits into from
Aug 6, 2020
Merged

Update backend_qt4agg import to backend_qt5agg #303

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
fdc5264
Update backend_qt4agg import to backend_qt5agg
djhoese Aug 6, 2020
4871587
Update conda pack qt.conf hack to be simpler
djhoese Aug 6, 2020
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
4 changes: 1 addition & 3 deletions build_conda_pack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ def main():

# HACK: https://github.com/conda/conda-pack/issues/141
if sys.platform.startswith('win'):
desired_prefix = sys.prefix # escaped backslashes (\\)
in_file_prefix = sys.prefix.replace('\\', '/')
with open(os.path.join(sys.prefix, 'qt.conf')) as qtconf:
new_text = qtconf.read().replace(in_file_prefix, desired_prefix)
new_text = qtconf.read().replace('/', r'\\')
with open(os.path.join(sys.prefix, 'qt.conf'), 'w') as qtconf:
qtconf.write(new_text)
with open(os.path.join(sys.prefix, 'Library', 'bin', 'qt.conf'), 'w') as qtconf:
Expand Down
4 changes: 2 additions & 2 deletions uwsift/view/probes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
from PyQt5.QtCore import QObject, pyqtSignal
# http://stackoverflow.com/questions/12459811/how-to-embed-matplotib-in-pyqt-for-dummies
# see also: http://matplotlib.org/users/navigation_toolbar.html
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as NavigationToolbar
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar
from matplotlib.colors import LogNorm
from matplotlib.figure import Figure

Expand Down