Skip to content

Commit 0e69459

Browse files
oscargusoscargus
committed
Fixed merge conflicts
2 parents 4e6040d + 088ba68 commit 0e69459

File tree

367 files changed

+10802
-4398
lines changed

Some content is hidden

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

367 files changed

+10802
-4398
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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,9 @@ 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,3 +406,10 @@ amsuhane <ayushsuhane99@iitkgp.ac.in> amsuhane <“ayushsuhane99@iitkgp.ac.in”
403406
Ritu Raj Singh <RituRajSingh878@gmail.com> Ritu Raj Singh <37741324+RituRajSingh878@users.noreply.github.com>
404407
Ritu Raj Singh <RituRajSingh878@gmail.com> RituRajSingh878 <RituRajSingh878@gmail.com>
405408
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: 62 additions & 77 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,37 +17,35 @@ python:
1517
- 2.7
1618
- 3.4
1719
- 3.5
18-
- 3.6
1920

2021
matrix:
2122
include:
22-
- python: 3.7
23-
dist: xenial
24-
sudo: true
25-
env:
26-
- TEST_DOCTESTS="true" FASTCACHE="false" TEST_SETUP="true"
27-
- python: 3.7
23+
- stage: quality
24+
python: 3.7
2825
dist: xenial
2926
sudo: true
27+
script: bin/test quality
3028
env:
31-
- SPLIT="1/4" TEST_SYMPY="true"
32-
- python: 3.7
29+
30+
- stage: baseline
31+
python: 3.7
3332
dist: xenial
3433
sudo: true
3534
env:
36-
- SPLIT="2/4" TEST_SYMPY="true"
35+
- TEST_DOCTESTS="true" FASTCACHE="false" TEST_SETUP="true"
3736
- python: 3.7
3837
dist: xenial
3938
sudo: true
4039
env:
41-
- SPLIT="3/4" TEST_SYMPY="true"
40+
- SPLIT="1/2" TEST_SYMPY="true"
4241
- python: 3.7
4342
dist: xenial
4443
sudo: true
4544
env:
46-
- SPLIT="4/4" TEST_SYMPY="true"
45+
- SPLIT="2/2" TEST_SYMPY="true"
4746

48-
- python: 2.7
47+
- stage: test
48+
python: 2.7
4949
env:
5050
- TEST_ASCII="true"
5151
# space separated list of optional dependencies(conda packages) to install and test
@@ -100,96 +100,70 @@ matrix:
100100
- python: 2.7
101101
env:
102102
- TEST_SLOW="true"
103-
- SPLIT="1/3"
104-
- python: 2.7
105-
env:
106-
- TEST_SLOW="true"
107-
- SPLIT="2/3"
103+
- SPLIT="1/2"
108104
- python: 2.7
109105
env:
110106
- TEST_SLOW="true"
111-
- SPLIT="3/3"
107+
- SPLIT="2/2"
112108
- python: 3.7
113109
dist: xenial
114110
sudo: true
115111
env:
116112
- TEST_SLOW="true"
117-
- SPLIT="1/3"
113+
- SPLIT="1/2"
118114
- python: 3.7
119115
dist: xenial
120116
sudo: true
121117
env:
122118
- TEST_SLOW="true"
123-
- SPLIT="2/3"
124-
- python: 3.7
119+
- SPLIT="2/2"
120+
121+
# Code coverage tests
122+
- python: 3.6
125123
dist: xenial
126124
sudo: true
127-
env:
128-
- TEST_SLOW="true"
129-
- SPLIT="3/3"
130-
131-
# Everything here and below is in the allow_failures. The need to be
132-
# duplicated here and in that section below.
133-
- python: "pypy"
134-
env:
135-
- TEST_DOCTESTS="true"
136-
- FASTCACHE="false"
137-
addons:
138-
apt:
139-
sources:
140-
- pypy
141-
packages:
142-
- pypy
143-
- python: "pypy"
144125
env:
145126
- TEST_SYMPY="true"
127+
- TEST_COVERAGE="true"
146128
- SPLIT="1/4"
147-
- FASTCACHE="false"
148-
addons:
149-
apt:
150-
sources:
151-
- pypy
152-
packages:
153-
- pypy
154-
- python: "pypy"
129+
- python: 3.6
130+
dist: xenial
131+
sudo: true
155132
env:
156133
- TEST_SYMPY="true"
134+
- TEST_COVERAGE="true"
157135
- SPLIT="2/4"
158-
- FASTCACHE="false"
159-
addons:
160-
apt:
161-
sources:
162-
- pypy
163-
packages:
164-
- pypy
165-
- python: "pypy"
136+
- python: 3.6
137+
dist: xenial
138+
sudo: true
166139
env:
167140
- TEST_SYMPY="true"
141+
- TEST_COVERAGE="true"
168142
- SPLIT="3/4"
169-
- FASTCACHE="false"
170-
addons:
171-
apt:
172-
sources:
173-
- pypy
174-
packages:
175-
- pypy
176-
- python: "pypy"
143+
- python: 3.6
144+
dist: xenial
145+
sudo: true
177146
env:
178147
- TEST_SYMPY="true"
148+
- TEST_COVERAGE="true"
179149
- SPLIT="4/4"
150+
151+
# Everything here and below is in the allow_failures. The need to be
152+
# duplicated here and in that section below.
153+
- python: "pypy"
154+
env:
155+
- TEST_DOCTESTS="true"
180156
- FASTCACHE="false"
181157
addons:
182158
apt:
183159
sources:
184160
- pypy
185161
packages:
186162
- pypy
187-
188-
allow_failures:
189-
# PyPy randomly fails because of some PyPy bugs (Fatal RPython error: AssertionError)
190163
- python: "pypy"
191164
env:
192-
- TEST_DOCTESTS="true"
165+
- TEST_SYMPY="true"
166+
- SPLIT="1/2"
193167
- FASTCACHE="false"
194168
addons:
195169
apt:
@@ -200,18 +174,22 @@ matrix:
200174
- python: "pypy"
201175
env:
202176
- TEST_SYMPY="true"
203-
- SPLIT="1/4"
177+
- SPLIT="2/2"
204178
- FASTCACHE="false"
205179
addons:
206180
apt:
207181
sources:
208182
- pypy
209183
packages:
210184
- pypy
185+
186+
fast_finish: true
187+
188+
allow_failures:
189+
# PyPy randomly fails because of some PyPy bugs (Fatal RPython error: AssertionError)
211190
- python: "pypy"
212191
env:
213-
- TEST_SYMPY="true"
214-
- SPLIT="2/4"
192+
- TEST_DOCTESTS="true"
215193
- FASTCACHE="false"
216194
addons:
217195
apt:
@@ -222,7 +200,7 @@ matrix:
222200
- python: "pypy"
223201
env:
224202
- TEST_SYMPY="true"
225-
- SPLIT="3/4"
203+
- SPLIT="1/2"
226204
- FASTCACHE="false"
227205
addons:
228206
apt:
@@ -233,7 +211,7 @@ matrix:
233211
- python: "pypy"
234212
env:
235213
- TEST_SYMPY="true"
236-
- SPLIT="4/4"
214+
- SPLIT="2/2"
237215
- FASTCACHE="false"
238216
addons:
239217
apt:
@@ -248,6 +226,10 @@ before_install:
248226
- if [[ "${FASTCACHE}" != "false" ]]; then
249227
pip install fastcache;
250228
fi
229+
- if [[ "${TEST_COVERAGE}" == "true" ]]; then
230+
pip install coverage;
231+
coverage debug sys;
232+
fi
251233
- |
252234
if [[ -n "${TEST_OPT_DEPENDENCY}" ]]; then
253235
# We do this conditionally because it saves us some downloading if the
@@ -309,7 +291,7 @@ install:
309291
~/.venv-no-setuptools/bin/pip uninstall -y setuptools;
310292
~/.venv-no-setuptools/bin/python -We:invalid setup.py -q install;
311293
fi
312-
python -We:invalid -m compileall -f sympy/;
294+
python -We:invalid -m compileall -f -q sympy/;
313295
python -We:invalid setup.py -q install;
314296
pip list --format=columns;
315297
@@ -320,5 +302,8 @@ script:
320302
- if [[ "${TEST_SPHINX}" == "true" ]]; then
321303
doctr deploy dev --deploy-repo sympy/sympy_doc --command './generate_indexes.py';
322304
fi
305+
- if [[ "${TEST_COVERAGE}" == "true" ]]; then
306+
bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports";
307+
fi
323308
notifications:
324309
email: false

‎AUTHORS

Lines changed: 31 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 782 authors.
7+
There are a total of 812 authors.
88

99
Ondřej Čertík <ondrej@certik.cz>
1010
Fabian Pedregosa <fabian@fseoane.net>
@@ -788,3 +788,33 @@ Ritu Raj Singh <RituRajSingh878@gmail.com>
788788
Rajiv Ranjan Singh <42106787+iamrajiv@users.noreply.github.com>
789789
Vera Lozhkina <veralozhkina@gmail.com>
790790
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>

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2006-2018 SymPy Development Team
1+
Copyright (c) 2006-2019 SymPy Development Team
22

33
All rights reserved.
44

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