Merge pull request #46 from djhoese/feature-pytest

Convert test module to use pytest
pytroll · Nov 26, 2018 · 48c70c2 · 48c70c2
2 parents 264243b + 47e5c53
commit 48c70c2
Show file tree

Hide file tree

Showing 214 changed files with 173 additions and 63,523 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,12 +4,13 @@ env:
   - PYTHON_VERSION=$TRAVIS_PYTHON_VERSION
   - NUMPY_VERSION=stable
   - MAIN_CMD='python setup.py'
-  - CONDA_DEPENDENCIES='sphinx pillow coveralls coverage'
+  - CONDA_DEPENDENCIES='sphinx pillow coveralls coverage pytest'
   - SETUP_XVFB=False
   - EVENT_TYPE='push pull_request'
   - SETUP_CMD='test'
   - CONDA_CHANNELS='conda-forge'
-  - CIBW_TEST_REQUIRES='numpy pillow'
+  - CONDA_CHANNEL_PRIORITY='True'
+  - CIBW_TEST_REQUIRES='numpy pillow pytest'
   - CIBW_TEST_COMMAND='python {project}/selftest.py'
   - CIBW_BEFORE_BUILD_LINUX='yum install -y freetype-devel'
   - TWINE_USERNAME='dhoese'

diff --git a/agg2/.svn/all-wcprops b/agg2/.svn/all-wcprops
diff --git a/agg2/.svn/entries b/agg2/.svn/entries
diff --git a/agg2/.svn/text-base/README.txt.svn-base b/agg2/.svn/text-base/README.txt.svn-base
diff --git a/agg2/font_freetype/.svn/all-wcprops b/agg2/font_freetype/.svn/all-wcprops
diff --git a/agg2/font_freetype/.svn/entries b/agg2/font_freetype/.svn/entries