Merge branch 'master' into pyup-update-sphinx-rtd-theme-0.1.10a0-to-0…

….1.10b0
ClimateImpactLab · Feb 22, 2017 · 8658c43 · 8658c43
2 parents ab66561 + b4eff92
commit 8658c43
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/impactlab_user/__init__.py b/impactlab_user/__init__.py
@@ -5,7 +5,7 @@
 from __future__ import absolute_import
 
 __author__ = """Climate Impact Lab"""
-__version__ = '0.1.6'
+__version__ = '0.1.8'
 
 _module_imports = (
 )

diff --git a/requirements.txt b/requirements.txt
@@ -5,4 +5,5 @@ sphinx-rtd-theme==0.1.10b0
 boto==2.46.1
 boto3==1.4.4
 datafs==0.6.9
+impactlab_tools==0.0.3
 jinja2==2.9.5
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -5,6 +5,7 @@ sphinx-rtd-theme==0.1.10b0
 boto==2.46.1
 boto3==1.4.4
 datafs==0.6.9
+impactlab_tools==0.0.3
 jinja2==2.9.5
 pip==9.0.1
 wheel==0.29.0

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.6
+current_version = 0.1.8
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
@@ -13,7 +13,8 @@
     'sphinx_rtd_theme>=0.1.0',
     'boto>=2.30.0',
     'boto3>=1.0',
-    'datafs>=0.6.8',
+    'datafs>=0.6.9',
+    'impactlab-tools>=0.0.3',
     'jinja2>=2.8'
     ]
 
@@ -24,7 +25,8 @@
     'sphinx_rtd_theme>=0.1.0',
     'boto>=2.30.0',
     'boto3>=1.0',
-    'datafs>=0.6.8',
+    'datafs>=0.6.9',
+    'impactlab-tools>=0.0.3',
     'jinja2>=2.8',
     'pip>=8.0',
     'wheel>=0.27',
@@ -45,7 +47,7 @@
 
 setup(
     name='impactlab_user',
-    version='0.1.6',
+    version='0.1.8',
     description="Set up users to use Climate Impact Lab tools",
     long_description=readme,
     author="Climate Impact Lab",