Skip to content

Change travis package pins #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdebacker merged 5 commits into from
Jul 12, 2017
Merged

Change travis package pins #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a8782e
change travis package pins
jdebacker Jul 7, 2017
b6a0f60
try no space
jdebacker Jul 7, 2017
e7f7d31
fix environment defn
jdebacker Jul 7, 2017
3a23f5d
channge some defaults for run so exectues with files in master
jdebacker Jul 7, 2017
140dd93
take out quit
jdebacker Jul 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Python/run_ogusa_serial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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