Skip to content

Commit cb409e1

Browse files
committed
Merge branch 'master' of github.com:symengine/symengine.py into GSam-master
2 parents 42cf370 + ec4127b commit cb409e1

File tree

5 files changed

+27
-37
lines changed

5 files changed

+27
-37
lines changed

.github/workflows/ci.yml

+20-30
Original file line numberDiff line numberDiff line change
@@ -8,91 +8,81 @@ jobs:
88
fail-fast: false
99
matrix:
1010
include:
11-
- BUILD_TYPE: Debug
12-
WITH_BFD: yes
13-
PYTHON_VERSION: 3.6
14-
TEST_SYMPY: yes
15-
OS: ubuntu-16.04
16-
CC: gcc
17-
1811
- BUILD_TYPE: Debug
1912
WITH_BFD: yes
2013
PYTHON_VERSION: 3.9
2114
TEST_SYMPY: yes
22-
OS: ubuntu-16.04
15+
OS: ubuntu-20.04
2316
CC: gcc
2417

2518
- BUILD_TYPE: Release
2619
PYTHON_VERSION: 3.7
2720
BUILD_SHARED_LIBS: yes
28-
OS: ubuntu-16.04
21+
OS: ubuntu-20.04
2922
CC: gcc
3023

3124
- BUILD_TYPE: Release
3225
PYTHON_VERSION: 3.7
3326
WITH_MPFR: yes
3427
INTEGER_CLASS: gmpxx
3528
WITH_NUMPY: no
36-
OS: ubuntu-16.04
29+
OS: ubuntu-20.04
3730
CC: gcc
3831

3932
- BUILD_TYPE: Release
4033
PYTHON_VERSION: 3.8
4134
WITH_MPC: yes
42-
OS: ubuntu-16.04
35+
OS: ubuntu-20.04
4336
CC: gcc
4437

4538
- BUILD_TYPE: Release
4639
WITH_MPFR: yes
4740
PYTHON_VERSION: 3.8
48-
OS: ubuntu-16.04
41+
OS: ubuntu-20.04
4942
CC: gcc
5043

5144
- BUILD_TYPE: Release
5245
PYTHON_VERSION: 3.9
5346
WITH_MPC: yes
54-
OS: ubuntu-16.04
47+
OS: ubuntu-20.04
5548
CC: gcc
5649

5750
- BUILD_TYPE: Release
58-
PYTHON_VERSION: 3.6
51+
PYTHON_VERSION: 3.9
5952
WITH_MPC: yes
6053
INTEGER_CLASS: flint
6154
WITH_FLINT: yes
62-
OS: ubuntu-16.04
55+
OS: ubuntu-20.04
6356
CC: gcc
6457

6558
- BUILD_TYPE: Debug
66-
PYTHON_VERSION: 3.7
59+
PYTHON_VERSION: 3.9
6760
WITH_BFD: yes
6861
WITH_PIRANHA: yes
69-
OS: ubuntu-16.04
62+
OS: ubuntu-20.04
7063
CC: gcc
71-
EXTRA_APT_PACKAGES: "g++-4.8"
7264

7365
- BUILD_TYPE: Debug
7466
PYTHON_VERSION: 3.8
7567
WITH_BFD: yes
7668
BUILD_SHARED_LIBS: yes
77-
OS: ubuntu-16.04
69+
OS: ubuntu-20.04
7870
CC: clang
7971

8072
- BUILD_TYPE: Release
8173
PYTHON_VERSION: 3.7
8274
WITH_NUMPY: yes
83-
OS: ubuntu-16.04
75+
OS: ubuntu-20.04
8476
CC: clang
8577

8678
- BUILD_TYPE: Debug
87-
PYTHON_VERSION: 3.6
79+
PYTHON_VERSION: 3.8
8880
WITH_SYMPY: yes
89-
WITH_LLVM: 8.0
81+
WITH_LLVM: 13
9082
WITH_SCIPY: yes
91-
OS: ubuntu-16.04
92-
CC: gcc-4.8
93-
CXX: g++-4.8
94-
EXTRA_APT_REPOSITORY: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main'
95-
EXTRA_APT_PACKAGES: 'g++-4.8 libstdc++-4.8-dev binutils-dev llvm-8-dev'
83+
OS: ubuntu-20.04
84+
EXTRA_APT_REPOSITORY: 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main'
85+
EXTRA_APT_PACKAGES: 'llvm-13'
9686

9787
- BUILD_TYPE: Debug
9888
PYTHON_VERSION: 3.7
@@ -114,13 +104,13 @@ jobs:
114104
CC: gcc
115105

116106
- BUILD_TYPE: Release
117-
PYTHON_VERSION: 3.6
107+
PYTHON_VERSION: 3.8
118108
OS: macos-latest
119109
CC: gcc
120110

121111
- BUILD_TYPE: Release
122-
PYTHON_VERSION: 3.6
123-
OS: ubuntu-16.04
112+
PYTHON_VERSION: 3.8
113+
OS: ubuntu-20.04
124114
WITH_MPC: yes
125115
WITH_MPFR: yes
126116
WITH_FLINT: yes

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ optionally, you may choose to install an early [developer preview](https://githu
2525

2626
Install prerequisites.
2727

28-
CMake >= 2.8.7
29-
Python3 >= 3.6
30-
Cython >= 0.19.1
31-
SymEngine >= 0.4.0
28+
CMake >= 2.8.12
29+
Python3 >= 3.7
30+
Cython >= 0.29.24
31+
SymEngine >= 0.7.0
3232

3333
For SymEngine, only a specific commit/tag (see symengine_version.txt) is supported.
3434
Latest git master branch may not work as there may be breaking changes in SymEngine.

bin/install_travis.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# symengine's bin/install_travis.sh will install miniconda
44

5-
export conda_pkgs="python=${PYTHON_VERSION} pip cython pytest gmp mpfr"
5+
export conda_pkgs="python=${PYTHON_VERSION} pip 'cython>=0.29.24' pytest gmp mpfr"
66

77
if [[ "${WITH_NUMPY}" != "no" ]]; then
88
export conda_pkgs="${conda_pkgs} numpy";

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def finalize_options(self):
216216
setup(name="symengine",
217217
version="0.7.2",
218218
description="Python library providing wrappers to SymEngine",
219-
setup_requires=['cython>=0.19.1'],
219+
setup_requires=['cython>=0.29.24'],
220220
long_description=long_description,
221221
author="SymEngine development team",
222222
author_email="[email protected]",

symengine_version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bb386f47369500d76cda07e6e9f014bfe6339f64
1+
b104685091b4b84a26ac3ab75b8c51943390eb05

0 commit comments

Comments
 (0)