Skip to content

Commit

Permalink
Merge pull request #177 from jenshnielsen/cleanup_install
Browse files Browse the repository at this point in the history
Small packaging cleanups
  • Loading branch information
jenshnielsen committed Feb 24, 2021
2 parents 58acd3c + 085b9e1 commit f322e77
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 23 deletions.
14 changes: 0 additions & 14 deletions mypy.ini

This file was deleted.

6 changes: 4 additions & 2 deletions plottr/apps/inspectr.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ def __init__(self, parent: Optional[QtWidgets.QWidget] = None,
self.loadDBProcess.pathSet.connect(self.loadDBThread.start)
self.loadDBProcess.dbdfLoaded.connect(self.DBLoaded)
self.loadDBProcess.dbdfLoaded.connect(self.loadDBThread.quit)
self.loadDBThread.started.connect(self.loadDBProcess.loadDB) # type: ignore[attr-defined]
self.loadDBThread.started.connect(self.loadDBProcess.loadDB)

### connect signals/slots

Expand Down Expand Up @@ -561,7 +561,9 @@ def main(dbPath: Optional[str]) -> None:
win.show()

if (sys.flags.interactive != 1) or not hasattr(QtCore, 'PYQT_VERSION'):
QtWidgets.QApplication.instance().exec_()
appinstance = QtWidgets.QApplication.instance()
assert appinstance is not None
appinstance.exec_()


def script() -> None:
Expand Down
2 changes: 1 addition & 1 deletion plottr/apps/ui/Monitr_UI.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def setupUi(self, MainWindow: QtWidgets.QMainWindow) -> None:
self.retranslateUi(MainWindow)
MainWindow.dataFileSelected.connect(self.fileContents.setData)
self.fileList.dataFileSelected.connect(MainWindow.processFileSelection)
self.fileContents.customContextMenuRequested['QPoint'].connect(self.fileContents.onCustomContextMenuRequested) # type: ignore[index]
self.fileContents.customContextMenuRequested['QPoint'].connect(self.fileContents.onCustomContextMenuRequested)
self.fileContents.plotRequested.connect(MainWindow.plotSelected)
self.fileList.itemSelectionChanged.connect(self.fileList.processSelection)
self.fileList.newDataFilesFound.connect(MainWindow.onNewDataFilesFound)
Expand Down
19 changes: 14 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@

# See the docstring in versioneer.py for instructions. Note that you must
# re-run 'versioneer.py setup' after changing this section, and commit the
# resulting files.

[versioneer]
VCS = git
style = pep440
Expand All @@ -11,3 +6,17 @@ versionfile_build = plottr/_version.py
tag_prefix = v
parentdir_prefix = plottr-

[mypy]
strict_optional = True
ignore_missing_imports = True
show_column_numbers = True
warn_unused_ignores = True
warn_unused_configs = True
warn_redundant_casts = True
no_implicit_optional = True

[mypy-plottr.*]
disallow_untyped_defs = True

[mypy-plottr._version]
ignore_errors = True
1 change: 0 additions & 1 deletion test_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ pytest
pytest-qt
mypy
PyQt5-stubs
git+https://github.com/numpy/numpy-stubs.git

0 comments on commit f322e77

Please sign in to comment.