Merge branch 'v0.5.2rc' of github.com:toomore/grs

toomore · Apr 11, 2014 · f4448e2 · f4448e2
2 parents 46a1678 + d749b49
commit f4448e2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/grs/__init__.py b/grs/__init__.py
@@ -28,7 +28,10 @@
 
 
 from .best_buy_or_sell import BestFourPoint
-from .fetch_data import Stock
+try:
+    from .fetch_data import Stock
+except ImportError:
+    pass
 from .realtime import RealtimeStock
 from .realtime import RealtimeWeight
 from .tw_time import Countdown

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,7 @@
+Sphinx
+pip-tools
+pip>=1.4
+pylint
+python-dateutil==1.5
+setuptools>=0.9
+wheel>=0.21