Skip to content

Commit e005475

Browse files
authored
Merge pull request #303 from djhoese/bugfix-dep-qt4agg
Update backend_qt4agg import to backend_qt5agg
2 parents 89804e8 + 4871587 commit e005475

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

build_conda_pack.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@ def main():
6767

6868
# HACK: https://github.com/conda/conda-pack/issues/141
6969
if sys.platform.startswith('win'):
70-
desired_prefix = sys.prefix # escaped backslashes (\\)
71-
in_file_prefix = sys.prefix.replace('\\', '/')
7270
with open(os.path.join(sys.prefix, 'qt.conf')) as qtconf:
73-
new_text = qtconf.read().replace(in_file_prefix, desired_prefix)
71+
new_text = qtconf.read().replace('/', r'\\')
7472
with open(os.path.join(sys.prefix, 'qt.conf'), 'w') as qtconf:
7573
qtconf.write(new_text)
7674
with open(os.path.join(sys.prefix, 'Library', 'bin', 'qt.conf'), 'w') as qtconf:

uwsift/view/probes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
from PyQt5.QtCore import QObject, pyqtSignal
2020
# http://stackoverflow.com/questions/12459811/how-to-embed-matplotib-in-pyqt-for-dummies
2121
# see also: http://matplotlib.org/users/navigation_toolbar.html
22-
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
23-
from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as NavigationToolbar
22+
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
23+
from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar
2424
from matplotlib.colors import LogNorm
2525
from matplotlib.figure import Figure
2626

0 commit comments

Comments
 (0)