Merge lp:~santi73/encuentro/qt5 into lp:encuentro
- qt5
- Merge into trunk
Proposed by
Santiago Torres Batan
Status: | Needs review |
---|---|
Proposed branch: | lp:~santi73/encuentro/qt5 |
Merge into: | lp:encuentro |
Diff against target: |
367 lines (+49/-43) 17 files modified
LEEME.txt (+2/-2) debian/control (+1/-1) encuentro/__init__.py (+2/-2) encuentro/main.py (+2/-1) encuentro/network.py (+1/-1) encuentro/ui/central_panel.py (+14/-12) encuentro/ui/dialogs.py (+2/-2) encuentro/ui/main.py (+9/-5) encuentro/ui/preferences.py (+3/-3) encuentro/ui/remembering.py (+2/-2) encuentro/ui/systray.py (+2/-1) encuentro/ui/throbber.py (+3/-5) encuentro/ui/wizard.py (+2/-2) encuentro/update.py (+1/-1) encuentro/utils.py (+1/-1) setup.py (+1/-1) source_encuentro.py (+1/-1) |
To merge this branch: | bzr merge lp:~santi73/encuentro/qt5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Facundo Batista | Pending | ||
Review via email: mp+360976@code.launchpad.net |
Commit message
- Encuentro Qt5 Port
Description of the change
- Encuentro Qt5 Port
To post a comment you must log in.
Unmerged revisions
- 304. By Santiago Torres Batan
-
- Encuentro QT5 Port.
- Modified all files to include and use Qt5. Also description files.
- Functional version, although backends are still broken.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'LEEME.txt' | |||
2 | --- LEEME.txt 2015-06-23 01:50:11 +0000 | |||
3 | +++ LEEME.txt 2018-12-16 20:31:43 +0000 | |||
4 | @@ -39,7 +39,7 @@ | |||
5 | 39 | python 2.6.6 | 39 | python 2.6.6 |
6 | 40 | python-requests 2.2.1 | 40 | python-requests 2.2.1 |
7 | 41 | python-defer 1.0.6 | 41 | python-defer 1.0.6 |
9 | 42 | python-qt4 4.9.1 | 42 | python-qt5 5.7 |
10 | 43 | python-xdg 0.15 | 43 | python-xdg 0.15 |
11 | 44 | python-bs4 4.1.0 | 44 | python-bs4 4.1.0 |
12 | 45 | python-notify 0.1.1 | 45 | python-notify 0.1.1 |
13 | @@ -57,7 +57,7 @@ | |||
14 | 57 | cualquier otra causa, tenés que seguir los siguientes pasos: | 57 | cualquier otra causa, tenés que seguir los siguientes pasos: |
15 | 58 | 58 | ||
16 | 59 | Es necesario hacer un branch del proyecto, o descargar el tarball, | 59 | Es necesario hacer un branch del proyecto, o descargar el tarball, |
18 | 60 | tener instalado python-qt4 y python-notify. Al generar el virtualenv tenés | 60 | tener instalado python-qt5 y python-notify. Al generar el virtualenv tenés |
19 | 61 | que utilizar la opción '--system-site-packages'. | 61 | que utilizar la opción '--system-site-packages'. |
20 | 62 | 62 | ||
21 | 63 | Crear el virtualenv: | 63 | Crear el virtualenv: |
22 | 64 | 64 | ||
23 | === modified file 'debian/control' | |||
24 | --- debian/control 2016-01-05 01:43:08 +0000 | |||
25 | +++ debian/control 2018-12-16 20:31:43 +0000 | |||
26 | @@ -14,7 +14,7 @@ | |||
27 | 14 | python (>=2.7), | 14 | python (>=2.7), |
28 | 15 | python-requests (>= 0.12.1), | 15 | python-requests (>= 0.12.1), |
29 | 16 | python-defer (>= 1.0.6), | 16 | python-defer (>= 1.0.6), |
31 | 17 | python-qt4 (>= 4.9.1), | 17 | python-qt5 (>= 4.9.1), |
32 | 18 | python-xdg (>= 0.15), | 18 | python-xdg (>= 0.15), |
33 | 19 | python-notify (>= 0.1.1), | 19 | python-notify (>= 0.1.1), |
34 | 20 | python-bs4 (>= 4.1.0), | 20 | python-bs4 (>= 4.1.0), |
35 | 21 | 21 | ||
36 | === modified file 'encuentro/__init__.py' | |||
37 | --- encuentro/__init__.py 2015-12-21 18:03:34 +0000 | |||
38 | +++ encuentro/__init__.py 2018-12-16 20:31:43 +0000 | |||
39 | @@ -73,7 +73,7 @@ | |||
40 | 73 | import xdg # NOQA | 73 | import xdg # NOQA |
41 | 74 | with NiceImporter('requests', 'python-requests', '2.2.1'): | 74 | with NiceImporter('requests', 'python-requests', '2.2.1'): |
42 | 75 | import requests # NOQA | 75 | import requests # NOQA |
45 | 76 | with NiceImporter('PyQt4.QtCore', 'PyQt4', '4.9.1'): | 76 | with NiceImporter('PyQt5.QtCore', 'PyQt5', '4.9.1'): |
46 | 77 | import PyQt4.QtCore # NOQA | 77 | import PyQt5.QtCore # NOQA |
47 | 78 | with NiceImporter('defer', 'python-defer', '1.0.6'): | 78 | with NiceImporter('defer', 'python-defer', '1.0.6'): |
48 | 79 | import defer # NOQA | 79 | import defer # NOQA |
49 | 80 | 80 | ||
50 | === modified file 'encuentro/main.py' | |||
51 | --- encuentro/main.py 2017-06-23 00:35:18 +0000 | |||
52 | +++ encuentro/main.py 2018-12-16 20:31:43 +0000 | |||
53 | @@ -30,7 +30,8 @@ | |||
54 | 30 | # will try to load EpisodeData from this namespace | 30 | # will try to load EpisodeData from this namespace |
55 | 31 | from encuentro.data import EpisodeData # NOQA | 31 | from encuentro.data import EpisodeData # NOQA |
56 | 32 | 32 | ||
58 | 33 | from PyQt4.QtGui import QApplication, QIcon | 33 | from PyQt5.QtGui import QIcon |
59 | 34 | from PyQt5.QtWidgets import QApplication | ||
60 | 34 | 35 | ||
61 | 35 | logger = logging.getLogger('encuentro.init') | 36 | logger = logging.getLogger('encuentro.init') |
62 | 36 | 37 | ||
63 | 37 | 38 | ||
64 | === modified file 'encuentro/network.py' | |||
65 | --- encuentro/network.py 2017-06-23 00:35:18 +0000 | |||
66 | +++ encuentro/network.py 2018-12-16 20:31:43 +0000 | |||
67 | @@ -43,7 +43,7 @@ | |||
68 | 43 | for n in "QDate QDateTime QString QTextStream QTime QUrl QVariant".split(): | 43 | for n in "QDate QDateTime QString QTextStream QTime QUrl QVariant".split(): |
69 | 44 | sip.setapi(n, 2) # API v2 FTW! | 44 | sip.setapi(n, 2) # API v2 FTW! |
70 | 45 | 45 | ||
72 | 46 | from PyQt4 import QtNetwork, QtCore # NOQA (import not at the top) | 46 | from PyQt5 import QtNetwork, QtCore # NOQA (import not at the top) |
73 | 47 | 47 | ||
74 | 48 | from encuentro import multiplatform, utils # NOQA (import not at the top) | 48 | from encuentro import multiplatform, utils # NOQA (import not at the top) |
75 | 49 | from encuentro.config import config # NOQA (import not at the top) | 49 | from encuentro.config import config # NOQA (import not at the top) |
76 | 50 | 50 | ||
77 | === modified file 'encuentro/ui/central_panel.py' | |||
78 | --- encuentro/ui/central_panel.py 2015-12-31 04:19:10 +0000 | |||
79 | +++ encuentro/ui/central_panel.py 2018-12-16 20:31:43 +0000 | |||
80 | @@ -23,28 +23,30 @@ | |||
81 | 23 | import logging | 23 | import logging |
82 | 24 | import operator | 24 | import operator |
83 | 25 | 25 | ||
85 | 26 | from PyQt4.QtGui import ( | 26 | from PyQt5.QtWidgets import ( |
86 | 27 | QAbstractItemView, | 27 | QAbstractItemView, |
87 | 28 | QAbstractTextDocumentLayout, | ||
88 | 29 | QApplication, | 28 | QApplication, |
89 | 30 | QBrush, | ||
90 | 31 | QColor, | ||
91 | 32 | QHBoxLayout, | 29 | QHBoxLayout, |
92 | 33 | QImage, | ||
93 | 34 | QLabel, | 30 | QLabel, |
94 | 35 | QMenu, | 31 | QMenu, |
95 | 36 | QPixmap, | ||
96 | 37 | QPushButton, | 32 | QPushButton, |
97 | 38 | QStyle, | 33 | QStyle, |
99 | 39 | QStyleOptionViewItemV4, | 34 | QStyleOptionViewItem, |
100 | 40 | QStyledItemDelegate, | 35 | QStyledItemDelegate, |
101 | 41 | QTextDocument, | ||
102 | 42 | QTextEdit, | 36 | QTextEdit, |
103 | 43 | QTreeWidgetItem, | 37 | QTreeWidgetItem, |
104 | 44 | QVBoxLayout, | 38 | QVBoxLayout, |
105 | 45 | QWidget, | 39 | QWidget, |
106 | 46 | ) | 40 | ) |
108 | 47 | from PyQt4.QtCore import Qt, QSize, QAbstractTableModel | 41 | from PyQt5.QtGui import ( |
109 | 42 | QAbstractTextDocumentLayout, | ||
110 | 43 | QBrush, | ||
111 | 44 | QColor, | ||
112 | 45 | QImage, | ||
113 | 46 | QPixmap, | ||
114 | 47 | QTextDocument, | ||
115 | 48 | ) | ||
116 | 49 | from PyQt5.QtCore import Qt, QSize, QAbstractTableModel | ||
117 | 48 | 50 | ||
118 | 49 | from encuentro import data, image | 51 | from encuentro import data, image |
119 | 50 | from encuentro.config import config, signal | 52 | from encuentro.config import config, signal |
120 | @@ -213,7 +215,7 @@ | |||
121 | 213 | if index.column() != self._html_column: | 215 | if index.column() != self._html_column: |
122 | 214 | return QStyledItemDelegate.paint(self, painter, option, index) | 216 | return QStyledItemDelegate.paint(self, painter, option, index) |
123 | 215 | 217 | ||
125 | 216 | options = QStyleOptionViewItemV4(option) | 218 | options = QStyleOptionViewItem(option) |
126 | 217 | self.initStyleOption(options, index) | 219 | self.initStyleOption(options, index) |
127 | 218 | 220 | ||
128 | 219 | if options.widget is None: | 221 | if options.widget is None: |
129 | @@ -238,7 +240,7 @@ | |||
130 | 238 | 240 | ||
131 | 239 | def sizeHint(self, option, index): | 241 | def sizeHint(self, option, index): |
132 | 240 | """Calculate the needed size.""" | 242 | """Calculate the needed size.""" |
134 | 241 | options = QStyleOptionViewItemV4(option) | 243 | options = QStyleOptionViewItem(option) |
135 | 242 | self.initStyleOption(options, index) | 244 | self.initStyleOption(options, index) |
136 | 243 | 245 | ||
137 | 244 | doc = QTextDocument() | 246 | doc = QTextDocument() |
138 | @@ -377,7 +379,7 @@ | |||
139 | 377 | self.verticalHeader().hide() | 379 | self.verticalHeader().hide() |
140 | 378 | header = self.horizontalHeader() | 380 | header = self.horizontalHeader() |
141 | 379 | header.setStretchLastSection(False) | 381 | header.setStretchLastSection(False) |
143 | 380 | header.setResizeMode(2, header.Stretch) | 382 | header.setSectionResizeMode(2, header.Stretch) |
144 | 381 | header.sortIndicatorChanged.connect(self._model.sort) | 383 | header.sortIndicatorChanged.connect(self._model.sort) |
145 | 382 | 384 | ||
146 | 383 | # other behaviour configs | 385 | # other behaviour configs |
147 | 384 | 386 | ||
148 | === modified file 'encuentro/ui/dialogs.py' | |||
149 | --- encuentro/ui/dialogs.py 2015-12-21 18:03:34 +0000 | |||
150 | +++ encuentro/ui/dialogs.py 2018-12-16 20:31:43 +0000 | |||
151 | @@ -20,7 +20,7 @@ | |||
152 | 20 | 20 | ||
153 | 21 | """Several dialogs.""" | 21 | """Several dialogs.""" |
154 | 22 | 22 | ||
156 | 23 | from PyQt4.QtGui import ( | 23 | from PyQt5.QtWidgets import ( |
157 | 24 | QDialog, | 24 | QDialog, |
158 | 25 | QDialogButtonBox, | 25 | QDialogButtonBox, |
159 | 26 | QLabel, | 26 | QLabel, |
160 | @@ -93,7 +93,7 @@ | |||
161 | 93 | if __name__ == '__main__': | 93 | if __name__ == '__main__': |
162 | 94 | import sys | 94 | import sys |
163 | 95 | 95 | ||
165 | 96 | from PyQt4.QtGui import QApplication | 96 | from PyQt5.QtGui import QApplication |
166 | 97 | app = QApplication(sys.argv) | 97 | app = QApplication(sys.argv) |
167 | 98 | 98 | ||
168 | 99 | frame = UpdateDialog() | 99 | frame = UpdateDialog() |
169 | 100 | 100 | ||
170 | === modified file 'encuentro/ui/main.py' | |||
171 | --- encuentro/ui/main.py 2017-06-23 00:35:18 +0000 | |||
172 | +++ encuentro/ui/main.py 2018-12-16 20:31:43 +0000 | |||
173 | @@ -26,10 +26,9 @@ | |||
174 | 26 | 26 | ||
175 | 27 | import defer | 27 | import defer |
176 | 28 | 28 | ||
178 | 29 | from PyQt4.QtGui import ( | 29 | from PyQt5.QtWidgets import ( |
179 | 30 | QAction, | 30 | QAction, |
180 | 31 | QCheckBox, | 31 | QCheckBox, |
181 | 32 | QKeySequence, | ||
182 | 33 | QLabel, | 32 | QLabel, |
183 | 34 | QLineEdit, | 33 | QLineEdit, |
184 | 35 | QMessageBox, | 34 | QMessageBox, |
185 | @@ -38,6 +37,9 @@ | |||
186 | 38 | QStyle, | 37 | QStyle, |
187 | 39 | QWidget, | 38 | QWidget, |
188 | 40 | ) | 39 | ) |
189 | 40 | from PyQt5.QtGui import ( | ||
190 | 41 | QKeySequence, | ||
191 | 42 | ) | ||
192 | 41 | 43 | ||
193 | 42 | from encuentro import multiplatform, data, update | 44 | from encuentro import multiplatform, data, update |
194 | 43 | from encuentro.config import config, signal | 45 | from encuentro.config import config, signal |
195 | @@ -312,7 +314,9 @@ | |||
196 | 312 | # stuff pending | 314 | # stuff pending |
197 | 313 | m = "Hay programas todavía en proceso de descarga!\n¿Seguro quiere salir del programa?" | 315 | m = "Hay programas todavía en proceso de descarga!\n¿Seguro quiere salir del programa?" |
198 | 314 | QMB = QMessageBox | 316 | QMB = QMessageBox |
200 | 315 | dlg = QMB("Guarda!", m, QMB.Question, QMB.Yes, QMB.No, QMB.NoButton) | 317 | dlg = QMB(QMB.Question, "Guarda!", m, |
201 | 318 | QMB.Yes | QMB.No, None) | ||
202 | 319 | #dlg = QMB("Guarda!", m, QMB.Question, QMB.Yes, QMB.No, QMB.NoButton) | ||
203 | 316 | opt = dlg.exec_() | 320 | opt = dlg.exec_() |
204 | 317 | if opt != QMB.Yes: | 321 | if opt != QMB.Yes: |
205 | 318 | logger.info("Quit cancelled") | 322 | logger.info("Quit cancelled") |
206 | @@ -344,8 +348,8 @@ | |||
207 | 344 | text = repr(text) | 348 | text = repr(text) |
208 | 345 | 349 | ||
209 | 346 | QMB = QMessageBox | 350 | QMB = QMessageBox |
212 | 347 | dlg = QMB("Atención: " + err_type, text, QMB.Warning, | 351 | dlg = QMB(QMB.Warning, "Atención: " + err_type, text, |
213 | 348 | QMB.Ok, QMB.NoButton, QMB.NoButton) | 352 | QMB.Ok | QMB.NoButton, None) |
214 | 349 | dlg.exec_() | 353 | dlg.exec_() |
215 | 350 | 354 | ||
216 | 351 | def refresh_episodes(self, _=None): | 355 | def refresh_episodes(self, _=None): |
217 | 352 | 356 | ||
218 | === modified file 'encuentro/ui/preferences.py' | |||
219 | --- encuentro/ui/preferences.py 2015-12-21 18:03:34 +0000 | |||
220 | +++ encuentro/ui/preferences.py 2018-12-16 20:31:43 +0000 | |||
221 | @@ -24,7 +24,7 @@ | |||
222 | 24 | import sys | 24 | import sys |
223 | 25 | import logging | 25 | import logging |
224 | 26 | 26 | ||
226 | 27 | from PyQt4.QtGui import ( | 27 | from PyQt5.QtWidgets import ( |
227 | 28 | QCheckBox, | 28 | QCheckBox, |
228 | 29 | QCompleter, | 29 | QCompleter, |
229 | 30 | QDialog, | 30 | QDialog, |
230 | @@ -39,7 +39,7 @@ | |||
231 | 39 | QVBoxLayout, | 39 | QVBoxLayout, |
232 | 40 | QWidget, | 40 | QWidget, |
233 | 41 | ) | 41 | ) |
235 | 42 | from PyQt4.QtCore import Qt, QDir | 42 | from PyQt5.QtCore import Qt, QDir |
236 | 43 | 43 | ||
237 | 44 | from encuentro.config import config | 44 | from encuentro.config import config |
238 | 45 | 45 | ||
239 | @@ -212,7 +212,7 @@ | |||
240 | 212 | os.path.realpath(sys.argv[0])))) | 212 | os.path.realpath(sys.argv[0])))) |
241 | 213 | sys.path.insert(0, project_basedir) | 213 | sys.path.insert(0, project_basedir) |
242 | 214 | 214 | ||
244 | 215 | from PyQt4.QtGui import QApplication | 215 | from PyQt5.QtWidgets import QApplication |
245 | 216 | app = QApplication(sys.argv) | 216 | app = QApplication(sys.argv) |
246 | 217 | 217 | ||
247 | 218 | frame = PreferencesDialog() | 218 | frame = PreferencesDialog() |
248 | 219 | 219 | ||
249 | === modified file 'encuentro/ui/remembering.py' | |||
250 | --- encuentro/ui/remembering.py 2015-12-21 18:03:34 +0000 | |||
251 | +++ encuentro/ui/remembering.py 2018-12-16 20:31:43 +0000 | |||
252 | @@ -18,8 +18,8 @@ | |||
253 | 18 | 18 | ||
254 | 19 | """The remembering widgets.""" | 19 | """The remembering widgets.""" |
255 | 20 | 20 | ||
258 | 21 | from PyQt4.QtCore import Qt | 21 | from PyQt5.QtCore import Qt |
259 | 22 | from PyQt4.QtGui import ( | 22 | from PyQt5.QtWidgets import ( |
260 | 23 | QMainWindow, | 23 | QMainWindow, |
261 | 24 | QSplitter, | 24 | QSplitter, |
262 | 25 | QTableView, | 25 | QTableView, |
263 | 26 | 26 | ||
264 | === modified file 'encuentro/ui/systray.py' | |||
265 | --- encuentro/ui/systray.py 2015-12-21 18:03:34 +0000 | |||
266 | +++ encuentro/ui/systray.py 2018-12-16 20:31:43 +0000 | |||
267 | @@ -22,7 +22,8 @@ | |||
268 | 22 | 22 | ||
269 | 23 | from encuentro import multiplatform | 23 | from encuentro import multiplatform |
270 | 24 | 24 | ||
272 | 25 | from PyQt4.QtGui import QSystemTrayIcon, QIcon, QMenu | 25 | from PyQt5.QtWidgets import QSystemTrayIcon, QMenu |
273 | 26 | from PyQt5.QtGui import QIcon | ||
274 | 26 | 27 | ||
275 | 27 | logger = logging.getLogger("encuentro.systray") | 28 | logger = logging.getLogger("encuentro.systray") |
276 | 28 | 29 | ||
277 | 29 | 30 | ||
278 | === modified file 'encuentro/ui/throbber.py' | |||
279 | --- encuentro/ui/throbber.py 2014-04-26 02:36:13 +0000 | |||
280 | +++ encuentro/ui/throbber.py 2018-12-16 20:31:43 +0000 | |||
281 | @@ -18,11 +18,9 @@ | |||
282 | 18 | 18 | ||
283 | 19 | """A throbber.""" | 19 | """A throbber.""" |
284 | 20 | 20 | ||
290 | 21 | from PyQt4.QtGui import ( | 21 | from PyQt5.QtWidgets import QLabel |
291 | 22 | QLabel, | 22 | from PyQt5.QtGui import QMovie |
292 | 23 | QMovie, | 23 | from PyQt5.QtCore import Qt |
288 | 24 | ) | ||
289 | 25 | from PyQt4.QtCore import Qt | ||
293 | 26 | 24 | ||
294 | 27 | from encuentro import multiplatform | 25 | from encuentro import multiplatform |
295 | 28 | 26 | ||
296 | 29 | 27 | ||
297 | === modified file 'encuentro/ui/wizard.py' | |||
298 | --- encuentro/ui/wizard.py 2015-12-21 18:03:34 +0000 | |||
299 | +++ encuentro/ui/wizard.py 2018-12-16 20:31:43 +0000 | |||
300 | @@ -22,7 +22,7 @@ | |||
301 | 22 | 22 | ||
302 | 23 | import logging | 23 | import logging |
303 | 24 | 24 | ||
305 | 25 | from PyQt4.QtGui import ( | 25 | from PyQt5.QtWidgets import ( |
306 | 26 | QCheckBox, | 26 | QCheckBox, |
307 | 27 | QDialog, | 27 | QDialog, |
308 | 28 | QDialogButtonBox, | 28 | QDialogButtonBox, |
309 | @@ -184,7 +184,7 @@ | |||
310 | 184 | if __name__ == '__main__': | 184 | if __name__ == '__main__': |
311 | 185 | import sys | 185 | import sys |
312 | 186 | 186 | ||
314 | 187 | from PyQt4.QtGui import QApplication | 187 | from PyQt5.QtWidgets import QApplication |
315 | 188 | app = QApplication(sys.argv) | 188 | app = QApplication(sys.argv) |
316 | 189 | app.have_metadata = lambda: False | 189 | app.have_metadata = lambda: False |
317 | 190 | app.have_config = lambda: False | 190 | app.have_config = lambda: False |
318 | 191 | 191 | ||
319 | === modified file 'encuentro/update.py' | |||
320 | --- encuentro/update.py 2017-06-23 00:35:18 +0000 | |||
321 | +++ encuentro/update.py 2018-12-16 20:31:43 +0000 | |||
322 | @@ -29,7 +29,7 @@ | |||
323 | 29 | 29 | ||
324 | 30 | import defer | 30 | import defer |
325 | 31 | 31 | ||
327 | 32 | from PyQt4.QtGui import QApplication | 32 | from PyQt5.QtWidgets import QApplication |
328 | 33 | 33 | ||
329 | 34 | from encuentro import utils | 34 | from encuentro import utils |
330 | 35 | from encuentro.config import config | 35 | from encuentro.config import config |
331 | 36 | 36 | ||
332 | === modified file 'encuentro/utils.py' | |||
333 | --- encuentro/utils.py 2016-01-04 16:20:52 +0000 | |||
334 | +++ encuentro/utils.py 2018-12-16 20:31:43 +0000 | |||
335 | @@ -21,7 +21,7 @@ | |||
336 | 21 | import defer | 21 | import defer |
337 | 22 | import os | 22 | import os |
338 | 23 | 23 | ||
340 | 24 | from PyQt4 import QtNetwork, QtCore | 24 | from PyQt5 import QtNetwork, QtCore |
341 | 25 | 25 | ||
342 | 26 | _qt_network_manager = QtNetwork.QNetworkAccessManager() | 26 | _qt_network_manager = QtNetwork.QNetworkAccessManager() |
343 | 27 | 27 | ||
344 | 28 | 28 | ||
345 | === modified file 'setup.py' | |||
346 | --- setup.py 2016-01-04 21:45:26 +0000 | |||
347 | +++ setup.py 2018-12-16 20:31:43 +0000 | |||
348 | @@ -23,7 +23,7 @@ | |||
349 | 23 | python 2.7 | 23 | python 2.7 |
350 | 24 | python-requests 0.12.1 | 24 | python-requests 0.12.1 |
351 | 25 | python-defer 1.0.6 | 25 | python-defer 1.0.6 |
353 | 26 | python-qt4 4.9.1 | 26 | python-qt5 5.7 |
354 | 27 | python-xdg 0.15 | 27 | python-xdg 0.15 |
355 | 28 | python-notify 0.1.1 # not really needed, but provides notifications | 28 | python-notify 0.1.1 # not really needed, but provides notifications |
356 | 29 | python-bs4 4.1.0 | 29 | python-bs4 4.1.0 |
357 | 30 | 30 | ||
358 | === modified file 'source_encuentro.py' | |||
359 | --- source_encuentro.py 2014-05-02 14:03:39 +0000 | |||
360 | +++ source_encuentro.py 2018-12-16 20:31:43 +0000 | |||
361 | @@ -29,5 +29,5 @@ | |||
362 | 29 | attach_file_if_exists(report, fname, "EncuentroLog") | 29 | attach_file_if_exists(report, fname, "EncuentroLog") |
363 | 30 | 30 | ||
364 | 31 | # info about dependencies | 31 | # info about dependencies |
366 | 32 | packages = ["python-requests", "python-defer", "python-qt4", "python-xdg"] | 32 | packages = ["python-requests", "python-defer", "python-qt5", "python-xdg"] |
367 | 33 | attach_related_packages(report, packages) | 33 | attach_related_packages(report, packages) |