Skip to content

Commit cc692d9

Browse files
asmeurerasmeurer
committed
Merge branch '1.4' into matexpr-cleanup
2 parents 13aa1f8 + ef9eb13 commit cc692d9

File tree

569 files changed

+16734
-7276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

569 files changed

+16734
-7276
lines changed

‎.coveragerc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[run]
2+
parallel = True
3+
branch = True
4+
source = sympy
5+
omit =
6+
*/tests/*
7+
*/benchmarks/*
8+
*/sympy/integrals/rubi/rules/*
9+
*/sympy/plotting/pygletplot/*
10+
*/conftest.py
11+
data_file = $TRAVIS_BUILD_DIR/.coverage
12+
13+
[report]
14+
exclude_lines =
15+
\#.*pragma:\s*no.?cover
16+
^\s*if SYMPY_DEBUG:
17+
show_missing = True

‎.mailmap

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,22 @@ Gagandeep Singh <singh.23@iitj.ac.in> czgdp1807 <gdp.1807@gmail.com>
394394
Gagandeep Singh <singh.23@iitj.ac.in> czgdp1807 <36567889+czgdp1807@users.noreply.github.com>
395395
Gagandeep Singh <singh.23@iitj.ac.in> czgdp1807 <czgdp1807@gmail.com>
396396
Gagandeep Singh <singh.23@iitj.ac.in> MathLover <36567889+czgdp1807@users.noreply.github.com>
397+
Gagandeep Singh <singh.23@iitj.ac.in> czgdp1807 <singh.23@iitj.ac.in>
398+
Gagandeep Singh <singh.23@iitj.ac.in> Gagandeep Singh <36567889+czgdp1807@users.noreply.github.com>
399+
Gagandeep Singh <singh.23@iitj.ac.in> Gagandeep Singh <czgdp1807@gmail.com>
397400
S.Y. Lee <sylee957@gmail.com> sylee957 <sylee957@gmail.com>
398401
Yatna Verma <yatnavermaa@gmail.com> yatna <yatnavermaa@gmail.com>
399402
Jared Lumpe <mjlumpe@gmail.com> Michael Jared Lumpe <mjlumpe@gmail.com>
403+
Austin Palmer <ap4000@nyu.edu> austin <ap4000@nyu.edu>
404+
Marduk Bolaños <mardukbp@mac.com> mardukbp <mardukbp@mac.com>
405+
amsuhane <ayushsuhane99@iitkgp.ac.in> amsuhane <“ayushsuhane99@iitkgp.ac.in”>
406+
Ritu Raj Singh <RituRajSingh878@gmail.com> Ritu Raj Singh <37741324+RituRajSingh878@users.noreply.github.com>
407+
Ritu Raj Singh <RituRajSingh878@gmail.com> RituRajSingh878 <RituRajSingh878@gmail.com>
408+
rationa-kunal <kunalgk1999@gmail.com> kunal <kunalgk1999@protonmail.com>
409+
shiksha11 <shiksharawat01@gmail.com> shiksha11 <33157995+shiksha11@users.noreply.github.com>
410+
Jogi Miglani <jmig5776@gmail.com> jmig5776 <jmig5776@gmail.com>
411+
Supreet Agrawal <supreet11agrawal@gmail.com> stm <supreet11agrawal@gmail.com>
412+
Bavish Kulur <bavishkulur@gmail.com> bavish2201 <bavishkulur@gmail.com>
413+
Divyanshu Thakur <divyanshu@iiitmanipur.ac.in> Divyanshu <divyanshu@iiitmanipur.ac.in>
414+
Shubham Kumar Jha <skjha832@gmail.com> ShubhamKJha <skjha832@gmail.com>
415+
Frédéric Chapoton <fchapoton2@gmail.com> fchapoton <fchapoton2@gmail.com>

‎.travis.yml

Lines changed: 91 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
language: python
22
sudo: false
3+
stages:
4+
- quality
5+
- baseline
6+
- test
37
env:
48
matrix:
9+
- SPLIT="1/2" TEST_SYMPY="true"
10+
- SPLIT="2/2" TEST_SYMPY="true"
511
- TEST_DOCTESTS="true" FASTCACHE="false" TEST_SETUP="true"
6-
- SPLIT="1/4" TEST_SYMPY="true"
7-
- SPLIT="2/4" TEST_SYMPY="true"
8-
- SPLIT="3/4" TEST_SYMPY="true"
9-
- SPLIT="4/4" TEST_SYMPY="true"
1012
global:
1113
- secure: "YIEZal9EBTL+fg2YmoZoS8Bvt3eAVUOZjb38CtqpzR2CCSXWoUk35KG23m2NknlY1iKfYJyt7XWBszT/VKOQEbWQq7PIakV4vIByrWacgBxy1x3WC+rZoW7TX+JJiL+y942qIYbMoNMMB8xFpE5RDLSjSecMpFhJJXoafVTvju8="
1214
dist: trusty
@@ -15,15 +17,39 @@ python:
1517
- 2.7
1618
- 3.4
1719
- 3.5
18-
- 3.6
1920

2021
matrix:
2122
include:
22-
- python: 2.7
23+
- stage: quality
24+
python: 3.7
25+
dist: xenial
26+
sudo: true
27+
script: bin/test quality
28+
env:
29+
30+
- stage: baseline
31+
python: 3.7
32+
dist: xenial
33+
sudo: true
34+
env:
35+
- TEST_DOCTESTS="true" FASTCACHE="false" TEST_SETUP="true"
36+
- python: 3.7
37+
dist: xenial
38+
sudo: true
39+
env:
40+
- SPLIT="1/2" TEST_SYMPY="true"
41+
- python: 3.7
42+
dist: xenial
43+
sudo: true
44+
env:
45+
- SPLIT="2/2" TEST_SYMPY="true"
46+
47+
- stage: test
48+
python: 2.7
2349
env:
2450
- TEST_ASCII="true"
2551
# space separated list of optional dependencies(conda packages) to install and test
26-
- TEST_OPT_DEPENDENCY="numpy scipy gmpy2 matplotlib>=2.2 theano llvmlite autowrap cython wurlitzer python-symengine=0.3.* tensorflow numexpr ipython antlr-python-runtime>=4.7,<4.8 antlr>=4.7,<4.8 cloudpickle"
52+
- TEST_OPT_DEPENDENCY="numpy scipy gmpy2 matplotlib>=2.2 theano llvmlite autowrap cython wurlitzer python-symengine=0.3.* tensorflow numexpr ipython antlr-python-runtime>=4.7,<4.8 antlr>=4.7,<4.8 cloudpickle python=2.7"
2753
addons:
2854
apt:
2955
packages:
@@ -33,6 +59,9 @@ matrix:
3359
- liblapack-dev
3460
- gfortran
3561
- python: 3.6
62+
# This is actually 3.7 (once all the dependencies support it). We use
63+
# python: 3.6 here because 3.7 requires the slower xenial/sudo: true container,
64+
# and we aren't actually using the Travis Python anyway.
3665
env:
3766
- TEST_ASCII="true"
3867
- TEST_OPT_DEPENDENCY="numpy scipy gmpy2 matplotlib theano llvmlite autowrap cython wurlitzer python-symengine=0.3.* tensorflow numexpr ipython antlr-python-runtime>=4.7,<4.8 antlr>=4.7,<4.8 cloudpickle"
@@ -47,7 +76,9 @@ matrix:
4776
- gfortran
4877
- python-scipy
4978

50-
- python: 3.6
79+
- python: 3.7
80+
dist: xenial
81+
sudo: true
5182
env:
5283
- TEST_SPHINX="true"
5384
- FASTCACHE="false"
@@ -69,27 +100,53 @@ matrix:
69100
- python: 2.7
70101
env:
71102
- TEST_SLOW="true"
72-
- SPLIT="1/3"
103+
- SPLIT="1/2"
73104
- python: 2.7
74105
env:
75106
- TEST_SLOW="true"
76-
- SPLIT="2/3"
77-
- python: 2.7
107+
- SPLIT="2/2"
108+
- python: 3.7
109+
dist: xenial
110+
sudo: true
78111
env:
79112
- TEST_SLOW="true"
80-
- SPLIT="3/3"
81-
- python: 3.6
113+
- SPLIT="1/2"
114+
- python: 3.7
115+
dist: xenial
116+
sudo: true
82117
env:
83118
- TEST_SLOW="true"
84-
- SPLIT="1/3"
119+
- SPLIT="2/2"
120+
121+
# Code coverage tests
85122
- python: 3.6
123+
dist: xenial
124+
sudo: true
86125
env:
87-
- TEST_SLOW="true"
88-
- SPLIT="2/3"
126+
- TEST_SYMPY="true"
127+
- TEST_COVERAGE="true"
128+
- SPLIT="1/4"
89129
- python: 3.6
130+
dist: xenial
131+
sudo: true
90132
env:
91-
- TEST_SLOW="true"
92-
- SPLIT="3/3"
133+
- TEST_SYMPY="true"
134+
- TEST_COVERAGE="true"
135+
- SPLIT="2/4"
136+
- python: 3.6
137+
dist: xenial
138+
sudo: true
139+
env:
140+
- TEST_SYMPY="true"
141+
- TEST_COVERAGE="true"
142+
- SPLIT="3/4"
143+
- python: 3.6
144+
dist: xenial
145+
sudo: true
146+
env:
147+
- TEST_SYMPY="true"
148+
- TEST_COVERAGE="true"
149+
- SPLIT="4/4"
93150

94151
# Everything here and below is in the allow_failures. The need to be
95152
# duplicated here and in that section below.
@@ -106,29 +163,7 @@ matrix:
106163
- python: "pypy"
107164
env:
108165
- TEST_SYMPY="true"
109-
- SPLIT="1/4"
110-
- FASTCACHE="false"
111-
addons:
112-
apt:
113-
sources:
114-
- pypy
115-
packages:
116-
- pypy
117-
- python: "pypy"
118-
env:
119-
- TEST_SYMPY="true"
120-
- SPLIT="2/4"
121-
- FASTCACHE="false"
122-
addons:
123-
apt:
124-
sources:
125-
- pypy
126-
packages:
127-
- pypy
128-
- python: "pypy"
129-
env:
130-
- TEST_SYMPY="true"
131-
- SPLIT="3/4"
166+
- SPLIT="1/2"
132167
- FASTCACHE="false"
133168
addons:
134169
apt:
@@ -139,7 +174,7 @@ matrix:
139174
- python: "pypy"
140175
env:
141176
- TEST_SYMPY="true"
142-
- SPLIT="4/4"
177+
- SPLIT="2/2"
143178
- FASTCACHE="false"
144179
addons:
145180
apt:
@@ -148,6 +183,8 @@ matrix:
148183
packages:
149184
- pypy
150185

186+
fast_finish: true
187+
151188
allow_failures:
152189
# PyPy randomly fails because of some PyPy bugs (Fatal RPython error: AssertionError)
153190
- python: "pypy"
@@ -163,18 +200,7 @@ matrix:
163200
- python: "pypy"
164201
env:
165202
- TEST_SYMPY="true"
166-
- SPLIT="1/4"
167-
- FASTCACHE="false"
168-
addons:
169-
apt:
170-
sources:
171-
- pypy
172-
packages:
173-
- pypy
174-
- python: "pypy"
175-
env:
176-
- TEST_SYMPY="true"
177-
- SPLIT="2/4"
203+
- SPLIT="1/2"
178204
- FASTCACHE="false"
179205
addons:
180206
apt:
@@ -185,18 +211,7 @@ matrix:
185211
- python: "pypy"
186212
env:
187213
- TEST_SYMPY="true"
188-
- SPLIT="3/4"
189-
- FASTCACHE="false"
190-
addons:
191-
apt:
192-
sources:
193-
- pypy
194-
packages:
195-
- pypy
196-
- python: "pypy"
197-
env:
198-
- TEST_SYMPY="true"
199-
- SPLIT="4/4"
214+
- SPLIT="2/2"
200215
- FASTCACHE="false"
201216
addons:
202217
apt:
@@ -211,6 +226,10 @@ before_install:
211226
- if [[ "${FASTCACHE}" != "false" ]]; then
212227
pip install fastcache;
213228
fi
229+
- if [[ "${TEST_COVERAGE}" == "true" ]]; then
230+
pip install coverage;
231+
coverage debug sys;
232+
fi
214233
- |
215234
if [[ -n "${TEST_OPT_DEPENDENCY}" ]]; then
216235
# We do this conditionally because it saves us some downloading if the
@@ -229,7 +248,7 @@ before_install:
229248
conda config --prepend channels conda-forge --prepend channels symengine/label/dev;
230249
231250
conda info -a;
232-
conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION ${TEST_OPT_DEPENDENCY};
251+
conda create -q -n test-environment ${TEST_OPT_DEPENDENCY};
233252
source activate test-environment;
234253
export CPATH=$CONDA_PREFIX/include;
235254
export LIBRARY_PATH=$CONDA_PREFIX/lib;
@@ -238,7 +257,7 @@ before_install:
238257
conda clean --all;
239258
if [[ "$TEST_SAGE" == "true" ]]; then
240259
# Use a separate environment because sage downgrades matplotlib
241-
conda create -n sage sagelib mpmath "ipython>=5.5.0,<6";
260+
conda create -c conda-forge/label/cf201901 -n sage sagelib mpmath "ipython>=5.5.0,<6";
242261
conda clean --all;
243262
fi
244263
if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
@@ -272,7 +291,7 @@ install:
272291
~/.venv-no-setuptools/bin/pip uninstall -y setuptools;
273292
~/.venv-no-setuptools/bin/python -We:invalid setup.py -q install;
274293
fi
275-
python -We:invalid -m compileall -f sympy/;
294+
python -We:invalid -m compileall -f -q sympy/;
276295
python -We:invalid setup.py -q install;
277296
pip list --format=columns;
278297
@@ -283,5 +302,8 @@ script:
283302
- if [[ "${TEST_SPHINX}" == "true" ]]; then
284303
doctr deploy dev --deploy-repo sympy/sympy_doc --command './generate_indexes.py';
285304
fi
305+
- if [[ "${TEST_COVERAGE}" == "true" ]]; then
306+
bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports";
307+
fi
286308
notifications:
287309
email: false

‎AUTHORS

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ those who explicitly didn't want to be mentioned. People with a * next
44
to their names are not found in the metadata of the git history. This
55
file is generated automatically by running `./bin/authors_update.py`.
66

7-
There are a total of 751 authors.
7+
There are a total of 812 authors.
88

99
Ondřej Čertík <ondrej@certik.cz>
1010
Fabian Pedregosa <fabian@fseoane.net>
@@ -757,3 +757,64 @@ Ayushman Koul <ayushmankoul4570@gmail.com>
757757
Robert Dougherty-Bliss <robert.w.bliss@gmail.com>
758758
Andrey Grozin <A.G.Grozin@inp.nsk.su>
759759
Bavish Kulur <bavishkulur@gmail.com>
760+
Arun Singh <arunsin997@gmail.com>
761+
sirnicolaf <43586954+sirnicolaf@users.noreply.github.com>
762+
Zachariah Etienne <zachetie@gmail.com>
763+
Prayush Dawda <35144226+iamprayush@users.noreply.github.com>
764+
2torus <boris.ettinger@gmail.com>
765+
Faisal Riyaz <faisalriyaz011@gmail.com>
766+
Martin Roelfs <u0114255@kuleuven.be>
767+
SirJohnFranklin <sirjfu@googlemail.com>
768+
Anthony Sottile <asottile@umich.edu>
769+
ViacheslavP <public.viacheslav@gmail.com>
770+
Safiya03 <safiyanesar@gmail.com>
771+
Alexander Dunlap <alexander.dunlap@gmail.com>
772+
Rohit Sharma <31184621+rohitx007@users.noreply.github.com>
773+
Jonathan Warner <warnerjon12@gmail.com>
774+
Mohitbalwani26 <44258119+Mohitbalwani26@users.noreply.github.com>
775+
Marduk Bolaños <mardukbp@mac.com>
776+
amsuhane <ayushsuhane99@iitkgp.ac.in>
777+
Matthias Geier <Matthias.Geier@gmail.com>
778+
klaasvanaarsen <44929042+klaasvanaarsen@users.noreply.github.com>
779+
Shubham Kumar Jha <skjha832@gmail.com>
780+
rationa-kunal <kunalgk1999@gmail.com>
781+
Animesh Sinha <animeshsinha1309@gmail.com>
782+
Gaurang Tandon <1gaurangtandon@gmail.com>
783+
Matthew Craven <clyring@users.noreply.github.com>
784+
Daniel Ingram <ingramds@appstate.edu>
785+
Jogi Miglani <jmig5776@gmail.com>
786+
Takumasa Nakamura <n.takumasa@gmail.com>
787+
Ritu Raj Singh <RituRajSingh878@gmail.com>
788+
Rajiv Ranjan Singh <42106787+iamrajiv@users.noreply.github.com>
789+
Vera Lozhkina <veralozhkina@gmail.com>
790+
adhoc-king <46354827+adhoc-king@users.noreply.github.com>
791+
Mikel Rouco <mikel.mrm@gmail.com>
792+
Oscar Gustafsson <oscar.gustafsson@gmail.com>
793+
damianos <damianos@semmle.com>
794+
Supreet Agrawal <supreet11agrawal@gmail.com>
795+
shiksha11 <shiksharawat01@gmail.com>
796+
Martin Ueding <dev@martin-ueding.de>
797+
sharma-kunal <kunalsharma6914@gmail.com>
798+
Divyanshu Thakur <divyanshu@iiitmanipur.ac.in>
799+
Susumu Ishizuka <susumu.ishizuka@kii.com>
800+
Samnan Rahee <namanush.rsr.16@gmail.com>
801+
Fredrik Andersson <fredrik.andersson@fcc.chalmers.se>
802+
Bhavya Srivastava <bhavya17037@iiitd.ac.in>
803+
Alpesh Jamgade <alpeshjamgade21@gmail.com>
804+
Shubham Abhang <shubhamabhang77@gmail.com>
805+
Vishesh Mangla <manglavishesh64@gmail.com>
806+
Nicko van Someren <nicko@nicko.org>
807+
dandiez <47832466+dandiez@users.noreply.github.com>
808+
Frédéric Chapoton <fchapoton2@gmail.com>
809+
jhanwar <f2015463@pilani.bits-pilani.ac.in>
810+
Noumbissi valere Gille Geovan <noumbissivalere@gmail.com>
811+
alejandrogroso@hotmail.com <Salmista-94>
812+
Shivani Kohli <shivanikohli.09@gmail.com>
813+
Parker Berry <parker.berry@marquette.edu>
814+
Pragyan Mehrotra <pragyan18168@iiitd.ac.in>
815+
Nabanita Dash <31562743+Naba7@users.noreply.github.com>
816+
Gaetano Guerriero <x.guerriero@tin.it>
817+
etkewa@gmail.com <qsRf9sGKy9rV>
818+
Ankit Pandey <pandeyan@grinnell.edu>
819+
Ritesh Kumar <ritesh99rakesh@gmail.com>
820+
kkkkx <709563092@qq.com>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy