diff --git a/.ci/requirements.txt b/.ci/requirements.txt new file mode 100644 index 00000000..1f8d426a --- /dev/null +++ b/.ci/requirements.txt @@ -0,0 +1,8 @@ +astropy==1.0.3 +Cython==0.22.1 +numpy==1.9.2 +py==1.4.30 +pytest==2.7.2 +PyYAML==3.11 +scipy==0.15.1 +six==1.9.0 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 5e272ed7..f735665c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,11 @@ sudo: false matrix: include: - python: "2.7" - env: DEPS="numpy=1.9 scipy=0.15 astropy=1.0" COVERAGE=true + env: DEPS="numpy scipy astropy=1.0" COVERAGE=true + - python: "3.3" + env: DEPS="numpy scipy astropy=1.0" - python: "3.4" - env: DEPS="numpy=1.9 scipy=0.15 astropy=1.0" + env: DEPS="numpy scipy astropy=1.0" cache: apt: true @@ -16,12 +18,15 @@ cache: - $HOME/.local before_install: - - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-3.5.5-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.5.5-Linux-x86_64.sh -O miniconda.sh; fi + - > + if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; + then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; + else wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh -O miniconda.sh; + fi - chmod +x miniconda.sh - ./miniconda.sh -b -p /home/travis/mc - export PATH=/home/travis/mc/bin:$PATH - install: # See: # https://groups.google.com/a/continuum.io/forum/#!topic/conda/RSFENqovnro @@ -29,19 +34,20 @@ install: # OK, this used to *fix* the build, but now it *breaks* the build. # If you're reading this, good luck out there. I'm not sure what to tell you. - conda update --yes conda - - conda create -n testenv --yes --file requirements.txt + - > + conda create -n testenv --yes python=$TRAVIS_PYTHON_VERSION + $DEPS pip pytest setuptools Cython six>=1.7 + pyyaml - source activate testenv - pip install pytest-benchmark pytest-cov - - pip install setuptools - - pip install -e git+git://github.com/guaix-ucm/numina.git#egg=numina - if [[ $COVERAGE == true ]]; then pip install coveralls; fi + - pip install -e git+git://github.com/guaix-ucm/numina.git#egg=numina # Build in place so we can run tests - python setup.py build_ext --inplace - script: - py.test -s -v megaradrp - if [[ $COVERAGE == true ]]; then py.test megaradrp --cov=megaradrp; fi after_success: - - if [[ $COVERAGE == true ]]; then coveralls; fi \ No newline at end of file + - if [[ $COVERAGE == true ]]; then coveralls; fi diff --git a/README.rst b/README.rst index 1378af23..5731d8af 100644 --- a/README.rst +++ b/README.rst @@ -3,6 +3,12 @@ :target: https://readthedocs.org/projects/megara-drp/?badge=latest :alt: Documentation Status +.. image:: https://travis-ci.org/guaix-ucm/megaradrp.svg?branch=master + :target: https://travis-ci.org/guaix-ucm/megaradrp + +.. image:: https://coveralls.io/repos/guaix-ucm/megaradrp/badge.svg?branch=master&service=github + :target: https://coveralls.io/github/guaix-ucm/megaradrp?branch=master + This is Megara DRP, the data reduction pipeline for MEGARA @@ -16,7 +22,7 @@ be able to be installed and work properly: - setuptools (http://peak.telecommunity.com/DevCenter/setuptools) - numpy (http://www.numpy.org/) - scipy (http://www.scipy.org) - - astropy >= 0.4 (http://www.astropy.org/) + - astropy >= 1.0 (http://www.astropy.org/) - numina >= 0.13 (http://guaix.fis.ucm.es/projects/numina/) Webpage: https://guaix.fis.ucm.es/megara