set pyqt5 as optional lib

tywt-code · Oct 11, 2019 · acf42e4 · acf42e4
1 parent 759bd00
commit acf42e4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/NuistRadar/GraphicalInterface/RadarUI.py b/NuistRadar/GraphicalInterface/RadarUI.py
@@ -15,7 +15,6 @@
 from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar
 import cartopy.crs as ccrs
 
-
 # Matplotlib canvas class to create figure
 class MplCanvas(Canvas):
  def __init__(self):

diff --git a/NuistRadar/GraphicalInterface/__init__.py b/NuistRadar/GraphicalInterface/__init__.py
@@ -1,3 +1,3 @@
-from . import RadarInterface, icons, RadarUI, station_info
+from . import RadarUI, RadarInterface, icons, station_info
 
 __all__ = ["RadarInterface", "RadarUI", "station_info", "icons"]
diff --git a/NuistRadar/GraphicalInterface/station_info.py b/NuistRadar/GraphicalInterface/station_info.py
@@ -3,11 +3,11 @@
 """
 Module implementing Dialog.
 """
-
 from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtWidgets import QDialog
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+
 # -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'F:\Eric\Radar\info.ui'

diff --git a/NuistRadar/__init__.py b/NuistRadar/__init__.py
@@ -1,3 +1,3 @@
-from . import configure, core, draw, io, interp, GraphicalInterface
-__all__ = ["configure", "core", "draw", "io", "interp", "GraphicalInterface"]
+from . import configure, core, draw, io, interp
+__all__ = ["configure", "core", "draw", "io", "interp"]
 
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 URL = "https://github.com/YvZheng"
 PYTHON_REQUIRES = ">=3.6"
 INSTALL_REQUIRES = ["matplotlib==2.2.3", "pyproj==1.9.6", "Cartopy==0.17.0", "xarray==0.12.1",\
-"numpy==1.17.2+mkl", "scipy==1.1.0", "pandas==0.23.4", "PyQt5==5.13.1", "netCDF4==1.5.2"]
+"numpy==1.17.2", "scipy==1.1.0", "pandas==0.23.4", "PyQt5==5.13.1", "netCDF4==1.5.2"]
 DESCRIPTION = "China Weather Radar tools"
 LONG_DESCRIPTION = """The Weather Radar Toolkit, support most of China's radar formats
 (WSR98D, CINRAD/SA/SB/CB, CINRAD/CC/CCJ, CINRAD/SC/CD)"""
@@ -32,6 +32,6 @@
  url=URL,
  include_package_data = True,
  packages=find_packages(parent_dir),
- package_data={"NuistRadar": ["data/*.*","__init_.py", "draw/colormap/balance-rgb.txt"]},
+ package_data={"NuistRadar": ["data/*.*","__init_.py", "GraphicalInterface/*.py", "draw/colormap/balance-rgb.txt"]},
 )