Merge branch 'uitest' of https://github.com/sornalingam/scrapy-cluster …

…into uitest # Conflicts: # docs/topics/changelog.rst # requirements.txt
istresearch · Apr 18, 2018 · 7307378 · 7307378
2 parents 5527106 + 0a267bd
commit 7307378
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/docs/topics/changelog.rst b/docs/topics/changelog.rst
@@ -38,6 +38,11 @@ Utils
 - Adds quicker shutdown to ThreadedCounter object
 
 
+Admin UI
+^^^^^^^^
+
+- new component that allows for browser based interaction with the Scrapy Cluster
+
 Scrapy Cluster 1.2
 ------------------
 

diff --git a/requirements.txt b/requirements.txt
@@ -49,4 +49,6 @@ tldextract==2.1.0 # Updated from 2.0.2
 ujson==1.35
 w3lib==1.18.0 # Updated from 1.17.0
 zope.interface==4.4.2 # Updated from 4.3.3
-# Generated with piprot 0.9.7
+# Generated with piprot 0.9.7
+plotly==2.0.12
+flask_table==0.4.1