Changeset 42158d2 in sasmodels

Timestamp:

Jan 26, 2018 10:54:53 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

1f991d6

Parents:

bb4ff2a

Message:

work around travis/appveyor limitations for pytest

Files:

• .travis.yml (modified) (1 diff)
• appveyor.yml (modified) (1 diff)
• sasmodels/jitter.py (modified) (1 diff)

.travis.yml

@@ -45 +45 @@
 - python --version
 #- python -m sasmodels.model_test -v dll all
-- python -m pytest -v
+- python -m pytest -v --cache-clear
 before_deploy:
 - echo -e "Host danse.chem.utk.edu\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config

appveyor.yml

@@ -89 +89 @@
     #- python -m sasmodels.model_test dll all
     #- nosetests -v sasmodels/*.py
-    - python -m pytest -v
+    - python -m pytest -v --cache-clear

sasmodels/jitter.py

@@ -13 +13 @@
 import argparse
 
-import mpl_toolkits.mplot3d   # Adds projection='3d' option to subplot
+try: # CRUFT: travis-ci does not support mpl_toolkits.mplot3d
+    import mpl_toolkits.mplot3d  # Adds projection='3d' option to subplot
+except ImportError:
+    pass
+
 import matplotlib.pyplot as plt
 from matplotlib.widgets import Slider, CheckButtons