Skip to content
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.

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

Upgrade gRPC and PySide Python dependencies. #1003

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion VERSION.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.13
0.14
3 changes: 2 additions & 1 deletion ci/pylintrc_main
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ confidence=
# --enable=similarities". If you want to run only the classes checker, but have
# no Warning level messages displayed, use "--disable=all --enable=classes
# --disable=W".
disable=duplicate-code,
disable=c-extension-no-member,
duplicate-code,
fixme,
invalid-name,
locally-disabled,
Expand Down
2 changes: 2 additions & 0 deletions cuegui/cuegui/AbstractDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ def _newCheckBoxSelectionMatrix(title, allowedOptions, checkedOptions, parent=No

def _newDialogButtonBox(self, buttons, orientation=QtCore.Qt.Horizontal):
buttonBox = QtWidgets.QDialogButtonBox(buttons, orientation, self)
# pylint: disable=no-member
buttonBox.accepted.connect(self.accept)
buttonBox.rejected.connect(self.reject)
# pylint: enable=no-member
return buttonBox

def _addWidgetRow(self, *widgets):
Expand Down
8 changes: 4 additions & 4 deletions cuegui/cuegui/AbstractTreeWidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ def __init__(self, parent):

self.__setupColumnMenu()

# pylint: disable=no-member
self.itemClicked.connect(self.__itemSingleClickedEmitToApp)
self.itemDoubleClicked.connect(self.__itemDoubleClickedEmitToApp)
self._timer.timeout.connect(self.updateRequest)
# pylint: disable=no-member
QtGui.qApp.request_update.connect(self.updateRequest)
# pylint: enable=no-member

Expand Down Expand Up @@ -215,7 +215,7 @@ def startTicksUpdate(self, updateInterval,

self.ticksLock = QtCore.QMutex()
self.__ticksTimer = QtCore.QTimer(self)
self.__ticksTimer.timeout.connect(self.__tick)
self.__ticksTimer.timeout.connect(self.__tick) # pylint: disable=no-member
self.__ticksTimer.start(1000)
self.ticksWithoutUpdate = 999

Expand Down Expand Up @@ -509,7 +509,7 @@ def __setupColumnMenu(self):
self.__dropdown.setFixedHeight(self.header().height() - 10)
self.__dropdown.setToolTip("Click to select columns to display")
self.__dropdown.setIcon(QtGui.QIcon(":column_popdown.png"))
self.__dropdown.clicked.connect(self.__displayColumnMenu)
self.__dropdown.clicked.connect(self.__displayColumnMenu) # pylint: disable=no-member

layout = QtWidgets.QHBoxLayout(self.header())
layout.setContentsMargins(0, 0, 0, 0)
Expand All @@ -521,7 +521,7 @@ def __displayColumnMenu(self):
self.__dropdown.height()))

menu = QtWidgets.QMenu(self)
menu.triggered.connect(self.__handleColumnMenu)
menu.triggered.connect(self.__handleColumnMenu) # pylint: disable=no-member
for col in range(self.columnCount()):
if self.columnWidth(col) or self.isColumnHidden(col):
name = self.__columnInfoByType[self.__columnPrimaryType][col][COLUMN_NAME]
Expand Down
2 changes: 1 addition & 1 deletion cuegui/cuegui/Action.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ def __init__(self,callback=None, parent=None):
self.setText("Refresh")
self.setIcon(QtGui.QIcon(":/images/stock-refresh.png"))
if callback:
self.triggered.connect(callback)
self.triggered.connect(callback) # pylint: disable=no-member
4 changes: 4 additions & 0 deletions cuegui/cuegui/Comments.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ def __init__(self, source, parent=None):
btnLayout.addWidget(self.__btnClose)
layout.addLayout(btnLayout)

# pylint: disable=no-member
self.__treeSubjects.itemSelectionChanged.connect(self.__itemChanged)
self.__comboMacro.currentTextChanged.connect(self.__macroHandle)
self.__btnSave.pressed.connect(self.__saveComment)
Expand All @@ -102,6 +103,7 @@ def __init__(self, source, parent=None):
self.__btnClose.pressed.connect(self.__close)
self.__textSubject.textEdited.connect(self.__textEdited)
self.__textMessage.textChanged.connect(self.__textEdited)
# pylint: enable=no-member

self.refreshComments()
self.__macroLoad()
Expand Down Expand Up @@ -333,8 +335,10 @@ def __init__(self, name="", subject="", message="", parent=None):
layout.addWidget(self.__textMessage)
layout.addLayout(btnLayout)

# pylint: disable=no-member
self.__btnSave.pressed.connect(self.__save)
self.__btnCancel.pressed.connect(self.reject)
# pylint: enable=no-member

def __save(self):
"""Validates and then exits from the dialog in success"""
Expand Down
2 changes: 2 additions & 0 deletions cuegui/cuegui/ConfirmationDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,7 @@ def __init__(self, title, text, items=[], parent=None):
self.setMaximumSize(400,300)
self.setWindowTitle(title)

# pylint: disable=no-member
__btn_accept.clicked.connect(self.accept)
__btn_cancel.clicked.connect(self.reject)
# pylint: enable=no-member
2 changes: 2 additions & 0 deletions cuegui/cuegui/CreateShowDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ def __init__(self, parent=None):
self.layout().addWidget(self.__create_btn, 5, 1)
self.layout().addWidget(self.__cancel_btn, 5, 2)

# pylint: disable=no-member
self.__create_btn.clicked.connect(self.__createShow)
self.__cancel_btn.clicked.connect(self.__cancelDialog)
# pylint: enable=no-member
self.adjustSize()

def __createSubscriptionWidget(self):
Expand Down
2 changes: 2 additions & 0 deletions cuegui/cuegui/CreatorDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,10 @@ def __init__(self, show=None, parent=None):
layout.addWidget(self.__buttons)

self.resize(400, 0)
# pylint: disable=no-member
self.__buttons.accepted.connect(self.create)
self.__buttons.rejected.connect(self.close)
# pylint: enable=no-member

def create(self):
self.__creator.create()
Expand Down
2 changes: 1 addition & 1 deletion cuegui/cuegui/CueJobMonitorTree.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ def __init__(self, parent):

# pylint: disable=no-member
QtGui.qApp.facility_changed.connect(self.removeAllShows)
# pylint: enable=no-member
self.itemClicked.connect(self.__itemSingleClickedCopy)
self.itemClicked.connect(self.__itemSingleClickedComment)
# pylint: enable=no-member

# Skip updates if the user is scrolling
self._limitUpdatesDuringScrollSetup()
Expand Down
2 changes: 1 addition & 1 deletion cuegui/cuegui/CueStateBarWidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def __init__(self, sourceTree, parent=None):
self.__timer = QtCore.QTimer(self)
self.__lastUpdate = 0

self.__timer.timeout.connect(self.updateColors)
self.__timer.timeout.connect(self.updateColors) # pylint: disable=no-member
self.__sourceTree.verticalScrollBar().valueChanged.connect(self.update)
self.__sourceTree.verticalScrollBar().rangeChanged.connect(self.__updateColors)

Expand Down
2 changes: 1 addition & 1 deletion cuegui/cuegui/DependWizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ def __init__(self, parent):
self._addLabel("Depend on Job:", 0, 0)

self.__jobFilterLineEdit = self._addLineEdit(2, 0, "")
self.__jobFilterLineEdit.textChanged.connect(self.filterJobs)
self.__jobFilterLineEdit.textChanged.connect(self.filterJobs) # pylint: disable=no-member

self.__jobList = self._addListWidget(3, 0)

Expand Down
4 changes: 4 additions & 0 deletions cuegui/cuegui/EmailDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,10 @@ def __init__(self, job, frames, parent=None):
ly.addWidget(self.__txt_find)
ly.addWidget(self.__txt_log)

# pylint: disable=no-member
self.__sel_frames.activated.connect(self.switchLogEvent)
self.__txt_find.returnPressed.connect(self.findEvent)
# pylint: enable=no-member

# pylint: disable=inconsistent-return-statements
def __getFrame(self, name):
Expand Down Expand Up @@ -247,8 +249,10 @@ def __init__(self, job, parent=None):
hlayout.addWidget(self.__btnCancel)
vlayout.addLayout(hlayout)

# pylint: disable=no-member
self.__btnSend.clicked.connect(self.sendEmail)
self.__btnCancel.clicked.connect(self.cancel.emit)
# pylint: enable=no-member

def giveFocus(self):
"""Initializes widget state when the widget gains focus."""
Expand Down
30 changes: 16 additions & 14 deletions cuegui/cuegui/FilterDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ def __init__(self, show, parent=None):
glayout.addWidget(self.__btnAddAction, 7, 7, 1, 1)
glayout.addWidget(self.__btnDone, 8, 7, 1, 1)

# pylint: disable=no-member
self.__filters.itemClicked.connect(self.__itemSingleClicked)
self.__btnRefresh.clicked.connect(self.__refresh)
self.__btnAddFilter.clicked.connect(self.__createFilter)
Expand All @@ -120,6 +121,7 @@ def __init__(self, show, parent=None):
self.__btnDeleteAllActions.clicked.connect(self.__actions.deleteAllActions)
self.__btnAddAction.clicked.connect(self.__actions.createAction)
self.__btnDone.clicked.connect(self.accept)
# pylint: enable=no-member

def __createFilter(self):
"""Prompts the user to create a new filter"""
Expand Down Expand Up @@ -584,13 +586,13 @@ def updateWidgets(self):
combo = QtWidgets.QCheckBox(self.parent())
combo.setFocusPolicy(QtCore.Qt.NoFocus)
self.treeWidget().setItemWidget(self, 1, combo)
combo.stateChanged.connect(self.setEnabled)
combo.stateChanged.connect(self.setEnabled) # pylint: disable=no-member
self.__widgets["enabled"] = combo

combo = NoWheelComboBox(self.parent())
combo.addItems(FILTERTYPE)
self.treeWidget().setItemWidget(self, 3, combo)
combo.currentIndexChanged.connect(self.setType)
combo.currentIndexChanged.connect(self.setType) # pylint: disable=no-member
self.__widgets["type"] = combo

self.__widgets["type"].setCurrentIndex(self.rpcObject.type())
Expand Down Expand Up @@ -653,23 +655,23 @@ def updateWidgets(self):
combo = NoWheelComboBox(parent)
combo.addItems(MATCHSUBJECT)
treeWidget.setItemWidget(self, 0, combo)
combo.currentIndexChanged.connect(self.setSubject)
combo.currentIndexChanged.connect(self.setSubject) # pylint: disable=no-member
self.__widgets["subject"] = combo

combo = NoWheelComboBox(parent)
combo.addItems(MATCHTYPE)
treeWidget.setItemWidget(self, 1, combo)
combo.currentIndexChanged.connect(self.setType)
combo.currentIndexChanged.connect(self.setType) # pylint: disable=no-member
self.__widgets["type"] = combo

edit = QtWidgets.QLineEdit("", parent)
treeWidget.setItemWidget(self, 2, edit)
edit.editingFinished.connect(self.setInput)
edit.editingFinished.connect(self.setInput) # pylint: disable=no-member
self.__widgets["input"] = edit

btn = QtWidgets.QPushButton(QtGui.QIcon(":kill.png"), "", parent)
treeWidget.setItemWidget(self, 3, btn)
btn.clicked.connect(self.delete)
btn.clicked.connect(self.delete) # pylint: disable=no-member
self.__widgets["delete"] = btn

self.__widgets["subject"].setCurrentIndex(self.rpcObject.subject())
Expand Down Expand Up @@ -755,50 +757,50 @@ def updateWidgets(self):
if self.rpcObject.type() in (opencue.api.filter_pb2.PAUSE_JOB,):
widget = NoWheelComboBox(self.parent())
widget.addItems(PAUSETYPE)
widget.currentIndexChanged.connect(self.__setValue)
widget.currentIndexChanged.connect(self.__setValue) # pylint: disable=no-member

elif self.rpcObject.type() in (opencue.api.filter_pb2.SET_JOB_PRIORITY,):
widget = NoWheelSpinBox(self.parent())
widget.setMaximum(99999)
widget.editingFinished.connect(self.__setValue)
widget.editingFinished.connect(self.__setValue) # pylint: disable=no-member

elif self.rpcObject.type() in (opencue.api.filter_pb2.SET_ALL_RENDER_LAYER_MEMORY,
opencue.api.filter_pb2.SET_ALL_RENDER_LAYER_CORES):
widget = NoWheelDoubleSpinBox(self.parent())
widget.setDecimals(2)
widget.setSingleStep(.10)
widget.setMaximum(MAX_RENDER_MEM)
widget.editingFinished.connect(self.__setValue)
widget.editingFinished.connect(self.__setValue) # pylint: disable=no-member

elif self.rpcObject.type() in (opencue.api.filter_pb2.SET_JOB_MAX_CORES,
opencue.api.filter_pb2.SET_JOB_MIN_CORES):
widget = NoWheelDoubleSpinBox(self.parent())
widget.setDecimals(0)
widget.setSingleStep(1)
widget.setMaximum(1000)
widget.editingFinished.connect(self.__setValue)
widget.editingFinished.connect(self.__setValue) # pylint: disable=no-member

elif self.rpcObject.type() in (opencue.api.filter_pb2.SET_ALL_RENDER_LAYER_TAGS,):
widget = QtWidgets.QLineEdit("", self.parent())
widget.editingFinished.connect(self.__setValue)
widget.editingFinished.connect(self.__setValue) # pylint: disable=no-member

elif self.rpcObject.type() in (opencue.api.filter_pb2.MOVE_JOB_TO_GROUP,):
widget = NoWheelComboBox(self.parent())
widget.addItems(list(self.treeWidget().groupNames.keys()))
widget.currentIndexChanged.connect(self.__setValue)
widget.currentIndexChanged.connect(self.__setValue) # pylint: disable=no-member

elif self.rpcObject.type() in (opencue.api.filter_pb2.SET_MEMORY_OPTIMIZER,):
widget = NoWheelComboBox(self.parent())
widget.addItems(MEMOPTTYPE)
widget.currentIndexChanged.connect(self.__setValue)
widget.currentIndexChanged.connect(self.__setValue) # pylint: disable=no-member

if widget:
self.treeWidget().setItemWidget(self, 1, widget)
self.__widgets["ActionValue"] = widget

btn = QtWidgets.QPushButton(QtGui.QIcon(":kill.png"), "", self.parent())
self.treeWidget().setItemWidget(self, 2, btn)
btn.clicked.connect(self.delete)
btn.clicked.connect(self.delete) # pylint: disable=no-member
self.__widgets["delete"] = btn

# Update the widget with the current value
Expand Down
14 changes: 7 additions & 7 deletions cuegui/cuegui/FrameMonitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def _refreshButtonSetup(self, layout):
self.btn_refresh = QtWidgets.QPushButton("Refresh")
self.btn_refresh.setFocusPolicy(QtCore.Qt.NoFocus)
layout.addWidget(self.btn_refresh)
self.btn_refresh.clicked.connect(self.frameMonitorTree.updateRequest)
self.btn_refresh.clicked.connect(self.frameMonitorTree.updateRequest) # pylint: disable=no-member
self.frameMonitorTree.updated.connect(self._refreshButtonDisableHandle)

def _refreshButtonEnableHandle(self):
Expand All @@ -191,7 +191,7 @@ def _clearButtonSetup(self, layout):
btn.setFocusPolicy(QtCore.Qt.NoFocus)
btn.setContentsMargins(0,0,0,0)
layout.addWidget(btn)
btn.clicked.connect(self._clearButtonHandle)
btn.clicked.connect(self._clearButtonHandle) # pylint: disable=no-member

def _clearButtonHandle(self):
"""Called when the clear button is clicked"""
Expand All @@ -213,14 +213,14 @@ def _pageButtonSetup(self, layout):
self.prev_page_btn.setFocusPolicy(QtCore.Qt.NoFocus)
self.prev_page_btn.setContentsMargins(0, 0, 0, 0)
layout.addWidget(self.prev_page_btn)
self.prev_page_btn.clicked.connect(lambda: self._pageButtonsHandle(-1))
self.prev_page_btn.clicked.connect(lambda: self._pageButtonsHandle(-1)) # pylint: disable=no-member

# Next page button
self.next_page_btn = QtWidgets.QPushButton(">")
self.next_page_btn.setFocusPolicy(QtCore.Qt.NoFocus)
self.next_page_btn.setContentsMargins(0, 0, 0, 0)
layout.addWidget(self.next_page_btn)
self.next_page_btn.clicked.connect(lambda: self._pageButtonsHandle(1))
self.next_page_btn.clicked.connect(lambda: self._pageButtonsHandle(1)) # pylint: disable=no-member
self.frameMonitorTree.job_changed.connect(self._updatePageButtonState)

# Page number label
Expand Down Expand Up @@ -299,7 +299,7 @@ def _selectStatusSetup(self, layout):

menu = QtWidgets.QMenu(self)
btn.setMenu(menu)
menu.triggered.connect(self._selectStatusHandle)
menu.triggered.connect(self._selectStatusHandle) # pylint: disable=no-member

for item in ["Clear", None, "Succeeded", "Running", "Waiting", "Depend", "Dead", "Eaten"]:
if item:
Expand Down Expand Up @@ -347,7 +347,7 @@ def _filterLayersUpdate(self):
else:
menu = QtWidgets.QMenu(self)
btn.setMenu(menu)
menu.triggered[QtWidgets.QAction].connect(self._filterLayersHandle)
menu.triggered[QtWidgets.QAction].connect(self._filterLayersHandle) # pylint: disable=unsubscriptable-object

if self.frameMonitorTree.getJob():
layers = [x.data.name for x in self.frameMonitorTree.getJob().getLayers()]
Expand Down Expand Up @@ -425,7 +425,7 @@ def _filterStatusSetup(self, layout):

menu = QtWidgets.QMenu(self)
btn.setMenu(menu)
menu.triggered.connect(self._filterStatusHandle)
menu.triggered.connect(self._filterStatusHandle) # pylint: disable=no-member

for item in [("Clear", QtCore.Qt.ALT + QtCore.Qt.Key_QuoteLeft),
None,
Expand Down
4 changes: 2 additions & 2 deletions cuegui/cuegui/FrameMonitorTree.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ def __init__(self, parent):
self.ticksWithoutUpdate = 999
self.__lastUpdateTime = None

self.itemClicked.connect(self.__itemSingleClickedCopy)
self.itemClicked.connect(self.__itemSingleClickedViewLog)
self.itemClicked.connect(self.__itemSingleClickedCopy) # pylint: disable=no-member
self.itemClicked.connect(self.__itemSingleClickedViewLog) # pylint: disable=no-member
self.itemDoubleClicked.connect(self.__itemDoubleClickedViewLog)
self.header().sortIndicatorChanged.connect(self.__sortByColumnSave)

Expand Down
2 changes: 1 addition & 1 deletion cuegui/cuegui/GarbageCollector.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def __init__(self, parent, debug=False):
self.debug = debug

self.timer = QtCore.QTimer(self)
self.timer.timeout.connect(self.check)
self.timer.timeout.connect(self.check) # pylint: disable=no-member

self.threshold = gc.get_threshold()
gc.disable()
Expand Down
4 changes: 4 additions & 0 deletions cuegui/cuegui/GroupDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,19 @@ def __createToggleInput(self, text, row, inputWidget, startEnabled):
self.layout().addWidget(check, row, 0)
self.layout().addWidget(label, row, 1)
self.layout().addWidget(inputWidget, row, 2)
# pylint: disable=no-member
check.stateChanged.connect(inputWidget.setEnabled)
check.stateChanged.connect(label.setEnabled)
# pylint: enable=no-member
return (check, inputWidget)

def __createButtons(self, buttons, row, width):
self.__buttons = QtWidgets.QDialogButtonBox(buttons, QtCore.Qt.Horizontal, self)
self.layout().addWidget(self.__buttons, row, 1, 1, width)
# pylint: disable=no-member
self.__buttons.accepted.connect(self.accept)
self.__buttons.rejected.connect(self.reject)
# pylint: enable=no-member

def accept(self):
__name = str(self._nameValue.text())
Expand Down
Loading