Merge pull request #392 from justinGilmer/fixTravisOSX

Fix Ruby 2.3 homebrew issue

.travis.yml

@@ -15,6 +15,7 @@ env:
   - COMMIT_AUTHOR_EMAIL: "janos.sallai@vanderbilt.edu"
 
 install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install md5sha1sum; fi
   - source devtools/travis-ci/install.sh
   - conda config --set always_yes yes --set changeps1 no
@@ -28,7 +29,7 @@ install:
   - pip install -e .
 
 script:
-  - py.test -v --cov=mbuild  --cov-report= --pyargs mbuild
+  - python -m pytest -v --cov=mbuild  --cov-report= --pyargs mbuild
 
 after_success:
   - coveralls

appveyor.yml

@@ -3,7 +3,7 @@ environment:
     PYTHONUNBUFFERED: 1
 
   matrix:
-    - PYTHON: "C:\\Miniconda3-x64"
+    - PYTHON: "C:\\Miniconda36-x64"
       CONDA_PY: "35"
       ARCH: "64"
 

requirements.txt

@@ -14,4 +14,4 @@ nbformat
 ipykernel
 ipyext
 python-coveralls
-pytest-cov
+pytest-cov