Merge pull request #305 from jdebacker/tci

Change travis package pins
PSLmodels · Jul 12, 2017 · e357548 · e357548
2 parents 9e92129 + 140dd93
commit e357548
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,8 +11,8 @@ install:
   - export PATH="$HOME/miniconda/bin:$PATH"
   - conda config --set always_yes yes --set changeps1 no
   - conda update conda
-  - conda create -n test-environment python=$TRAVIS_PYTHON_VERSION pytest nomkl scipy numpy pandas matplotlib
-  - conda install -n test-environment -c ospc taxcalc
+  - conda create -n test-environment python=$TRAVIS_PYTHON_VERSION pytest nomkl scipy=0.18.1 numpy=1.11.2 pandas=0.18.0 matplotlib
+  - conda install -n test-environment -c ospc taxcalc=0.8.3
   - conda install -n test-environment numba 
   - source activate test-environment
   - python setup.py install

diff --git a/Python/run_ogusa_serial.py b/Python/run_ogusa_serial.py
@@ -76,7 +76,7 @@ def run_micro_macro(user_params):
     output_base = BASELINE_DIR
     input_dir = BASELINE_DIR
     kwargs={'output_base':output_base, 'baseline_dir':BASELINE_DIR,
-            'test':True, 'time_path':True, 'baseline':True,
+            'test':False, 'time_path':True, 'baseline':True,
             'analytical_mtrs':False, 'age_specific':True,
             'user_params':user_params,'guid':'',
             'run_micro':False, 'small_open': False, 'budget_balance':False, 'baseline_spending':False}
@@ -96,7 +96,7 @@ def run_micro_macro(user_params):
     kwargs={'output_base':output_base, 'baseline_dir':BASELINE_DIR,
             'test':True, 'time_path':True, 'baseline':False,
             'analytical_mtrs':False, 'age_specific':True,
-            'user_params':user_params,'guid':'_alt', 'reform':reform ,
+            'user_params':user_params,'guid':'', 'reform':reform ,
             'run_micro':False, 'small_open': False, 'budget_balance':False,
             'baseline_spending':False}
     #p2 = Process(target=runner, kwargs=kwargs)

diff --git a/environment.yml b/environment.yml
@@ -5,12 +5,12 @@ dependencies:
 - ipython
 - ipython-notebook
 - setuptools
-- scipy
+- nomkl
+- scipy=0.18.1
 - matplotlib
-- taxcalc
+- taxcalc=0.8.3
 - numba
-- numpy
-- numpy >=1.12.1
-- pandas >=0.20.1
+- numpy=1.11.2
+- pandas==0.18.0
 - pytest
 - python=2.7