Merge pull request #285 from liangliangyy/dev

升级依赖
liangliangyy · Jul 2, 2019 · 0614395 · 0614395
2 parents 671312c + 6f4df53
commit 0614395
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/DjangoBlog/urls.py b/DjangoBlog/urls.py
@@ -46,6 +46,7 @@
                   url(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps},
                       name='django.contrib.sitemaps.views.sitemap'),
                   url(r'^feed/$', DjangoBlogFeed()),
+                  url(r'^rss/$', DjangoBlogFeed()),
                   url(r'^search', include('haystack.urls'), name='search'),
                   url(r'', include('servermanager.urls', namespace='servermanager')),
                   url(r'', include('owntracks.urls', namespace='owntracks'))

diff --git a/requirements.txt b/requirements.txt
@@ -1,27 +1,26 @@
 appdirs==1.4.3
 asn1crypto==0.24.0
 astroid==2.2.5
-bottle==0.12.16
+bottle==0.12.17
 certifi==2019.6.16
 cffi==1.12.3
 chardet==3.0.4
-colorama==0.4.1
 coverage==4.5.3
 cryptography==2.7
-Django==2.2.2
+Django==2.2.3
 django-appconf==1.0.3
 django-autoslug==1.9.4
 django-compressor==2.3
-django-debug-toolbar==1.11
+django-debug-toolbar==2.0
 django-haystack==2.8.1
 django-ipware==2.1.0
 django-mdeditor==0.1.14
 django-uuslug==1.1.8
-elasticsearch==7.0.2
+elasticsearch==7.0.0
 elasticsearch-dsl==7.0.0
 idna==2.8
 ipaddress==1.0.22
-isort==4.3.20
+isort==4.3.21
 jieba==0.39
 jsonpickle==1.2
 lazy-object-proxy==1.4.1
@@ -48,11 +47,11 @@ rjsmin==1.1.0
 six==1.12.0
 sqlparse==0.3.0
 text-unidecode==1.2
-typed-ast==1.4.0
-Unidecode==1.1.0
+typed-ast==1.3.1
+Unidecode==1.1.1
 urllib3==1.25.3
 webencodings==0.5.1
 WeRoBot==1.9.0
 Whoosh==2.7.4
-wrapt==1.11.1
+wrapt==1.11.2
 xmltodict==0.12.0
diff --git a/travis_test/requirements.txt b/travis_test/requirements.txt
@@ -1,27 +1,26 @@
 appdirs==1.4.3
 asn1crypto==0.24.0
 astroid==2.2.5
-bottle==0.12.16
+bottle==0.12.17
 certifi==2019.6.16
 cffi==1.12.3
 chardet==3.0.4
-colorama==0.4.1
 coverage==4.5.3
 cryptography==2.7
-Django==2.2.2
+Django==2.2.3
 django-appconf==1.0.3
 django-autoslug==1.9.4
 django-compressor==2.3
-django-debug-toolbar==1.11
+django-debug-toolbar==2.0
 django-haystack==2.8.1
 django-ipware==2.1.0
 django-mdeditor==0.1.14
 django-uuslug==1.1.8
-elasticsearch==7.0.2
+elasticsearch==7.0.0
 elasticsearch-dsl==7.0.0
 idna==2.8
 ipaddress==1.0.22
-isort==4.3.20
+isort==4.3.21
 jieba==0.39
 jsonpickle==1.2
 lazy-object-proxy==1.4.1
@@ -47,11 +46,11 @@ rjsmin==1.1.0
 six==1.12.0
 sqlparse==0.3.0
 text-unidecode==1.2
-typed-ast==1.4.0
-Unidecode==1.1.0
+typed-ast==1.3.1
+Unidecode==1.1.1
 urllib3==1.25.3
 webencodings==0.5.1
 WeRoBot==1.9.0
 Whoosh==2.7.4
-wrapt==1.11.1
+wrapt==1.11.2
 xmltodict==0.12.0