Merge branch 'release/1.7.0'

README.md

@@ -33,5 +33,3 @@ or
 - 完善scrapy_plugs
 - 完善selenium_api
 - 兼容python3
-
-

crwy/__init__.py

@@ -1 +1 @@
-version = '1.6.0'
+version = '1.7.0'

crwy/utils/sql/mysql.py

@@ -20,11 +20,11 @@
         "You should install pymysql first! try: pip install "
         "pymysql")
 try:
-    from DBUtils.PersistentDB import PersistentDB
+    from dbutils.persistent_db import PersistentDB
 except ImportError:
     raise CrwyImportException(
         "You should install DBUtils first! try: pip install "
-        "dbutils")
+        "dbutils>=2.0")
 
 
 @cls2singleton

crwy/utils/sql/pg.py

@@ -19,11 +19,11 @@
     raise CrwyImportException("You should install PyGreSQL first! try: pip "
                               "install PyGreSQL")
 try:
-    from DBUtils.PersistentDB import PersistentDB
+    from dbutils.persistent_db import PersistentDB
 except ImportError:
     raise CrwyImportException(
         "You should install DBUtils first! try: pip install "
-        "dbutils")
+        "dbutils>=2.0")
 
 
 @cls2singleton

requirements.txt

@@ -1,15 +1,8 @@
-Scrapy
-scrapy-redis
-scrapy-splash
-scrapy-sentry
-DBUtils
-python-dateutil
-SQLAlchemy
-pygresql
-PyMySQL
-beautifulsoup4
-configparser
-requests
-gevent
-imapclient
-redis
+beautifulsoup4>=4.5.1
+configparser>=3.5.0
+requests>=2.20.0
+gevent>=1.2.1
+retrying>=1.3.3
+imapclient>=2.0.0
+DBUtils>=2.0
+redis

setup.py

@@ -16,7 +16,7 @@
     version=version,
     url='https://github.com/wuyue92tree/crwy',
     description='A Simple Web Crawling and Web Scraping framework',
-    long_description=open('README.rst').read(),
+    long_description=open('README.rst', encoding='utf-8').read(),
     author='wuyue',
     author_email='[email protected]',
     maintainer='wuyue',