Merge pull request liangliangyy#304 from liangliangyy/dev

升级依赖

requirements.txt

@@ -1,20 +1,21 @@
 appdirs==1.4.3
 asn1crypto==0.24.0
 astroid==2.2.5
+attrs==19.1.0
 bottle==0.12.17
 certifi==2019.6.16
 cffi==1.12.3
 chardet==3.0.4
-coverage==4.5.3
+coverage==4.5.4
 cryptography==2.7
-Django==2.2.3
+Django==2.2.4
 django-appconf==1.0.3
-django-autoslug==1.9.4
+django-autoslug==1.9.6
 django-compressor==2.3
 django-debug-toolbar==2.0
 django-haystack==2.8.1
 django-ipware==2.1.0
-django-mdeditor==0.1.14
+django-mdeditor==0.1.16
 django-uuslug==1.1.8
 elasticsearch==7.0.0
 elasticsearch-dsl==7.0.0
@@ -29,17 +30,17 @@ mccabe==0.6.1
 mistune==0.8.4
 mysqlclient==1.4.2.post1
 olefile==0.46
-packaging==19.0
-Pillow==6.0.0
+packaging==19.1
+Pillow==6.1.0
 pycparser==2.19
 Pygments==2.4.2
 pylint==2.3.1
-pyparsing==2.4.0
+pyparsing==2.4.2
 python-dateutil==2.8.0
 python-logstash==0.4.6
 python-memcached==1.59
-python-slugify==3.0.2
-pytz==2019.1
+python-slugify==3.0.3
+pytz==2019.2
 raven==6.10.0
 rcssmin==1.0.6
 requests==2.22.0

travis_test/requirements.txt

@@ -1,20 +1,21 @@
 appdirs==1.4.3
 asn1crypto==0.24.0
 astroid==2.2.5
+attrs==19.1.0
 bottle==0.12.17
 certifi==2019.6.16
 cffi==1.12.3
 chardet==3.0.4
-coverage==4.5.3
+coverage==4.5.4
 cryptography==2.7
-Django==2.2.3
+Django==2.2.4
 django-appconf==1.0.3
-django-autoslug==1.9.4
+django-autoslug==1.9.6
 django-compressor==2.3
 django-debug-toolbar==2.0
 django-haystack==2.8.1
 django-ipware==2.1.0
-django-mdeditor==0.1.14
+django-mdeditor==0.1.16
 django-uuslug==1.1.8
 elasticsearch==7.0.0
 elasticsearch-dsl==7.0.0
@@ -29,16 +30,17 @@ mccabe==0.6.1
 mistune==0.8.4
 mysqlclient==1.4.2.post1
 olefile==0.46
-packaging==19.0
-Pillow==6.0.0
+packaging==19.1
+Pillow==6.1.0
 pycparser==2.19
 Pygments==2.4.2
 pylint==2.3.1
-pyparsing==2.4.0
+pyparsing==2.4.2
 python-dateutil==2.8.0
 python-logstash==0.4.6
-python-slugify==3.0.2
-pytz==2019.1
+python-memcached==1.59
+python-slugify==3.0.3
+pytz==2019.2
 raven==6.10.0
 rcssmin==1.0.6
 requests==2.22.0

travis_test/travis_settings.py

@@ -7,9 +7,6 @@
         'USER': 'travis',
         'PASSWORD': '',
         'HOST': '127.0.0.1',
-        # 'HOST': '192.168.1.120',
-        # 'USER': 'root',
-        # 'PASSWORD': 'root',
         'PORT': 3306,
     }
 }