merge with master

Author: smichr

.mailmap

@@ -177,3 +177,6 @@ Peter Brady <[email protected]> peter <[email protected]>
 Craig A. Stoudt <[email protected]> cstoudt <[email protected]>
 Raj <[email protected]> raj454raj <[email protected]>
 John V. Siratt <[email protected]> John Siratt <[email protected]>
+Ted Dokos <[email protected]> ted-dokos <[email protected]>
+Akshat Jain <[email protected]> akshat_jain <[email protected]>
+Akshat Jain <[email protected]> jugnu <[email protected]>

.travis.yml

@@ -7,7 +7,7 @@ env:
   - SPLIT="3/4"
   - SPLIT="4/4"
   global:
-    secure: uJycOcgT3Rg9TsU6ID2UMHc56Fh6Q70p1/mFiod8r97g8zER9kWTZ2GVDSRiw1Nfh0Wojcy04PAG3t5m9bwM08YF8qZy1PJkCb/pu7PN8Hzt+6FSBb84gGEXMiv1xuZWSQ0pUuBa1Lfcxuq6m2/eA8aNfgoqnpLgR8zeg/2xhFw=
+    secure: "SyoeHaDi9vRPJ5X0JFY5/nQif66u+fehtqUg7F8ILoNrwugJcs+u4VZm1sJ7Cv2h6uGoNRAfkkrahxxj2mKCgpqbY2MdDAZ+ru5wn5R0NjYjTpEz7ET4Xq5o+gca+mhFMkiutYihM73+AaIKCX0vfC9yb8WBPXzbbrv8vVvQr6Y="
 python:
   - 2.6
   - 2.7
@@ -122,7 +122,8 @@ install:
     fi
 script:
   - bin/test_travis.sh
+#  - if [[ "${TEST_SPHINX}" == "true" ]]; then
+#      bin/deploy_doc.sh;
+#    fi
 notifications:
   email: false
-after_success:
-  - bin/build_doc.sh

AUTHORS

@@ -368,3 +368,6 @@ Hamish Dickson <[email protected]>
 Michael Gallaspy <[email protected]>
 Roman Inflianskas <[email protected]>
 Duane Nykamp <[email protected]>
+Ted Dokos <[email protected]>
+Sunny Aggarwal <[email protected]>
+Akshat Jain <[email protected]>

bin/build_doc.sh renamed to bin/deploy_doc.sh

@@ -7,9 +7,10 @@
 #
 # Following is the procedure to get the access token:
 #
-# $ curl -X POST -u <github_username> -H "Content-Type: application/json" -d\
-# "{\"scopes\":[\"public_repo\"],\"note\":\"token for pushing from travis\"}"\
-# https://api.github.com/authorizations
+# $ curl -X POST -u <github_username> -H "Content-Type: application/json" -H "X-GitHub-OTP: 2FA_TOKEN" -d  "{\"scopes\":[\"public_repo\"],\"note\":\"token for pushing from Travis for SymPy\"}" https://api.github.com/authorizations
+#
+# Replace 2FA_TOKEN with your two-factor token generated by SMS or the
+# application.
 #
 # It'll give you a JSON response having a key called "token".
 #
@@ -24,20 +25,9 @@
 # Exit on error
 set -e
 
-ACTUAL_TRAVIS_JOB_NUMBER=`echo $TRAVIS_JOB_NUMBER| cut -d'.' -f 2`
-
-if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$ACTUAL_TRAVIS_JOB_NUMBER" == "1" ]; then
-
-        echo "Installing dependencies"
-        sudo apt-get install --no-install-recommends graphviz inkscape texlive texlive-xetex texlive-fonts-recommended texlive-latex-extra lmodern librsvg2-bin imagemagick docbook2x
-        pip install "sphinx==1.1.3"
-
-        echo -e "Building docs"
-        cd doc
-        make clean
-        make html
+if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
 
-        cd ../../
+        cd ../
         echo -e "Setting git attributes"
         git config --global user.email "[email protected]"
         git config --global user.name "SymPy (Travis CI)"
@@ -48,12 +38,16 @@ if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$ACTUAL_TRAVIS_JOB_NUMBER" == "1"
         cd gh-pages
         git remote rm origin
         git remote add origin https://${GH_TOKEN}@github.com/sympy/sympy_doc.git > /dev/null 2>&1
+        git fetch origin > /dev/null 2>&1
+        git branch --set-upstream-to=origin/gh-pages gh-pages
         rm -rf dev/
         cp -R ../sympy/doc/_build/html dev/
         git add -A dev/
         ./generate_indexes.py
 
         git commit -am "Update dev doc after building $TRAVIS_BUILD_NUMBER"
+        echo -e "Pulling"
+        git pull > /dev/null 2>&1
         echo -e "Pushing commit"
-        git push -fq origin gh-pages > /dev/null 2>&1
+        git push -q origin gh-pages > /dev/null 2>&1
 fi

bin/mailmap_update.py

@@ -7,6 +7,7 @@
 # - Check doc/src/aboutus.rst
 # - Make it easier to update .mailmap or AUTHORS with the correct entries.
 
+from __future__ import unicode_literals
 from __future__ import print_function
 
 import os
@@ -46,7 +47,7 @@
     os.path.pardir, "AUTHORS"))) as fd:
     AUTHORS = unicode(fd.read(), 'utf-8')
 
-firstauthor = u"Ondřej Čertík"
+firstauthor = "Ondřej Čertík"
 
 authors = AUTHORS[AUTHORS.find(firstauthor):].strip().split('\n')
 

bin/test_isolated

@@ -107,15 +107,15 @@ def main():
         parser.error("too many arguments")
     if options.nosetests:
         if options.verbose:
-            print "Generating nosetests isolated testsuite..."
+            print("Generating nosetests isolated testsuite...")
         generate_test_script2("nosetests")
     else:
         if options.verbose:
-            print "Generating py.test isolated testsuite..."
+            print("Generating py.test isolated testsuite...")
         generate_test_script1("py.test")
     if options.verbose:
-        print "Done. Run (search for 'COMMIT' in the less environment):"
-        print "/tmp/test_sympy.sh | less"
+        print("Done. Run (search for 'COMMIT' in the less environment):")
+        print("/tmp/test_sympy.sh | less")
 
 if __name__ == "__main__":
     main()

bin/test_travis.sh

@@ -8,7 +8,6 @@ set -x
 if [[ "${TEST_SPHINX}" == "true" ]]; then
     cd doc
     make html-errors
-    make clean
     make man
     make latex
     cd _build/latex

doc/src/aboutus.rst

@@ -373,6 +373,9 @@ want to be mentioned here, so see our repository history for a full list).
 #. Michael Gallaspy: improve handling of inequalities involving RootOf
 #. Roman Inflianskas: add svg support to preview
 #. Duane Nykamp: improved function handling in parse_expr
+#. Ted Dokos: implemented interleaving for unions
+#. Sunny Aggarwal: fix Integral.transform method
+#. Akshat Jain: nsimplify returns ints quickly
 
 Up-to-date list in the order of the first contribution is given in the `AUTHORS
 <https://github.com/sympy/sympy/blob/master/AUTHORS>`_ file.

sympy/categories/baseclasses.py

@@ -1,6 +1,6 @@
 from __future__ import print_function, division
 
-from sympy.core import Basic, Dict, Symbol, Tuple
+from sympy.core import S, Basic, Dict, Symbol, Tuple
 from sympy.core.compatibility import xrange, iterable
 from sympy.sets import Set, FiniteSet, EmptySet
 
@@ -722,8 +722,8 @@ def __new__(cls, *args):
 
                 for morphism in conclusions_arg:
                     # Check that no new objects appear in conclusions.
-                    if (morphism.domain in objects) and \
-                       (morphism.codomain in objects):
+                    if ((objects.contains(morphism.domain) == S.true) and
+                        (objects.contains(morphism.codomain) == S.true)):
                         # No need to add identities and recurse
                         # composites this time.
                         Diagram._add_morphism_closure(
@@ -920,12 +920,14 @@ def subdiagram_from_objects(self, objects):
 
         new_premises = {}
         for morphism, props in self.premises.items():
-            if (morphism.domain in objects) and (morphism.codomain in objects):
+            if ((objects.contains(morphism.domain) == S.true) and
+                (objects.contains(morphism.codomain) == S.true)):
                 new_premises[morphism] = props
 
         new_conclusions = {}
         for morphism, props in self.conclusions.items():
-            if (morphism.domain in objects) and (morphism.codomain in objects):
+            if ((objects.contains(morphism.domain) == S.true) and
+                (objects.contains(morphism.codomain) == S.true)):
                 new_conclusions[morphism] = props
 
         return Diagram(new_premises, new_conclusions)

sympy/combinatorics/tests/test_prufer.py

@@ -24,8 +24,9 @@ def test_prufer():
 
     # accept iterables but convert to list of lists
     tree = [(0, 1), (1, 5), (0, 3), (0, 2), (2, 6), (4, 7), (2, 4)]
-    Prufer(tree).tree_repr == tree
-    Prufer(set(tree)).tree_repr == tree
+    tree_lists = [list(t) for t in tree]
+    assert Prufer(tree).tree_repr == tree_lists
+    assert sorted(Prufer(set(tree)).tree_repr) == sorted(tree_lists)
 
     raises(ValueError, lambda: Prufer([[1, 2], [3, 4]]))  # 0 is missing
     assert Prufer(*Prufer.edges([1, 2], [3, 4])).prufer_repr == [1, 3]