Merge aed1e36 into 65bd937

.travis.yml

@@ -52,6 +52,9 @@ before_install:
       pip install pep8==1.6.2;
     fi
   - pip install pytest==2.7.0
+  - if [[ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]]; then
+      pip install pytest-cov coveralls --use-mirrors;
+    fi
 install:
   - if [[ "${TEST_SAGE}" != "true" ]]; then
       python setup.py install;
@@ -61,5 +64,9 @@ script:
       pep8;
     fi
   - bin/test_travis.sh
+after_success:
+  - if [[ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]]; then
+      coveralls;
+    fi
 notifications:
   email: false

README.rst

@@ -4,6 +4,9 @@ SymPy
 .. image:: https://secure.travis-ci.org/skirpichev/omg.png?branch=master
     :target: http://travis-ci.org/skirpichev/omg
 
+.. image:: https://coveralls.io/repos/skirpichev/omg/badge.svg
+    :target: https://coveralls.io/r/skirpichev/omg
+
 .. image:: https://readthedocs.org/projects/omg/badge/?version=latest
     :target: https://readthedocs.org/projects/omg/?badge=latest
     :alt: Documentation Status

bin/test_travis.sh

@@ -24,9 +24,19 @@ EOF
     elif [[ "${TEST_SLOW}" == "true" ]]; then
         py.test -m 'slow' --duration=100 --split="${SPLIT}" sympy/
     elif [[ "${TEST_EXTRA}" == "true" ]]; then
-        py.test sympy/printing/tests/test_theanocode.py
-        py.test sympy/external/tests/test_autowrap.py
-        py.test --duration=100 sympy/polys/ sympy/plotting/
+        if [[ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]]; then
+            py.test --duration=100 --cov sympy \
+                sympy/printing/tests/test_theanocode.py \
+                sympy/external/tests/test_autowrap.py \
+                sympy/polys/ sympy/plotting/
+        else
+            py.test --duration=100 \
+                sympy/printing/tests/test_theanocode.py \
+                sympy/external/tests/test_autowrap.py \
+                sympy/polys/ sympy/plotting/
+        fi
+    elif [[ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]]; then
+        py.test -m 'not slow' --duration=100 --cov sympy --split="${SPLIT}" sympy/
     else
         py.test -m 'not slow' --duration=100 --split="${SPLIT}" sympy/
     fi

sympy/assumptions/tests/test_query.py

@@ -2052,6 +2052,7 @@ def test_compute_known_facts():
     s = compute_known_facts(known_facts, known_facts_keys)
 
 
+@slow
 def test_known_facts_consistent():
     from sympy.assumptions.ask import known_facts, known_facts_keys
     ns = {}

sympy/concrete/tests/test_sums_products.py

@@ -6,7 +6,7 @@
 )
 from sympy.abc import a, b, c, d, f, k, m, x, y, z
 from sympy.concrete.summations import telescopic
-from sympy.utilities.pytest import raises
+from sympy.utilities.pytest import raises, slow
 from sympy.core.mod import Mod
 from sympy.core.compatibility import range
 
@@ -768,6 +768,7 @@ def test_reverse_order():
         Sum(x*y, (x, b + 1, a - 1), (y, 6, 1))
 
 
+@slow
 def test_findrecur():
     a, x, y = symbols("a, x, y")
     n, k = symbols("n, k", integer=True)

sympy/integrals/tests/test_meijerint.py

@@ -8,6 +8,7 @@
 from sympy.utilities.randtest import (verify_numerically,
         random_complex_number as randcplx)
 from sympy.core.compatibility import range
+from sympy.utilities.pytest import slow
 from sympy.abc import x, y, a, b, c, d, s, t, z
 
 
@@ -284,6 +285,7 @@ def inv(f):
     assert meijerint_inversion(exp(-s**2), s, t) is None
 
 
+@slow
 def test_lookup_table():
     from random import uniform, randrange
     from sympy import Add
@@ -332,6 +334,7 @@ def test_linear_subs():
     assert integrate(besselj(1, x - 1), x, meijerg=True) == -besselj(0, 1 - x)
 
 
+@slow
 def test_probability():
     # various integrals from probability theory
     from sympy.abc import x, y

sympy/series/tests/test_aseries.py

@@ -1,8 +1,9 @@
 from sympy import (S, Symbol, symbols, exp, log, sqrt, O, oo, sin, cos, PoleError)
 from sympy.abc import x, y, z
 
-from sympy.utilities.pytest import raises, XFAIL
+from sympy.utilities.pytest import raises, XFAIL, slow
 
+@slow
 def test_simple():
     # Gruntz' theses pp. 91 to 96
     # 6.6

sympy/series/tests/test_gruntz.py

@@ -3,7 +3,7 @@
 from sympy.functions.elementary.hyperbolic import cosh, coth, sinh, tanh
 from sympy.series.gruntz import compare, mrv, rewrite, mrv_leadterm, gruntz, \
     sign
-from sympy.utilities.pytest import XFAIL, skip
+from sympy.utilities.pytest import XFAIL, skip, slow
 
 """
 This test suite is testing the limit algorithm using the bottom up approach.
@@ -27,6 +27,7 @@ def _sskip():
         skip("slow")
 
 
+@slow
 def test_gruntz_evaluation():
     # Gruntz' thesis pp. 122 to 123
     # 8.1

sympy/sets/sets.py

@@ -7,7 +7,7 @@
 from sympy.core.singleton import Singleton, S
 from sympy.core.evalf import EvalfMixin
 from sympy.core.numbers import Float
-from sympy.core.compatibility import iterable, with_metaclass, ordered, range
+from sympy.core.compatibility import iterable, with_metaclass, ordered, range, long
 from sympy.core.evaluate import global_evaluate
 from sympy.core.mul import Mul
 from sympy.core.relational import Eq
@@ -651,7 +651,7 @@ def _measure(self):
         return measure
 
     def __len__(self):
-        return Mul(*[len(s) for s in self.args])
+        return long(Mul(*[len(s) for s in self.args]))
 
 
 class Interval(Set, EvalfMixin):

sympy/simplify/tests/test_hyperexpand.py

@@ -338,6 +338,7 @@ def can_do_meijer(a1, a2, b1, b2, numeric=True):
     return tn(meijerg(a1, a2, b1, b2, z).subs(repl), r.subs(repl), z)
 
 
+@slow
 def test_meijerg_expand():
     from sympy import combsimp, simplify
     # from mpmath docs

sympy/solvers/tests/test_ode.py

@@ -453,6 +453,7 @@ def test_checksysodesol():
     assert checksysodesol(eq, sol) == (True, [0, 0])
 
 
+@slow
 def test_nonlinear_3eq_order1():
     x, y, z = symbols('x, y, z', function=True)
     t = Symbol('t')
@@ -1100,6 +1101,7 @@ def test_homogeneous_order():
     raises(ValueError, lambda: homogeneous_order(x*y))
 
 
+@slow
 def test_1st_homogeneous_coeff_ode():
     # Type: First order homogeneous, y'=f(y/x)
     eq1 = f(x)/x*cos(f(x)/x) - (x/f(x)*sin(f(x)/x) + cos(f(x)/x))*f(x).diff(x)
@@ -1427,6 +1429,7 @@ def test_nth_linear_constant_coeff_homogeneous_RootOf():
     assert dsolve(eq) == sol
 
 
+@slow
 @XFAIL
 def test_nth_linear_constant_coeff_homogeneous_RootOf_sol():
     eq = f(x).diff(x, 5) + 11*f(x).diff(x) - 2*f(x)

sympy/solvers/tests/test_solveset.py

@@ -15,7 +15,7 @@
 
 from sympy.sets import FiniteSet
 
-from sympy.utilities.pytest import XFAIL, raises, skip
+from sympy.utilities.pytest import XFAIL, raises, skip, slow
 from sympy.utilities.randtest import verify_numerically as tn
 
 from sympy.solvers.solveset import (
@@ -366,6 +366,7 @@ def test_solve_sqrt_fail():
     assert solveset_real(eq, x) == FiniteSet(S(1)/3)
 
 
+@slow
 def test_solve_sqrt_3():
     R = Symbol('R')
     eq = sqrt(2)*R*sqrt(1/(R + 1)) + (R + 1)*(sqrt(2)*sqrt(1/(R + 1)) - 1)