Merge pull request #12 from bmcfee/travis-fix

updating pytest configs

.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 
+dist: xenial
+
 cache:
   directories:
   - $HOME/env
@@ -14,6 +16,7 @@ python:
     - "3.4"
     - "3.5"
     - "3.6"
+    - "3.7"
 
 before_install:
     - bash .travis_dependencies.sh
@@ -23,11 +26,10 @@ before_install:
 
 install:
     # install your own package into the environment
-    # pip install -e rather than setup.py, so that coverage can find the source
-    - pip install -e ./
+    - pip install -e .[tests]
 
 script:
-    - py.test
+    - pytest
 
 after_success:
     - coveralls

.travis_dependencies.sh

@@ -11,7 +11,7 @@ conda_create ()
     conda update -q conda
     conda config --add channels pypi
     conda info -a
-    deps='six nose coverage'
+    deps=''
 
     conda create -q -n $ENV_NAME "python=$TRAVIS_PYTHON_VERSION" $deps
 }
@@ -29,12 +29,6 @@ if [ ! -d "$src" ]; then
 
         export PATH="$src/bin:$PATH"
         conda_create 
-
-        source activate $ENV_NAME
-
-        pip install python-coveralls pytest-cov pytest-faulthandler
-
-        source deactivate
     popd
 else
     echo "Using cached dependencies"

setup.py

@@ -25,11 +25,13 @@
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
     ],
     keywords='default parameter',
     license='ISC',
     install_requires=['six'],
     extras_require={
-        'docs': ['numpydoc']
+        'docs': ['numpydoc'],
+        'tests': ['coverage', 'python-coveralls', 'pytest', 'pytest-cov', 'pytest-faulthandler']
     }
 )