From d5169f24833ad1098918999be2ad990299e0c5e8 Mon Sep 17 00:00:00 2001
From: NMC-DAVE <daikan1998@163.com>
Date: Sat, 26 Feb 2022 10:29:32 +0800
Subject: [PATCH] Release 0.1.9.1 version.

---
 README.md                          |  3 +++
 nmc_met_io/__init__.py             |  2 +-
 nmc_met_io/retrieve_cassandraDB.py | 19 ++++++++++++++-----
 setup.py                           |  3 +--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index b5a48b3..3405d11 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,9 @@ Using the fellowing command to install packages:
 * 若需要使用将标准雷达格式转化为pyart格式程序`standard_data_to_pyart`, 请安装:
   - [arm_pyart](http://arm-doe.github.io/pyart/), `conda install -c conda-forge arm_pyart`
 
+* 若需要对Cassandra集群数据库进行访问, 请安装:
+  - [cassandra-driver](https://pypi.org/project/cassandra-driver/), 'pip install cassandra-driver'
+
 ## 设置配置文件
 若要访问CMADaaS(大数据云), MICAPS服务器等, 需在配置文件中设置地址和用户信息(若不需要, 则相应项无需配置).
 
diff --git a/nmc_met_io/__init__.py b/nmc_met_io/__init__.py
index 9fd14d6..17a5dea 100644
--- a/nmc_met_io/__init__.py
+++ b/nmc_met_io/__init__.py
@@ -4,4 +4,4 @@ from various data sources.
 """
 
 __author__ = "The R & D Center for Weather Forecasting Technology in NMC, CMA"
-__version__ = '0.1.9.0'
+__version__ = '0.1.9.1'
diff --git a/nmc_met_io/retrieve_cassandraDB.py b/nmc_met_io/retrieve_cassandraDB.py
index c4f3332..9210b5a 100644
--- a/nmc_met_io/retrieve_cassandraDB.py
+++ b/nmc_met_io/retrieve_cassandraDB.py
@@ -4,19 +4,23 @@
 # Distributed under the terms of the GPL V3 License.
 
 """
-Concat me with e-mail:songofsongs@vip.qq.com
-This is the retrieve module which get data from  cassandra DB
+This is the retrieve module which get data from cassandra DB
 with Python Cassandra driver API.
 
 The API is same as the retrieve_micaps_cassandra
+
+Change Log:
+  - Created by 王清龙/湖北/宜昌, 2022/2/26, e-mail:songofsongs@vip.qq.com
 """
 
+import sys
 import warnings
 from glob import glob
 import re
 import pickle
 import bz2
 import zlib
+import gzip
 from io import BytesIO
 from datetime import datetime, timedelta
 import numpy as np
@@ -25,9 +29,14 @@ import pandas as pd
 from tqdm import tqdm
 import nmc_met_io.config as CONFIG
 from nmc_met_io.read_radar import StandardData
-from cassandra.cluster import Cluster
-from cassandra.auth import PlainTextAuthProvider
-import gzip
+
+try:
+    from cassandra.cluster import Cluster
+    from cassandra.auth import PlainTextAuthProvider
+except ImportError:
+    print("cassandra-driver is not installed (pip install cassandra-driver)")
+    sys.exit(1)
+
 
 _db_client={
     "ClusterIPAddresses":CONFIG.CONFIG['Cassandra']['ClusterIPAddresses'].split(","),
diff --git a/setup.py b/setup.py
index 930b0b8..e4619ff 100644
--- a/setup.py
+++ b/setup.py
@@ -63,8 +63,7 @@ setup(
       'protobuf>=3.12.0',
       'urllib3>=1.25.9',
       'tqdm>=4.47.0',
-      'python-dateutil>=2.8.1',
-      'cassandra-driver>=3.18.0']
+      'python-dateutil>=2.8.1']
 )
 
 # development mode (DOS command):