From 3a8782ec8c306a7bda66cac512ed8573f0e336de Mon Sep 17 00:00:00 2001 From: Jason DeBacker Date: Thu, 6 Jul 2017 22:14:50 -0500 Subject: [PATCH 1/5] change travis package pins --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45be20ef2..3993e144a 100644 --- 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 From b6a0f60e30701e4ec8f0a79ae0317c36f24f0674 Mon Sep 17 00:00:00 2001 From: Jason DeBacker Date: Thu, 6 Jul 2017 22:56:56 -0500 Subject: [PATCH 2/5] try no space --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3993e144a..1d1e3de46 100644 --- 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= 0.18.1 numpy=1.11.2 pandas=0.18.0 matplotlib - - conda install -n test-environment -c ospc taxcalc= 0.8.3 + - 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 From e7f7d31f26cb2333b045abc024aaebd5504cfcbb Mon Sep 17 00:00:00 2001 From: Jason DeBacker Date: Fri, 7 Jul 2017 09:00:01 -0500 Subject: [PATCH 3/5] fix environment defn --- environment.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/environment.yml b/environment.yml index a50df469b..91838a50d 100644 --- 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 From 3a23f5d214e704090ffe37647156be6556d29972 Mon Sep 17 00:00:00 2001 From: Jason DeBacker Date: Fri, 7 Jul 2017 09:19:48 -0500 Subject: [PATCH 4/5] channge some defaults for run so exectues with files in master --- Python/run_ogusa_serial.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Python/run_ogusa_serial.py b/Python/run_ogusa_serial.py index 91e4eb0cc..15418e51d 100644 --- a/Python/run_ogusa_serial.py +++ b/Python/run_ogusa_serial.py @@ -76,13 +76,14 @@ 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} #p1 = Process(target=runner, kwargs=kwargs) #p1.start() runner(**kwargs) + quit() ''' @@ -96,7 +97,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) From 140dd93420061a74adbcf11d9ecc0500d5431574 Mon Sep 17 00:00:00 2001 From: Jason DeBacker Date: Fri, 7 Jul 2017 09:45:25 -0500 Subject: [PATCH 5/5] take out quit --- Python/run_ogusa_serial.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Python/run_ogusa_serial.py b/Python/run_ogusa_serial.py index 15418e51d..8f218ed75 100644 --- a/Python/run_ogusa_serial.py +++ b/Python/run_ogusa_serial.py @@ -83,7 +83,6 @@ def run_micro_macro(user_params): #p1 = Process(target=runner, kwargs=kwargs) #p1.start() runner(**kwargs) - quit() '''