Merge branch '1.4' of github.com:sympy/sympy into 1.4

asmeurer · asmeurer · commit 34f21e5393bf · 2019-03-27T17:42:36.000-06:00
diff --git a/release/rever.xsh b/release/rever.xsh
@@ -85,7 +85,7 @@ def source_tarball():
 
 @activity(deps={'_version'})
 def build_docs():
-    with run_in_conda_env(['sphinx', 'docutils', 'numpy', 'mpmath'],
+    with run_in_conda_env(['sphinx', 'docutils', 'numpy', 'mpmath', 'matplotlib'],
         envname='sympy-release-docs'):
 
         cd doc
@@ -980,13 +980,16 @@ git_whitelist = {
     '.gitattributes',
     '.gitignore',
     '.mailmap',
-    # Travis
+    # Travis and CI
     '.travis.yml',
     '.ci/durations.json',
     '.ci/generate_durations_log.sh',
     '.ci/parse_durations_log.py',
     '.ci/blacklisted.json',
     '.editorconfig',
+    '.coveragerc',
+    'codecov.yml',
+    'pytest.ini',
     # Code of conduct
     'CODE_OF_CONDUCT.md',
     # Pull request template
diff --git a/sympy/functions/elementary/tests/test_miscellaneous.py b/sympy/functions/elementary/tests/test_miscellaneous.py
@@ -13,7 +13,7 @@
 from sympy.functions.special.delta_functions import Heaviside
 
 from sympy.utilities.lambdify import lambdify
-from sympy.utilities.pytest import raises, skip, warns
+from sympy.utilities.pytest import raises, skip, ignore_warnings
 from sympy.external import import_module
 
 def test_Min():
@@ -349,7 +349,7 @@ def test_issue_11463():
     # numpy.select evaluates all options before considering conditions,
     # so it raises a warning about root of negative number which does
     # not affect the outcome. This warning is suppressed here
-    with warns(RuntimeWarning):
+    with ignore_warnings(RuntimeWarning):
         assert f(numpy.array(-1)) < -1
 
 
