Merge branch 'master' into develop

.shippable.yml

@@ -0,0 +1,48 @@
+language: python
+python:
+    - 2.7
+    - 3.5
+    - 3.6
+    - 3.7
+
+before_install:
+  # http://conda.pydata.org/docs/travis.html
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+      travis_retry wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
+    else
+      travis_retry wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+    fi
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda config --set always_yes yes --set changeps1 no
+  - conda config --add channels conda-forge
+  - conda update -q conda
+  - conda info -a
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+
+install:
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy astropy
+  - source activate test-environment
+
+  - travis_retry pip install -r requirements.txt
+  - travis_retry pip install -r requirements_dev.txt
+
+  - python setup.py install
+
+build:
+  ci:
+    # Create folders for test and code coverage
+    - mkdir -p shippable/testresults
+    - mkdir -p shippable/codecoverage
+
+    # Run test and code coverage and output results to the right folder
+    - pytest --junitxml=shippable/testresults/nosetests.xml
+    - pytest --cov=. --cov-report=xml:shippable/codecoverage/coverage.xml --durations=10
+    # - pytest --cov=. --cov-report term-missing
+
+after_success:
+  - coverage xml -i

.travis.yml

@@ -1,7 +1,10 @@
+dist: xenial
+sudo: true
 language: python
 python:
   - "3.5"
   - "3.6"
+  - "3.7"
 
 before_install:
   # http://conda.pydata.org/docs/travis.html
@@ -21,16 +24,14 @@ cache:
 install:
   - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy astropy
   - source activate test-environment
-  - travis_retry pip install pyastronomy
 
   - travis_retry pip install -r requirements.txt
-  - travis_retry pip install pytest-cov python-coveralls codeclimate-test-reporter codacy-coverage
+  - travis_retry pip install -r requirements_dev.txt
 
   - python setup.py install
 
 script:
   - pytest --cov=spectrum_overload --cov-report term-missing --durations 10 -W error
-  - coverage xml -i
 
 after_success:
   - coveralls

appveyor.yml

@@ -1,28 +1,31 @@
 environment:
-
   matrix:
     # For Python versions available on Appveyor, see
     # http://www.appveyor.com/docs/installed-software#python
     - PYTHON: "C:\\Python35"
     - PYTHON: "C:\\Python36"
+    - PYTHON: "C:\\Python37"
+    - PYTHON: "C:\\Python27-x64"
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36-x64"
+    - PYTHON: "C:\\Python37-x64"
 
 install:
   # We need wheel installed to build wheels
   - "%PYTHON%\\python.exe -m pip install wheel"
 
-  # Installing spectrum/overload now
+  # Install spectrum_overload
   - cmd: "cd %APPVEYOR_BUILD_FOLDER%"
   - cmd: "%PYTHON%\\python.exe -m pip install -r requirements.txt"
+  - cmd: "%PYTHON%\\python.exe -m pip install -r requirements_dev.txt"
   - cmd: "%PYTHON%\\python.exe setup.py install"
-  
+
 build: off
 
 test_script:
   # Put your test command here.
   - cmd: "%PYTHON%\\python.exe -m pytest --cov=spectrum_overload --cov-report term-missing --durations 10"
-  # - cmd: "coverage xml -i"
+  - cmd: "%PYTHON%\\python.exe -m coverage xml -i"
 
 after_test:
   # This step builds your wheels.

requirements.txt

@@ -1,9 +1,6 @@
-numpy==1.14.5
-matplotlib==2.2.2
-astropy==3.0.3
-scipy==1.1.0
-pyastronomy==0.13.0
-hypothesis==3.66.1
-pytest==3.6.3
-pytest-cov==2.5.1
-python-coveralls==2.9.1
+numpy
+matplotlib
+astropy
+scipy
+pyastronomy
+

requirements_dev.txt

@@ -0,0 +1,6 @@
+hypothesis
+pytest
+pytest-cov
+python-coveralls
+codeclimate-test-reporter
+codacy-coverage

setup.py

@@ -65,6 +65,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Natural Language :: English',
     ],