From 956240f7f2273370372ce9395d7a279d6be658ad Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Sun, 18 Oct 2015 19:23:29 +0200 Subject: [PATCH 1/8] added a new requirement for astropy --- conda-requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-requirements b/conda-requirements index e5fd050a1a6..82d6a3d4026 100644 --- a/conda-requirements +++ b/conda-requirements @@ -4,7 +4,7 @@ pandas>=0.16 pytables h5py>=2.0 matplotlib>=1.1 -astropy>=1.0 +astropy==1.0.4 PyYAML>=3.0 numexpr>=2.0.0 Cython>=0.21 From cc35b8153501c1fc1baf88527984b9d92fd65660 Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Sun, 18 Oct 2015 19:41:48 +0200 Subject: [PATCH 2/8] changing the requirements --- .travis.yml | 6 ------ conda-requirements | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79943e5e87e..9c60a174f33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,7 @@ sudo: false env: global: - COMPILER=gcc - - CYTHON_VERSION=0.21 - - NUMPY_VERSION=1.8 - PANDAS_VERSION=0.16 - - ASTROPY_VERSION=0.4.4 - ASTROPY_USE_SYSTEM_PYTEST=1 - SETUP_CMD='test' - TEST_MODE='normal' @@ -67,10 +64,7 @@ before_install: install: - conda create --yes -n tardis-travis --file conda-requirements pip python=$TRAVIS_PYTHON_VERSION - source activate tardis-travis - - if [[ $NUMPY_VERSION == 'latest' ]]; then conda install --yes numpy; else conda install --yes "numpy==$NUMPY_VERSION"; fi - if [[ $PANDAS_VERSION == 'latest' ]]; then conda install --yes pandas; else conda install --yes "pandas=$PANDAS_VERSION"; fi - - if [[ $ASTROPY_VERSION == 'development' ]]; then pip install git+https://github.com/astropy/astropy; else conda install --yes "astropy=$ASTROPY_VERSION"; fi - - if [[ $SETUP_CMD == 'test --coverage' ]]; then pip install -q coveralls; fi - if [[ $SETUP_CMD == 'test --coverage' ]]; then conda install --yes coverage=3.7; fi - if [[ $SETUP_CMD == 'test --coverage' ]]; then pip install -q pytest-cov; fi diff --git a/conda-requirements b/conda-requirements index 82d6a3d4026..b75f790755f 100644 --- a/conda-requirements +++ b/conda-requirements @@ -1,13 +1,13 @@ -numpy>=1.4.0 -scipy>=0.10 -pandas>=0.16 -pytables +numpy==1.9 +scipy==0.10 +pandas==0.16 +pytables==3.2 h5py>=2.0 matplotlib>=1.1 astropy==1.0.4 PyYAML>=3.0 numexpr>=2.0.0 -Cython>=0.21 +Cython==0.21 jinja2 -networkx +networkx==1.10 pytest==2.6.3 From 68f996d367c02ad033a2bfe60043d6bb912ae646 Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Sun, 18 Oct 2015 19:43:26 +0200 Subject: [PATCH 3/8] changed it in the documentation --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index 2f1eab9c223..1e0f2513e0c 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -17,7 +17,7 @@ TARDIS has the following requirements: - `Python `_ 2.7 -- `Numpy `_ 1.7 or later +- `Numpy `_ 1.9 or later - `Scipy `_ 0.10 or later From 936feb3667ecb9b2ea2ba255bf277bcc426a3c7c Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Sun, 18 Oct 2015 19:48:43 +0200 Subject: [PATCH 4/8] fixed all the requirement for tardis --- conda-requirements | 20 ++++++++++---------- docs/installation.rst | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conda-requirements b/conda-requirements index b75f790755f..a3f31eb65fd 100644 --- a/conda-requirements +++ b/conda-requirements @@ -1,13 +1,13 @@ numpy==1.9 -scipy==0.10 -pandas==0.16 -pytables==3.2 -h5py>=2.0 -matplotlib>=1.1 +scipy=0.16 +pandas=0.16 +pytables=3.2 +h5py=2.5 +matplotlib=1.4 astropy==1.0.4 -PyYAML>=3.0 -numexpr>=2.0.0 -Cython==0.21 +PyYAML=3.11 +numexpr=2.4 +Cython=0.21 jinja2 -networkx==1.10 -pytest==2.6.3 +networkx=1.10 +pytest=2.6.3 diff --git a/docs/installation.rst b/docs/installation.rst index 1e0f2513e0c..41c37d772c4 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -19,7 +19,7 @@ TARDIS has the following requirements: - `Numpy `_ 1.9 or later -- `Scipy `_ 0.10 or later +- `Scipy `_ 0.16 or later - `Astropy `_ 1.0 or later From e4edb9e4602fda6f311bf80b2e16394b6d3f2508 Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Sun, 18 Oct 2015 19:54:35 +0200 Subject: [PATCH 5/8] fixed the requirements file syntax --- conda-requirements | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/conda-requirements b/conda-requirements index a3f31eb65fd..aa394a68550 100644 --- a/conda-requirements +++ b/conda-requirements @@ -1,13 +1,13 @@ numpy==1.9 -scipy=0.16 -pandas=0.16 -pytables=3.2 -h5py=2.5 -matplotlib=1.4 +scipy==0.16 +pandas==0.16 +pytables==3.2 +h5py==2.5 +matplotlib==1.4 astropy==1.0.4 -PyYAML=3.11 -numexpr=2.4 -Cython=0.21 +PyYAML==3.11 +numexpr==2.4 +Cython==0.21 jinja2 -networkx=1.10 -pytest=2.6.3 +networkx==1.10 +pytest==2.6.3 From 60525e22480e9c8c39090d7f7b61fa5b3fe65ba4 Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Sun, 18 Oct 2015 19:59:05 +0200 Subject: [PATCH 6/8] fixed numexpr to 2.4 --- conda-requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-requirements b/conda-requirements index aa394a68550..fa967365352 100644 --- a/conda-requirements +++ b/conda-requirements @@ -6,7 +6,7 @@ h5py==2.5 matplotlib==1.4 astropy==1.0.4 PyYAML==3.11 -numexpr==2.4 +numexpr==2.4.4 Cython==0.21 jinja2 networkx==1.10 From eafac8857c46ff99fc8959256f8dc89bb0fae829 Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Sun, 18 Oct 2015 20:06:40 +0200 Subject: [PATCH 7/8] removed testing for latest pandas testing --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c60a174f33..43ed73eb724 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,6 @@ matrix: - python: "2.7" env: PANDAS_VERSION=0.16 - - python: "2.7" - env: PANDAS_VERSION=latest - # - python: "2.7" # env: ASTROPY_VERSION=development @@ -64,7 +61,6 @@ before_install: install: - conda create --yes -n tardis-travis --file conda-requirements pip python=$TRAVIS_PYTHON_VERSION - source activate tardis-travis - - if [[ $PANDAS_VERSION == 'latest' ]]; then conda install --yes pandas; else conda install --yes "pandas=$PANDAS_VERSION"; fi - if [[ $SETUP_CMD == 'test --coverage' ]]; then pip install -q coveralls; fi - if [[ $SETUP_CMD == 'test --coverage' ]]; then conda install --yes coverage=3.7; fi - if [[ $SETUP_CMD == 'test --coverage' ]]; then pip install -q pytest-cov; fi From 5fbbf4050526f1daf32f5dab969c021e5171abb9 Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Sun, 18 Oct 2015 20:09:26 +0200 Subject: [PATCH 8/8] removed pandas build --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43ed73eb724..7a993c5b1a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,12 +22,6 @@ env: matrix: include: - - python: "2.7" - env: PANDAS_VERSION=0.16 - -# - python: "2.7" -# env: ASTROPY_VERSION=development - - python: "2.7" env: COMPILER=gcc SETUP_CMD='test --args="--atomic-dataset=$HOME/kurucz_cd23_chianti_H_He.h5"' TEST_MODE='spectrum'