Skip to content

Commit

Permalink
Merge branch 'master' into 0.7.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
asmeurer committed Sep 3, 2015
2 parents c86942c + 19f5894 commit 86f5829
Show file tree
Hide file tree
Showing 979 changed files with 43,214 additions and 89,458 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -55,6 +55,7 @@ doc/sphinx/

# pdf files generated from svg files (cd doc; make latex)
doc/src/modules/physics/mechanics/*.pdf
doc/src/modules/physics/vector/*.pdf

# Mac OS X Junk
.DS_Store
Expand All @@ -67,3 +68,4 @@ sample.tex

# IPython Notebook Checkpoints
.ipynb_checkpoints/

12 changes: 12 additions & 0 deletions .mailmap
Expand Up @@ -178,3 +178,15 @@ Peter Brady <petertbrady@gmail.com> peter <petertbrady@gmail.com>
Craig A. Stoudt <craig.stoudt@gmail.com> cstoudt <craig.stoudt@gmail.com>
Raj <raj454raj@gmail.com> raj454raj <raj454raj@gmail.com>
John V. Siratt <jvsiratt@gmail.com> John Siratt <jvsiratt@gmail.com>
Ted Dokos <tdokos@gmail.com> ted-dokos <t.dokos@gmail.com>
Akshat Jain <akshat.jain@students.iiit.ac.in> akshat_jain <akshat.jain@students.iiit.ac.in>
Akshat Jain <akshat.jain@students.iiit.ac.in> jugnu <akshat.jain@students.iiit.ac.in>
Cody Herbst <cyherbst@gmail.com> cody-herbst <cyherbst@gmail.com>
Nishith Shah <nishithshah.2211@gmail.com> nishith <nishithshah.2211@gmail.com>
Nishith Shah <nishithshah.2211@gmail.com> nishithshah2211 <nishithshah.2211@gmail.com>
Tuan Manh Lai <laituan245@gmail.com> laituan245 <laituan245@gmail.com>
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>
64 changes: 51 additions & 13 deletions .travis.yml
@@ -1,4 +1,5 @@
language: python
sudo: false
env:
matrix:
- TEST_DOCTESTS="true" FASTCACHE="false"
Expand All @@ -7,7 +8,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
Expand All @@ -19,9 +20,17 @@ matrix:
- python: 2.7
env:
- TEST_GMPY="true" TEST_MATPLOTLIB="true"
addons:
apt:
packages:
- libgmp-dev
- python: 3.4
env:
- TEST_GMPY="true" TEST_MATPLOTLIB="true"
addons:
apt:
packages:
- libgmp-dev
- python: "pypy"
env:
- TEST_DOCTESTS="true"
Expand All @@ -40,31 +49,55 @@ matrix:
- FASTCACHE="false"
- python: 2.7
env: TEST_SPHINX="true" FASTCACHE="false"
sudo: true
- python: 2.7
env:
- TEST_SLOW="true"
- SPLIT="1/2"
- SPLIT="1/3"
- python: 2.7
env:
- TEST_SLOW="true"
- SPLIT="2/2"
- SPLIT="2/3"
- python: 2.7
env:
- TEST_SLOW="true"
- SPLIT="3/3"
- python: 3.4
env:
- TEST_SLOW="true"
- SPLIT="1/3"
- python: 3.4
env:
- TEST_SLOW="true"
- SPLIT="1/2"
- SPLIT="2/3"
- python: 3.4
env:
- TEST_SLOW="true"
- SPLIT="2/2"
- SPLIT="3/3"
- python: 2.7
env:
- TEST_THEANO="true"
addons:
apt:
packages:
- libatlas-dev
- libatlas-base-dev
- liblapack-dev
- gfortran
- python: 3.4
env:
- TEST_THEANO="true"
addons:
apt:
packages:
- libatlas-dev
- libatlas-base-dev
- liblapack-dev
- gfortran
- python: 2.7
env:
- TEST_AUTOWRAP="true"
sudo: true
virtualenv:
system_site_packages: true
- python: 2.7
Expand All @@ -78,6 +111,7 @@ matrix:
env:
- TEST_SAGE="true"
- FASTCACHE="false"
sudo: true
- python: "pypy"
env:
- SPLIT="4/4"
Expand All @@ -91,22 +125,18 @@ before_install:
sudo apt-get install gfortran gcc python-numpy cython;
fi
- if [[ "${TEST_GMPY}" == "true" ]]; then
sudo apt-get update;
sudo apt-get install libgmp-dev;
pip install "gmpy==1.16";
fi
- if [[ "${TEST_SPHINX}" == "true" ]]; then
sudo apt-get update;
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";
pip install "sphinx==1.3.1";
fi
- if [[ "${TEST_MATPLOTLIB}" == "true" ]]; then
pip install "numpy==1.7.1";
pip install --allow-external "matplotlib==1.2.1";
fi
- if [[ "${TEST_THEANO}" == "true" ]]; then
sudo apt-get update;
sudo apt-get install -qq libatlas-dev libatlas-base-dev liblapack-dev gfortran;
pip install "numpy==1.7.1";
pip install "scipy==0.12.0";
pip install --no-deps https://github.com/Theano/Theano/archive/rel-0.6.zip;
Expand All @@ -117,12 +147,20 @@ before_install:
sudo apt-get install sagemath-upstream-binary;
fi
install:
- if [[ "${TEST_SAGE}" != "true" ]]; then
#The install cycle below is to test installation on systems without setuptools.
- if [[ "${TEST_AUTOWRAP}" == "true" ]]; then
pip uninstall -y setuptools;
python setup.py install;
pip uninstall -y sympy;
pip install setuptools;
python setup.py install;
elif [[ "${TEST_SAGE}" != "true" ]]; then
python setup.py 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
50 changes: 49 additions & 1 deletion AUTHORS
Expand Up @@ -230,7 +230,6 @@ Niklas Thörne <notrupertthorne@gmail.com>
Huijun Mai <m.maihuijun@gmail.com>
Marek Šuppa <mr@shu.io>
Prasoon Shukla <prasoon92.iitr@gmail.com>
Sergey B Kirpichev <skirpichev@gmail.com>
Stefen Yin <zqyin@ucdavis.edu>
Thomas Hisch <t.hisch@gmail.com>
Matthew Hoff <mhoff14@gmail.com>
Expand Down Expand Up @@ -368,3 +367,52 @@ Hamish Dickson <hamish.dickson@gmail.com>
Michael Gallaspy <gallaspy.michael@gmail.com>
Roman Inflianskas <infroma@gmail.com>
Duane Nykamp <nykamp@umn.edu>
Ted Dokos <tdokos@gmail.com>
Sunny Aggarwal <sunnyaggarwal1994@gmail.com>
Akshat Jain <akshat.jain@students.iiit.ac.in>
Shivam Vats <shivamvats.iitkgp@gmail.com>
Cody Herbst <cyherbst@gmail.com>
AMiT Kumar <dtu.amit@gmail.com>
Nishith Shah <nishithshah.2211@gmail.com>
Guillaume Gay <contact@damcb.com>
Ray Cathcart <github@cathcart.us>
Mihir Wadwekar <m.mihirw@gmail.com>
Tuan Manh Lai <laituan245@gmail.com>
Darshan Chaudhary <deathbullet@gmail.com>
Alec Kalinin <alec.kalinin@gmail.com>
Aaditya Nair <aadityanair6494@gmail.com>
Jayesh Lahori <jlahori92@gmail.com>
harshil goel <harshil158@gmail.com>
Lokesh Sharma <lokeshhsharma@gmail.com>
Sartaj Singh <singhsartaj94@gmail.com>
Chris Swierczewski <cswiercz@gmail.com>
Sumith <sumith1896@gmail.com>
Konstantin Togoi <togoi.konstantin@outlook.com>
Param Singh <paramsingh258@gmail.com>
Philippe Bouafia <philippe.bouafia@ensea.fr>
Juha Remes <jremes@outlook.com>
Lucas Jones <lucas@lucasjones.co.uk>
Peter Schmidt <peter@peterjs.com>
Jiaxing Liang <liangjiaxing57@gmail.com>
Gregory Ashton <gash789@gmail.com>
Renato Orsino <renato.orsino@gmail.com>
Jennifer White <jcrw122@googlemail.com>
Alistair Lynn <arplynn@gmail.com>
Govind Sahai <gsiitbhu@gmail.com>
Adam Bloomston <>
Kyle McDaniel <mcdanie5@illinois.edu>
Nguyen Truong Duy <truongduy134@yahoo.com>
Alex Lindsay <adlinds3@ncsu.edu>
Jason Siefken <siefkenj@gmail.com>
Mathew Chong <mathewchong.dev@gmail.com>
Gaurav Dhingra <axyd0000@gmail.com>
Kevin Ventullo <kevin.ventullo@gmail.com>
Longqi Wang <iqgnol@gmail.com>
Isuru Fernando <isuruf@gmail.com>
Shivam Tyagi <shivam.tyagi.apm13@itbhu.ac.in>
Rich LaSota <rjlasota@gmail.com>
Anton Akhmerov <anton.akhmerov@gmail.com>
Richard Otis <richard.otis@outlook.com>
Michael Zingale <michael.zingale@stonybrook.edu>
Kumar Krishna Agrawal <kumar.1994.14@gmail.com>
Dustin Gadal <Dustin.Gadal@gmail.com>
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
Copyright (c) 2006-2014 SymPy Development Team
Copyright (c) 2006-2015 SymPy Development Team

All rights reserved.

Expand Down
1 change: 0 additions & 1 deletion MANIFEST.in
@@ -1,6 +1,5 @@
recursive-include data *
recursive-include doc *
recursive-include sympy/logic/benchmarks/input *
prune doc/_build
recursive-include examples *.py README

Expand Down
34 changes: 22 additions & 12 deletions README.rst
@@ -1,6 +1,18 @@
SymPy
=====

|pypi version| |pypi download| |Build status| |Gitter Badge|

.. |pypi version| image:: https://img.shields.io/pypi/v/sympy.png
:target: https://pypi.python.org/pypi/sympy
.. |pypi download| image:: https://img.shields.io/pypi/dm/sympy.png
:target: https://pypi.python.org/pypi/sympy
.. |Gitter Badge| image:: https://badges.gitter.im/Join%20Chat.svg
:alt: Join the chat at https://gitter.im/sympy/sympy
:target: https://gitter.im/sympy/sympy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
.. |Build status| image:: https://secure.travis-ci.org/sympy/sympy.png?branch=master
:target: http://travis-ci.org/sympy/sympy

A Python library for symbolic mathematics.

http://sympy.org/
Expand All @@ -20,15 +32,10 @@ https://groups.google.com/forum/?fromgroups#!forum/sympy.
We have community chat at `Gitter <https://gitter.im/sympy/sympy>`_. Feel free
to ask us anything there. We have a very welcoming and helpful community.


Download
--------

.. image:: https://pypip.in/v/sympy/badge.png
:target: https://pypi.python.org/pypi/sympy

.. image:: https://pypip.in/d/sympy/badge.png
:target: https://pypi.python.org/pypi/sympy

Get the latest version of SymPy from
https://pypi.python.org/pypi/sympy/

Expand All @@ -38,7 +45,7 @@ To get the git version do

$ git clone git://github.com/sympy/sympy.git

For other options (tarballs, debs, etc.), see See
For other options (tarballs, debs, etc.), see
http://docs.sympy.org/dev/install.html.

Documentation and usage
Expand Down Expand Up @@ -81,7 +88,13 @@ if SymPy is installed.
Installation
------------

To install SymPy, simply run::
SymPy has a hard dependency on the `mpmath <http://mpmath.org/>`
library (version >= 0.19). You should install it first, please refer to
the mpmath installation guide:

https://github.com/fredrik-johansson/mpmath#1-download--installation

To install SymPy itself, then simply run::

$ python setup.py install

Expand All @@ -102,10 +115,7 @@ in the current directory.

For more fine-grained running of tests or doctest, use ``bin/test`` or
respectively ``bin/doctest``. The master branch is automatically tested by
Travis CI, the results can be seen here:

.. image:: https://secure.travis-ci.org/sympy/sympy.png?branch=master
:target: http://travis-ci.org/sympy/sympy
Travis CI.

To test pull requests, use `sympy-bot <https://github.com/sympy/sympy-bot>`_.

Expand Down
45 changes: 0 additions & 45 deletions bin/adapt_paths.py

This file was deleted.

6 changes: 3 additions & 3 deletions bin/ask_update.py
Expand Up @@ -21,9 +21,9 @@
if os.path.isdir(sympy_dir):
sys.path.insert(0, sympy_top)

from sympy.assumptions.ask import (compute_known_facts, known_facts,
known_facts_keys)
from sympy.assumptions.ask import (compute_known_facts,
get_known_facts, get_known_facts_keys)

with open('sympy/assumptions/ask_generated.py', 'w') as f:
code = compute_known_facts(known_facts, known_facts_keys)
code = compute_known_facts(get_known_facts(), get_known_facts_keys())
f.write(code)

0 comments on commit 86f5829

Please sign in to comment.