Skip to content

Commit 810ef47

Browse files
authored
Merge pull request symengine#452 from isuruf/bump
Require python>=3.8 and bump version to 0.11
2 parents 748c6ca + 946e661 commit 810ef47

File tree

5 files changed

+48
-38
lines changed

5 files changed

+48
-38
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
CC: gcc
3838

3939
- BUILD_TYPE: Release
40-
PYTHON_VERSION: '3.7'
40+
PYTHON_VERSION: '3.8'
4141
BUILD_SHARED_LIBS: yes
4242
OS: ubuntu-20.04
4343
CC: gcc
4444

4545
- BUILD_TYPE: Release
46-
PYTHON_VERSION: '3.7'
46+
PYTHON_VERSION: '3.8'
4747
WITH_MPFR: yes
4848
INTEGER_CLASS: gmpxx
4949
WITH_NUMPY: no
@@ -91,7 +91,7 @@ jobs:
9191
CC: clang
9292

9393
- BUILD_TYPE: Release
94-
PYTHON_VERSION: '3.7'
94+
PYTHON_VERSION: '3.8'
9595
WITH_NUMPY: yes
9696
OS: ubuntu-20.04
9797
CC: clang
@@ -108,7 +108,7 @@ jobs:
108108
EXTRA_APT_PACKAGES: 'llvm-14'
109109

110110
- BUILD_TYPE: Debug
111-
PYTHON_VERSION: '3.7'
111+
PYTHON_VERSION: '3.8'
112112
WITH_SCIPY: yes
113113
WITH_LLVM: 5.0
114114
OS: macos-latest
@@ -121,7 +121,7 @@ jobs:
121121
CC: clang
122122

123123
- BUILD_TYPE: Debug
124-
PYTHON_VERSION: '3.7'
124+
PYTHON_VERSION: '3.8'
125125
WITH_NUMPY: no
126126
OS: macos-latest
127127
CC: gcc
@@ -183,6 +183,7 @@ jobs:
183183
WITH_MPC: ${{ matrix.WITH_MPC }}
184184
MAKEFLAGS: ${{ matrix.MAKEFLAGS }}
185185
BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }}
186+
PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
186187

187188
- name: Deploy Documentation
188189
if: ${{ (github.ref == 'refs/heads/main' && github.repository == 'Symengine/symengine.py') || (github.ref == 'refs/heads/master' && github.repository == 'Symengine/symengine.py')}}

appveyor.yml

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
version: '{build}'
22

3-
# Uncomment this to enable the fast build environment if your account does not
4-
# support it automatically:
5-
#os: Visual Studio 2015 RC
3+
image: "Visual Studio 2019"
64

75
environment:
86
global:
@@ -16,27 +14,38 @@ environment:
1614
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
1715
WITH_MPFR: yes
1816
WITH_MPC: yes
19-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
2017
- BUILD_TYPE: "Release"
2118
COMPILER: MSVC15
2219
PLATFORM: "x64"
2320
PYTHON_VERSION: 38-x64
2421
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
25-
- BUILD_TYPE: "Debug"
26-
COMPILER: MinGW-w64
27-
PYTHON_VERSION: 37-x64
28-
WITH_NUMPY: no
2922
- BUILD_TYPE: "Release"
30-
COMPILER: MinGW-w64
31-
PYTHON_VERSION: 37-x64
32-
- BUILD_TYPE: "Debug"
33-
COMPILER: MinGW-w64
34-
PYTHON_VERSION: 37-x64
23+
COMPILER: MSVC15
24+
PLATFORM: "x64"
25+
PYTHON_VERSION: 39-x64
3526
WITH_SYMPY: no
27+
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
28+
- BUILD_TYPE: "Release"
29+
COMPILER: MSVC15
30+
PLATFORM: "x64"
31+
PYTHON_VERSION: 311-x64
32+
WITH_NUMPY: no
33+
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
34+
#- BUILD_TYPE: "Debug"
35+
# COMPILER: MinGW-w64
36+
# PYTHON_VERSION: 39-x64
37+
# WITH_NUMPY: no
38+
#- BUILD_TYPE: "Release"
39+
# COMPILER: MinGW-w64
40+
# PYTHON_VERSION: 39-x64
41+
#- BUILD_TYPE: "Debug"
42+
# COMPILER: MinGW-w64
43+
# PYTHON_VERSION: 39-x64
44+
# WITH_SYMPY: no
3645
- BUILD_TYPE: "Release"
3746
COMPILER: MSVC15
3847
PLATFORM: "Win32"
39-
PYTHON_VERSION: 37
48+
PYTHON_VERSION: 39
4049
CONDA_INSTALL_LOCN: C:\\Miniconda36
4150
WITH_MPFR: yes
4251
WITH_MPC: yes
@@ -45,7 +54,6 @@ environment:
4554
PLATFORM: "x64"
4655
PYTHON_VERSION: 310-x64
4756
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
48-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
4957
WITH_MPFR: yes
5058
WITH_MPC: yes
5159
WITH_LLVM: yes
@@ -65,7 +73,7 @@ install:
6573
- if [%COMPILER%]==[MSVC15] echo %PATH%
6674
- if [%COMPILER%]==[MSVC15] if [%WITH_MPFR%]==[yes] conda install --yes mpfr=3.1.5
6775
- if [%COMPILER%]==[MSVC15] if [%WITH_MPC%]==[yes] conda install --yes mpc=1.0.3
68-
- if [%COMPILER%]==[MSVC15] if [%WITH_LLVM%]==[yes] conda install --yes llvmdev=3.9
76+
- if [%COMPILER%]==[MSVC15] if [%WITH_LLVM%]==[yes] conda install --yes llvmdev=4.0
6977

7078
- if [%COMPILER%]==[MinGW] set "PATH=C:\MinGW\bin;%PATH%"
7179
- if [%COMPILER%]==[MinGW] mingw-get update
@@ -87,8 +95,7 @@ install:
8795

8896
- set "PATH=C:\Python%PYTHON_VERSION%;C:\Python%PYTHON_VERSION%\Scripts;%PATH%"
8997
- echo %PATH%
90-
- pip install nose pytest
91-
- pip install --install-option="--no-cython-compile" cython
98+
- pip install nose pytest cython
9299
- if NOT [%WITH_NUMPY%]==[no] pip install numpy
93100
- if NOT [%WITH_SYMPY%]==[no] pip install sympy
94101

@@ -103,15 +110,16 @@ install:
103110
- if [%COMPILER%]==[MinGW] set "CMAKE_GENERATOR=MinGW Makefiles"
104111
- if [%COMPILER%]==[MinGW-w64] set "CMAKE_GENERATOR=MinGW Makefiles"
105112

106-
- if [%COMPILER%]==[MSVC15] cmake -DCMAKE_PREFIX_PATH=%CONDA_PREFIX%\Library ..
107-
- if [%COMPILER%]==[MinGW] cmake -DCMAKE_PREFIX_PATH=C:\MinGW -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
108-
- if [%COMPILER%]==[MinGW-w64] cmake -DCMAKE_PREFIX_PATH=C:\mingw64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
113+
- if [%COMPILER%]==[MSVC15] set "CMAKE_ARGS=-DCMAKE_PREFIX_PATH=%CONDA_PREFIX%\\Library"
114+
- if [%COMPILER%]==[MinGW] set "CMAKE_ARGS=-DCMAKE_PREFIX_PATH=C:\MinGW -DCMAKE_BUILD_TYPE=%BUILD_TYPE%"
115+
- if [%COMPILER%]==[MinGW-w64] set "CMAKE_ARGS=-DCMAKE_PREFIX_PATH=C:\mingw64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE%"
109116

110-
- if [%WITH_MPFR%]==[yes] cmake -DWITH_MPFR=yes ..
111-
- if [%WITH_MPC%]==[yes] cmake -DWITH_MPC=yes ..
112-
- if [%WITH_LLVM%]==[yes] cmake -DWITH_LLVM=yes -DMSVC_USE_MT=no ..
117+
- if [%WITH_MPFR%]==[yes] set "CMAKE_ARGS=%CMAKE_ARGS% -DWITH_MPFR=yes"
118+
- if [%WITH_MPC%]==[yes] set "CMAKE_ARGS=%CMAKE_ARGS% -DWITH_MPC=yes"
119+
- if [%WITH_LLVM%]==[yes] set "CMAKE_ARGS=%CMAKE_ARGS% -DWITH_LLVM=yes -DMSVC_USE_MT=no"
113120

114-
- cmake -DBUILD_SHARED_LIBS=yes -DBUILD_TESTS=no -DBUILD_BENCHMARKS=no -DCMAKE_INSTALL_PREFIX=C:\symengine ..
121+
- echo "CMAKE_ARGS=%CMAKE_ARGS%"
122+
- cmake %CMAKE_ARGS% -DBUILD_SHARED_LIBS=yes -DBUILD_TESTS=no -DBUILD_BENCHMARKS=no -DCMAKE_INSTALL_PREFIX=C:\symengine ..
115123

116124
- cmake --build . --config %BUILD_TYPE% --target install
117125
- cd ../../

setup.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import platform
66

77
# Make sure the system has the right Python version.
8-
if sys.version_info[:2] < (3, 7):
9-
print("SymEngine requires Python 3.7 or newer. "
8+
if sys.version_info[:2] < (3, 8):
9+
print("SymEngine requires Python 3.8 or newer. "
1010
"Python %d.%d detected" % sys.version_info[:2])
1111
sys.exit(-1)
1212

@@ -222,15 +222,15 @@ def finalize_options(self):
222222
'''
223223

224224
setup(name="symengine",
225-
version="0.10.0",
225+
version="0.11.0",
226226
description="Python library providing wrappers to SymEngine",
227227
setup_requires=['cython>=0.29.24'],
228228
long_description=long_description,
229229
author="SymEngine development team",
230230
author_email="[email protected]",
231231
license="MIT",
232232
url="https://github.com/symengine/symengine.py",
233-
python_requires='>=3.7,<4',
233+
python_requires='>=3.8,<4',
234234
zip_safe=False,
235235
packages=['symengine', 'symengine.lib', 'symengine.tests'],
236236
cmdclass = cmdclass,
@@ -241,9 +241,10 @@ def finalize_options(self):
241241
'Topic :: Scientific/Engineering',
242242
'Topic :: Scientific/Engineering :: Mathematics',
243243
'Topic :: Scientific/Engineering :: Physics',
244-
'Programming Language :: Python :: 3.7',
245244
'Programming Language :: Python :: 3.8',
246245
'Programming Language :: Python :: 3.9',
247246
'Programming Language :: Python :: 3.10',
247+
'Programming Language :: Python :: 3.11',
248+
'Programming Language :: Python :: 3.12',
248249
]
249250
)

symengine/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import sys
33

4-
if sys.version_info >= (3, 8, 0) and sys.platform == 'win32' \
4+
if sys.platform == 'win32' \
55
and 'SYMENGINE_PY_ADD_PATH_TO_SEARCH_DIRS' in os.environ:
66
for directory in os.environ['PATH'].split(';'):
77
if os.path.isdir(directory):
@@ -63,7 +63,7 @@ def __getattr__(name):
6363
raise AttributeError(f"module 'symengine' has no attribute '{name}'")
6464

6565

66-
__version__ = "0.10.0"
66+
__version__ = "0.11.0"
6767

6868

6969
# To not expose internals

symengine_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.10.1
1+
v0.11.1

0 commit comments

Comments
 (0)