Commit 2af21203 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

drop PyQt4

parent 6eafa4c0

Makefile

+2 −4
Original line number Diff line number Diff line
@@ -14,21 +14,19 @@ PROJVER=$(shell $(PYTHON) -c "from pysen.revision import VERSION; print(VERSION) 
PROJECT=$(PROJNAME)-$(PROJVER)





.PHONY: all build build-ui build-docs dist install test runtest check clean clean-ui clean-docs distclean

.PHONY: all build build-dist build-ui build-docs install test pylint clean clean-ui clean-docs distclean



all: build



build: build-ui build-docs

	@$(PYTHON) setup.py  build



dist:

build-dist: build

	@$(PYTHON) setup.py  bdist



install:

	@$(PYTHON) setup.py  install --home $(HOME)



runtest: test



test:

	@$(PYTHON) --version

	@PYTHONPATH=.  $(PYTHON) -m nose --verbosity=1 --exe ./test

pysen/revision.py

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
PySEN revision module

"""

import sys

__version__  = "0.7.4"

__version__  = "0.7.5"

__release__  = "dev1"

__date__     = "Feb 14, 2019"

#

pysen/ui/FileMonMainWindow.py

+5 −12
Original line number Diff line number Diff line
@@ -4,18 +4,11 @@ Main GUI window module. 
import os

import platform



try:

from PyQt5.QtCore    import Qt, QTimer, QT_VERSION_STR, PYQT_VERSION_STR

from PyQt5.QtGui     import QFont, QColor

from PyQt5.QtWidgets import (qApp, QMainWindow, QFrame, QLabel, QWidget, QSplitter,

                             QGridLayout, QScrollArea, QSizePolicy,

                             QPushButton, QMessageBox, QFontDialog)

except ImportError:

    from PyQt4.QtCore    import Qt, QTimer, QT_VERSION_STR, PYQT_VERSION_STR

    from PyQt4.QtGui     import (QFont, QColor,

                                 qApp, QMainWindow, QFrame, QLabel, QWidget, QSplitter,

                                 QGridLayout, QScrollArea, QSizePolicy,

                                 QPushButton, QMessageBox, QFontDialog)



# pylint: disable=locally-disabled,import-error

from .ui_FileMonMainWindow import Ui_FileMonMainWindow as Ui_MainWindow

scripts/nsecontrol.py

+2 −6
Original line number Diff line number Diff line
@@ -3,15 +3,11 @@ 
"""

Application main entry point/runner.

"""

__version__ = "0.2"

__version__ = "0.3"



#import argparse





try:

from PyQt5.QtWidgets import QApplication

except ImportError:

    from PyQt4.QtGui     import QApplication



from pysen.ui.NSEMainWindow import MainWindow