Merge pull request #1 from sympy/master

pull upstream changes

.mailmap

@@ -191,7 +191,6 @@ Darshan Chaudhary <deathbullet@gmail.com> darshanime <deathbullet@gmail.com>
 Jayesh Lahori <jlahori92@gmail.com> jayesh92 <jlahori92@gmail.com>
 Lokesh Sharma <lokeshhsharma@gmail.com> Firstname Lastname <your_email@youremail.com>
 Aaditya Nair <aadityanair6494@gmail.com> Aaditya M Nair <aadityanair6494@gmail.com>
-AMiT Kumar <dtu.amit@gmail.com> Amit Kumar <dtu.amit@gmail.com>
 Shivam Vats <shivamvats.iitkgp@gmail.com> Shivam Vats <aries@aries-Inspiron-3521.(none)>
 Ramana Venkata <idlike2dream@gmail.com> Ramana Venkata <vramana@users.noreply.github.com>
 Peleg Michaeli <freepeleg@gmail.com> Peleg Michaeli <peleg@palgo-at.com>
@@ -248,9 +247,46 @@ Akshay Siramdas <akshaysiramdas@gmail.com> AkshaySiramdas <akshaysiramdas@gmail.
 Nitin Chaudhary <nitinmax1000@gmail.com> Nitin <nitinmax1000@gmail.com>
 Alex Argunov <sajkoooo@gmail.com> alex argunov <sajkoooo@gmail.com>
 Abhishek Garg <abhishekgarg119@gmail.com> abhishek garg <abhishekgarg119@gmail.com>
-Gaurav Dhingra <axyd0000@gmail.com> Gaurav Dhingra <igauravdhingra@protonmail.com>
+Gaurav Dhingra <gauravdhingra.gxyd@gmail.com> Gaurav Dhingra <igauravdhingra@protonmail.com>
+Gaurav Dhingra <gauravdhingra.gxyd@gmail.com> Gaurav Dhingra <axyd0000@gmail.com>
 Krit Karan <kritkaran.b13@iiits.in> Krit Karan <kritkaran94@users.noreply.github.com>
 Arihant Parsoya <parsoyaarihant@gmail.com> arihant parsoya <parsoyaarihant@gmail.com>
 Harsh Gupta <mail@hargup.in> Harsh Gupta <gupta.harsh96@gmail.com>
 Sumith <sumith1896@gmail.com> Sumith1896 <sumith1896@gmail.com>
 Kshitij Saraogi <KshitijSaraogi@gmail.com> kshitij10496 <KshitijSaraogi@gmail.com>
+Langston Barrett <langston.barrett@gmail.com> siddharthist <langston.barrett@gmail.com>
+Devang Kulshreshtha <devang.kulshreshtha.cse14@itbhu.ac.in> devangkulshreshtha <devang.kulshreshtha.cse14@itbhu.ac.in>
+Mohammad Sadeq Dousti <msdousti@gmail.com> msdousti <msdousti@gmail.com>
+Rohit Rango <rohit.rango@gmail.com> rohitrango <rohit.rango@gmail.com>
+Sergey Pestov <pestov-sa@yandex.ru> psqq <pestov-sa@yandex.ru>
+Varun Garg <varun.garg03@gmail.com> mamakancha <varun.garg03@gmail.com>
+Rajat Thakur <rajatthakur1997@gmail.com> rajatthakur <rajatthakur1997@gmail.com>
+Tanay Agrawal <tanay_agrawal@hotmail.com> tanayag <tanay_agrawal@hotmail.com>
+Mohit Chandra <mohit.chandra@research.iiit.ac.in> mohit3011 <mohit.chandra@research.iiit.ac.in>
+Amit Kumar <dtu.amit@gmail.com> AMiT Kumar <aktech@users.noreply.github.com>
+Amit Kumar <dtu.amit@gmail.com> AMiT Kumar <dtu.amit@gmail.com>
+Harshil Goel <harshil158@gmail.com> Harshil Goel <darkcoderrises@users.noreply.github.com>
+Ruslan Pisarev <rpisarev@cloudlinux.com> Ruslan Pisarev <ruslan@rpisarev.org.ua>
+Langston Barrett <langston.barrett@gmail.com> siddharthist <langston.barrett@gmail.com>
+Isuru Fernando <isuruf@gmail.com> Isuru Fernando <isuru.11@cse.mrt.ac.lk>
+Arif Ahmed <arif.ahmed.5.10.1995@gmail.com> ArifAhmed1995 <arif.ahmed.5.10.1995@gmail.com>
+Valeriia Gladkova <valeriia.gladkova@gmail.com> Val <valeriia.gladkova@gmail.com>
+Valeriia Gladkova <valeriia.gladkova@gmail.com> valglad <valeriia.gladkova@gmail.com>
+Szymon Mieszczak <szymon.mieszczak@gmail.com> szymag <szymon.mieszczak@gmail.com>
+Ranjith Kumar <ranjith.dakshana2015@gmail.com> ranjithkumar007 <ranjith.dakshana2015@gmail.com>
+Rishabh Madan <rishabhmadan96@gmail.com> madan96 <rishabhmadan96@gmail.com>
+Shivam Vats <shivamvats.iitkgp@gmail.com> Shivam Vats <shivamhzb@gmail.com>
+Rajat Thakur <rajatthakur1997@gmail.com> Rajat Thakur <Rajat Thakur>
+Nicolás Guarín-Zapata <nicoguarin@gmail.com> Nicolas Guarin-Zapata <nicoguarin@gmail.com>
+Markus Müller <markus.mueller.1.g@googlemail.com> Markus <markus.mueller.1.g@googlemail.com>
+Marcel Stimberg <marcel.stimberg@ens.fr> Marcel Stimberg <marcel.stimberg@inserm.fr>
+Jainul Vaghasia <jainulvaghasia@gmail.com> Jainul Vaghasia <jainulvaghasia@D-10-157-53-226.dhcp4.washington.edu>
+Arif Ahmed <arif.ahmed.5.10.1995@gmail.com> ArifAhmed1995 <arif.ahmed.5.10.1995@gmail.com>
+Pranjal Tale <pranjaltale16@gmail.com> = <pranjaltale16@gmail.com>
+jtoka <jason.tokayer@gmail.com> jtoka <jason.tokayer@capitalone.com>
+Theodore Han <theodorehan@hotmail.com> LAPTOP-4VOQQ6GI\han <theodorehan373@gmail.com>
+Theodore Han <theodorehan@hotmail.com> Theodore Han <tqhan317@gmail.com>
+Rajat Thakur <rajatthakur1997@gmail.com> Rajat Thakur <rajatatthakur23@gmail.com>
+Mauro Garavello <mauro.garavello@unimib.it> maurogaravello <mauro.garavello@unimib.it>
+Shikhar Jaiswal <jaiswalshikhar87@gmail.com> ShikharJ <jaiswalshikhar87@gmail.com>
+Thomas Hunt <thomashunt13@gmail.com> Thomas Hunt <twhunt@users.noreply.github.com>

.travis.yml

@@ -15,6 +15,7 @@ python:
   - 3.3
   - 3.4
   - 3.5
+  - 3.6
 
 matrix:
   include:
@@ -25,6 +26,7 @@ matrix:
         - TEST_THEANO="true"
         - TEST_ASCII="true"
         - TEST_AUTOWRAP="true"
+        - TEST_SYMENGINE="true"
       addons:
         apt:
           packages:
@@ -40,6 +42,7 @@ matrix:
         - TEST_THEANO="true"
         - TEST_ASCII="true"
         - TEST_AUTOWRAP="true"
+        - TEST_SYMENGINE="true"
       addons:
         apt:
           packages:
@@ -92,9 +95,6 @@ matrix:
       env:
         - TEST_SLOW="true"
         - SPLIT="3/3"
-    - python: 3.5
-      env:
-        - TEST_SYMENGINE="true"
 
     # Everything here and below is in the allow_failures. The need to be
     # duplicated here and in that section below.
@@ -258,8 +258,8 @@ before_install:
     fi
   - if [[ "${TEST_SYMENGINE}" == "true" ]]; then
         conda config --add channels conda-forge;
-        conda config --add channels symengine;
-        conda install python-symengine=0.2.0;
+        conda config --add channels symengine/label/dev;
+        conda install python-symengine=0.3.*;
     fi
   - |
     if [[ "${TEST_THEANO}" == "true" ]]; then
@@ -306,7 +306,7 @@ script:
   - set -e
   - bin/test_travis.sh
   - if [[ "${TEST_SPHINX}" == "true" ]]; then
-        doctr deploy --deploy-repo sympy/sympy_doc --gh-pages-docs dev --command './generate_indexes.py';
+        doctr deploy dev --deploy-repo sympy/sympy_doc --command './generate_indexes.py';
     fi
 notifications:
   email: false

AUTHORS

@@ -3,6 +3,7 @@ order of the date of their first contribution), except those who explicitly
 didn't want to be mentioned. People with a * next to their names are not found
 in the metadata of the git history. This file is generated automatically by
 running `./bin/authors_update.py`.
+There are a total of 618 authors.
 
 Ondřej Čertík <ondrej@certik.cz>
 Fabian Pedregosa <fabian@fseoane.net>
@@ -39,7 +40,7 @@ David Roberts <dvdr18@gmail.com>
 Sebastian Krämer <basti.kr@gmail.com>
 Vinzent Steinberg <vinzent.steinberg@gmail.com>
 Riccardo Gori <goriccardo@gmail.com>
-*Case Van Horsen <casevh@gmail.com>
+Case Van Horsen <casevh@gmail.com>
 Stepan Roucka <stepan@roucka.eu>
 Ali Raza Syed <arsyed@gmail.com>
 Stefano Maggiolo <s.maggiolo@gmail.com>
@@ -233,7 +234,6 @@ Prasoon Shukla <prasoon92.iitr@gmail.com>
 Stefen Yin <zqyin@ucdavis.edu>
 Thomas Hisch <t.hisch@gmail.com>
 Madeleine Ball <mpball@gmail.com>
-Case Van Horsen <casevh@gmail.com>
 Mary Clark <mary.spriteling@gmail.com>
 Rishabh Dixit <rishabhdixit11@gmail.com>
 Manoj Kumar <manojkumarsivaraj334@gmail.com>
@@ -378,7 +378,7 @@ Eric Miller <emiller42@gmail.com>
 Venkata Ramana <idlike2dream@gmail.com>
 Cody Herbst <cyherbst@gmail.com>
 Nishith Shah <nishithshah.2211@gmail.com>
-AMiT Kumar <dtu.amit@gmail.com>
+Amit Kumar <dtu.amit@gmail.com>
 Yury G. Kudryashov <urkud.urkud@gmail.com>
 Guillaume Gay <contact@damcb.com>
 Ray Cathcart <github@cathcart.us>
@@ -416,7 +416,7 @@ Nguyen Truong Duy <truongduy134@yahoo.com>
 Alex Lindsay <adlinds3@ncsu.edu>
 Mathew Chong <mathewchong.dev@gmail.com>
 Jason Siefken <siefkenj@gmail.com>
-Gaurav Dhingra <axyd0000@gmail.com>
+Gaurav Dhingra <gauravdhingra.gxyd@gmail.com>
 Gao, Xiang <qasdfgtyuiop@gmail.com>
 Kevin Ventullo <kevin.ventullo@gmail.com>
 mao8 <thisisma08@gmail.com>
@@ -474,7 +474,6 @@ Shubham Tibra <shubh.tibra@gmail.com>
 Ashutosh Saboo <ashutosh.saboo96@gmail.com>
 Michael S. Hansen <michael.hansen@nih.gov>
 Anish Shah <shah.anish07@gmail.com>
-Harshil Goel <darkcoderrises@users.noreply.github.com>
 Guillaume Jacquenot <guillaume.jacquenot@gmail.com>
 Bhautik Mavani <mavanibhautik@gmail.com>
 Michał Radwański <enedil.isildur@gmail.com>
@@ -522,9 +521,7 @@ Normal Human <normalhuman@users.noreply.github.com>
 Josh Burkart <jburkart@gmail.com>
 Dimitra Konomi <t8130064@dias.aueb.gr>
 ChristinaZografou <t8130048@dias.aueb.gr>
-Ruslan Pisarev <ruslan@rpisarev.org.ua>
 FiachAntaw <fiach.antaw+github@gmail.com>
-siddharthist <langston.barrett@gmail.com>
 Langston Barrett <langston.barrett@gmail.com>
 Krit Karan <kritkaran.b13@iiits.in>
 G. D. McBain <gdmcbain@protonmail.com>
@@ -543,3 +540,86 @@ Dennis Meckel <meckel@datenschuppen.de>
 Harshil Meena <harshil.7535@gmail.com>
 Micky <mickydroch@gmail.com>
 arghdos <arghdos@gmail.com>
+Michele Zaffalon <michele.zaffalon@gmail.com>
+Martha Giannoudovardi <maapxa@gmail.com>
+Devang Kulshreshtha <devang.kulshreshtha.cse14@itbhu.ac.in>
+steph papanik <spapanik21@gmail.com>
+Mohammad Sadeq Dousti <msdousti@gmail.com>
+Arif Ahmed <arif.ahmed.5.10.1995@gmail.com>
+Abdullah Javed Nesar <abduljaved1994@gmail.com>
+Lakshya Agrawal <zeeshan.lakshya@gmail.com>
+shruti <shrutishrm512@gmail.com>
+Rohit Rango <rohit.rango@gmail.com>
+Hong Xu <hong@topbug.net>
+Ivan Petuhov <ivan@ostrovok.ru>
+Alsheh <alsheh@rpi.edu>
+Marcel Stimberg <marcel.stimberg@ens.fr>
+Alexey Pakhocmhik <cool.Bakov@yandex.ru>
+Tommy Olofsson <tommy.olofsson.90@gmail.com>
+Zulfikar <zulfikar97@gmail.com>
+bsdz <bsdz@users.noreply.github.com>
+Danny Hermes <daniel.j.hermes@gmail.com>
+Sergey Pestov <pestov-sa@yandex.ru>
+Mohit Chandra <mohit.chandra@research.iiit.ac.in>
+karthikchintapalli <karthik.chintapalli@gmail.com>
+Marcin Briański <marcin.brianski@student.uj.edu.pl>
+andreo <andrey.torba@gmail.com>
+Flamy Owl <flamyowl@protonmail.ch>
+Yicong Guo <guoyicong100@gmail.com>
+Varun Garg <varun.garg03@gmail.com>
+Rishabh Madan <rishabhmadan96@gmail.com>
+Aditya Kapoor <aditya.kapoor.apm12@itbhu.ac.in>
+Karan Sharma <karan1276@gmail.com>
+Vedant Rathore <vedantr1998@gmail.com>
+Johan Blåbäck <johan.blaback@cea.fr>
+Pranjal Tale <pranjaltale16@gmail.com>
+jtoka <jason.tokayer@gmail.com>
+Raghav Jajodia <jajodia.raghav@gmail.com>
+Rajat Thakur <rajatthakur1997@gmail.com>
+Dhruv Bhanushali <dhruv_b@live.com>
+geety <anjul.ten@gmail.com>
+Barun Parruck <barun.parruck@gmail.com>
+Bao Chau <chauquocbao0907@gmail.com>
+Tanay Agrawal <tanay_agrawal@hotmail.com>
+Ranjith Kumar <ranjith.dakshana2015@gmail.com>
+Shikhar Makhija <shikharmakhija2@gmail.com>
+yathartha <yathartha32@gmail.com>
+Valeriia Gladkova <valeriia.gladkova@gmail.com>
+Sagar Bharadwaj <sagarbharadwaj50@gmail.com>
+Daniel Mahler <dmahler@gmail.com>
+Ka Yi <chua.kayi@yahoo.com.sg>
+Rishat Iskhakov <iskhakov@frtk.ru>
+Szymon Mieszczak <szymon.mieszczak@gmail.com>
+Sachin Agarwal <sachin13agarwal@gmail.com>
+Priyank Patel <pspbot7@gmail.com>
+Satya Prakash Dwibedi <akash581050@gmail.com>
+tools4origins <tools4origins@gmail.com>
+Nico Schlömer <nico.schloemer@gmail.com>
+Fermi Paradox <FermiParadox@users.noreply.github.com>
+Ekansh Purohit <purohit.e15@gmail.com>
+Vedarth Sharma <vedarth.sharma@gmail.com>
+Peeyush Kushwaha <peeyush.p97@gmail.com>
+Jayjayyy <vfhsln8s3l4b87t4c3@byom.de>
+Christopher J. Wright <cjwright4242gh@gmail.com>
+Jakub Wilk <jwilk@jwilk.net>
+Mauro Garavello <mauro.garavello@unimib.it>
+Chris Tefer <ctefer@gmail.com>
+Shikhar Jaiswal <jaiswalshikhar87@gmail.com>
+Chiu-Hsiang Hsu <wdv4758h@gmail.com>
+Carlos Cordoba <ccordoba12@gmail.com>
+Fabian Ball <fabian.ball@kit.edu>
+Yerniyaz <yerniyaz.nurgabylov@nu.edu.kz>
+Christiano Anderson <canderson@riseup.net>
+Robin Neatherway <robin.neatherway@gmail.com>
+Thomas Hunt <thomashunt13@gmail.com>
+Theodore Han <theodorehan@hotmail.com>
+Duc-Minh Phan <alephvn@gmail.com>
+Lejla Metohajrova <l.metohajrova@gmail.com>
+Samyak Jain <samyak.jain2016a@vitstudent.ac.in>
+Aditya Rohan <riyuzakiiitk@gmail.com>
+Vincent Delecroix <vincent.delecroix@labri.fr>
+Michael Sparapany <msparapa@purdue.edu>
+harsh_jain <harshjniitr@gmail.com>
+Nathan Goldbaum <ngoldbau@illinois.edu>
+Kenneth Lyons <ixjlyons@gmail.com>
+latot <felipematas@yahoo.com>

bin/authors_update.py

@@ -12,9 +12,17 @@
 import os
 import sys
 
-from fabric.api import local, env
-from fabric.colors import yellow, blue, green, red
-from fabric.utils import error
+if sys.version_info < (3, 6):
+    sys.exit("This script requires Python 3.6 or newer")
+
+from subprocess import run, PIPE
+from collections import OrderedDict
+
+def yellow(text):
+    return "\033[33m%s\033[0m" % text
+
+def blue(text):
+    return "\033[34m%s\033[0m" % text
 
 mailmap_update_path = os.path.abspath(__file__)
 mailmap_update_dir = os.path.dirname(mailmap_update_path)
@@ -24,21 +32,16 @@
 if os.path.isdir(sympy_dir):
     sys.path.insert(0, sympy_top)
 
-from sympy.utilities.misc import filldedent
-
-try:
-    # Only works in newer versions of fabric
-    env.colorize_errors = True
-except AttributeError:
-    pass
+git_command = ["git", "log", "--topo-order", "--reverse", "--format=%aN <%aE>"]
 
-git_command = """git log --topo-order --reverse --format="%aN <%aE>" | awk ' !x[$0]++'"""
+git_people = run(git_command, stdout=PIPE, encoding='utf-8').stdout.strip().split("\n")
 
-git_people = unicode(local(git_command, capture=True), 'utf-8').strip().split("\n")
+# Remove duplicates, keeping the original order
+git_people = list(OrderedDict.fromkeys(git_people))
 
 from distutils.version import LooseVersion
 
-git_ver = local('git --version', capture=True)[12:]
+git_ver = run(['git', '--version'], stdout=PIPE, encoding='utf-8').stdout[12:]
 if LooseVersion(git_ver) < LooseVersion('1.8.4.2'):
     print(yellow("Please use a newer git version >= 1.8.4.2"))
 
@@ -57,7 +60,7 @@ def move(l, i1, i2):
 git_people.insert(11, "*Ulrich Hecht <ulrich.hecht@gmail.com>")
 git_people.pop(12) # Kirill Smelkov
 move(git_people, 12, 32) # Sebastian Krämer
-git_people.insert(35, "*Case Van Horsen <casevh@gmail.com>")
+move(git_people, 227, 35) # Case Van Horsen
 git_people.insert(43, "*Dan <coolg49964@gmail.com>")
 move(git_people, 57, 59) # Aaron Meurer
 move(git_people, 58, 57) # Andrew Docherty
@@ -77,13 +80,13 @@ def move(l, i1, i2):
 """
 header_extra = """There are a total of {authors_count} authors.\n""".format(authors_count=len(git_people))
 
-fd = open(os.path.realpath(os.path.join(__file__, os.path.pardir,
-    os.path.pardir, "AUTHORS")), "w")
-fd.write(header)
-fd.write(header_extra)
-fd.write("\n")
-fd.write("\n".join(git_people).encode("utf8"))
-fd.write("\n")
+with open(os.path.realpath(os.path.join(__file__, os.path.pardir,
+                                        os.path.pardir, "AUTHORS")), "w") as fd:
+    fd.write(header)
+    fd.write(header_extra)
+    fd.write("\n")
+    fd.write("\n".join(git_people))
+    fd.write("\n")
 
 print(blue("""
 Please make sure that there are no duplicates in the new AUTHORS, then commit