Merge pull request #452 from isuruf/bump

Require python>=3.8 and bump version to 0.11
symengine · Oct 31, 2023 · 810ef47 · 810ef47
2 parents 748c6ca + 946e661
commit 810ef47
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 38 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,13 +37,13 @@ jobs:
             CC: gcc
 
           - BUILD_TYPE: Release
-            PYTHON_VERSION: '3.7'
+            PYTHON_VERSION: '3.8'
             BUILD_SHARED_LIBS: yes
             OS: ubuntu-20.04
             CC: gcc
 
           - BUILD_TYPE: Release
-            PYTHON_VERSION: '3.7'
+            PYTHON_VERSION: '3.8'
             WITH_MPFR: yes
             INTEGER_CLASS: gmpxx
             WITH_NUMPY: no
@@ -91,7 +91,7 @@ jobs:
             CC: clang
 
           - BUILD_TYPE: Release
-            PYTHON_VERSION: '3.7'
+            PYTHON_VERSION: '3.8'
             WITH_NUMPY: yes
             OS: ubuntu-20.04
             CC: clang
@@ -108,7 +108,7 @@ jobs:
             EXTRA_APT_PACKAGES: 'llvm-14'
 
           - BUILD_TYPE: Debug
-            PYTHON_VERSION: '3.7'
+            PYTHON_VERSION: '3.8'
             WITH_SCIPY: yes
             WITH_LLVM: 5.0
             OS: macos-latest
@@ -121,7 +121,7 @@ jobs:
             CC: clang
 
           - BUILD_TYPE: Debug
-            PYTHON_VERSION: '3.7'
+            PYTHON_VERSION: '3.8'
             WITH_NUMPY: no
             OS: macos-latest
             CC: gcc
@@ -183,6 +183,7 @@ jobs:
         WITH_MPC: ${{ matrix.WITH_MPC }}
         MAKEFLAGS: ${{ matrix.MAKEFLAGS }}
         BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }}
+        PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
 
     - name: Deploy Documentation
       if: ${{ (github.ref == 'refs/heads/main' && github.repository == 'Symengine/symengine.py') || (github.ref == 'refs/heads/master' && github.repository == 'Symengine/symengine.py')}}

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,8 +1,6 @@
 version: '{build}'
 
-# Uncomment this to enable the fast build environment if your account does not
-# support it automatically:
-#os: Visual Studio 2015 RC
+image: "Visual Studio 2019"
 
 environment:
   global:
@@ -16,27 +14,38 @@ environment:
       CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
       WITH_MPFR: yes
       WITH_MPC: yes
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - BUILD_TYPE: "Release"
       COMPILER: MSVC15
       PLATFORM: "x64"
       PYTHON_VERSION: 38-x64
       CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
-    - BUILD_TYPE: "Debug"
-      COMPILER: MinGW-w64
-      PYTHON_VERSION: 37-x64
-      WITH_NUMPY: no
     - BUILD_TYPE: "Release"
-      COMPILER: MinGW-w64
-      PYTHON_VERSION: 37-x64
-    - BUILD_TYPE: "Debug"
-      COMPILER: MinGW-w64
-      PYTHON_VERSION: 37-x64
+      COMPILER: MSVC15
+      PLATFORM: "x64"
+      PYTHON_VERSION: 39-x64
       WITH_SYMPY: no
+      CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
+    - BUILD_TYPE: "Release"
+      COMPILER: MSVC15
+      PLATFORM: "x64"
+      PYTHON_VERSION: 311-x64
+      WITH_NUMPY: no
+      CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
+    #- BUILD_TYPE: "Debug"
+    #  COMPILER: MinGW-w64
+    #  PYTHON_VERSION: 39-x64
+    #  WITH_NUMPY: no
+    #- BUILD_TYPE: "Release"
+    #  COMPILER: MinGW-w64
+    #  PYTHON_VERSION: 39-x64
+    #- BUILD_TYPE: "Debug"
+    #  COMPILER: MinGW-w64
+    #  PYTHON_VERSION: 39-x64
+    #  WITH_SYMPY: no
     - BUILD_TYPE: "Release"
       COMPILER: MSVC15
       PLATFORM: "Win32"
-      PYTHON_VERSION: 37
+      PYTHON_VERSION: 39
       CONDA_INSTALL_LOCN: C:\\Miniconda36
       WITH_MPFR: yes
       WITH_MPC: yes
@@ -45,7 +54,6 @@ environment:
       PLATFORM: "x64"
       PYTHON_VERSION: 310-x64
       CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       WITH_MPFR: yes
       WITH_MPC: yes
       WITH_LLVM: yes
@@ -65,7 +73,7 @@ install:
 - if [%COMPILER%]==[MSVC15] echo %PATH%
 - if [%COMPILER%]==[MSVC15] if [%WITH_MPFR%]==[yes] conda install --yes mpfr=3.1.5
 - if [%COMPILER%]==[MSVC15] if [%WITH_MPC%]==[yes] conda install --yes mpc=1.0.3
-- if [%COMPILER%]==[MSVC15] if [%WITH_LLVM%]==[yes] conda install --yes llvmdev=3.9
+- if [%COMPILER%]==[MSVC15] if [%WITH_LLVM%]==[yes] conda install --yes llvmdev=4.0
 
 - if [%COMPILER%]==[MinGW] set "PATH=C:\MinGW\bin;%PATH%"
 - if [%COMPILER%]==[MinGW] mingw-get update
@@ -87,8 +95,7 @@ install:
 
 - set "PATH=C:\Python%PYTHON_VERSION%;C:\Python%PYTHON_VERSION%\Scripts;%PATH%"
 - echo %PATH%
-- pip install nose pytest
-- pip install --install-option="--no-cython-compile" cython
+- pip install nose pytest cython
 - if NOT [%WITH_NUMPY%]==[no] pip install numpy
 - if NOT [%WITH_SYMPY%]==[no] pip install sympy
 
@@ -103,15 +110,16 @@ install:
 - if [%COMPILER%]==[MinGW]  set "CMAKE_GENERATOR=MinGW Makefiles"
 - if [%COMPILER%]==[MinGW-w64] set "CMAKE_GENERATOR=MinGW Makefiles"
 
-- if [%COMPILER%]==[MSVC15] cmake -DCMAKE_PREFIX_PATH=%CONDA_PREFIX%\Library ..
-- if [%COMPILER%]==[MinGW] cmake -DCMAKE_PREFIX_PATH=C:\MinGW -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
-- if [%COMPILER%]==[MinGW-w64] cmake -DCMAKE_PREFIX_PATH=C:\mingw64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
+- if [%COMPILER%]==[MSVC15] set "CMAKE_ARGS=-DCMAKE_PREFIX_PATH=%CONDA_PREFIX%\\Library"
+- if [%COMPILER%]==[MinGW] set "CMAKE_ARGS=-DCMAKE_PREFIX_PATH=C:\MinGW -DCMAKE_BUILD_TYPE=%BUILD_TYPE%"
+- if [%COMPILER%]==[MinGW-w64] set "CMAKE_ARGS=-DCMAKE_PREFIX_PATH=C:\mingw64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE%"
 
-- if [%WITH_MPFR%]==[yes] cmake -DWITH_MPFR=yes ..
-- if [%WITH_MPC%]==[yes] cmake -DWITH_MPC=yes ..
-- if [%WITH_LLVM%]==[yes] cmake -DWITH_LLVM=yes -DMSVC_USE_MT=no ..
+- if [%WITH_MPFR%]==[yes] set "CMAKE_ARGS=%CMAKE_ARGS% -DWITH_MPFR=yes"
+- if [%WITH_MPC%]==[yes] set "CMAKE_ARGS=%CMAKE_ARGS% -DWITH_MPC=yes"
+- if [%WITH_LLVM%]==[yes] set "CMAKE_ARGS=%CMAKE_ARGS% -DWITH_LLVM=yes -DMSVC_USE_MT=no"
 
-- cmake -DBUILD_SHARED_LIBS=yes -DBUILD_TESTS=no -DBUILD_BENCHMARKS=no -DCMAKE_INSTALL_PREFIX=C:\symengine ..
+- echo "CMAKE_ARGS=%CMAKE_ARGS%"
+- cmake %CMAKE_ARGS% -DBUILD_SHARED_LIBS=yes -DBUILD_TESTS=no -DBUILD_BENCHMARKS=no -DCMAKE_INSTALL_PREFIX=C:\symengine ..
 
 - cmake --build . --config %BUILD_TYPE% --target install
 - cd ../../

diff --git a/setup.py b/setup.py
@@ -5,8 +5,8 @@
 import platform
 
 # Make sure the system has the right Python version.
-if sys.version_info[:2] < (3, 7):
-    print("SymEngine requires Python 3.7 or newer. "
+if sys.version_info[:2] < (3, 8):
+    print("SymEngine requires Python 3.8 or newer. "
           "Python %d.%d detected" % sys.version_info[:2])
     sys.exit(-1)
 
@@ -222,15 +222,15 @@ def finalize_options(self):
 '''
 
 setup(name="symengine",
-      version="0.10.0",
+      version="0.11.0",
       description="Python library providing wrappers to SymEngine",
       setup_requires=['cython>=0.29.24'],
       long_description=long_description,
       author="SymEngine development team",
       author_email="symengine@googlegroups.com",
       license="MIT",
       url="https://github.com/symengine/symengine.py",
-      python_requires='>=3.7,<4',
+      python_requires='>=3.8,<4',
       zip_safe=False,
       packages=['symengine', 'symengine.lib', 'symengine.tests'],
       cmdclass = cmdclass,
@@ -241,9 +241,10 @@ def finalize_options(self):
         'Topic :: Scientific/Engineering',
         'Topic :: Scientific/Engineering :: Mathematics',
         'Topic :: Scientific/Engineering :: Physics',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         ]
       )
diff --git a/symengine/__init__.py b/symengine/__init__.py
@@ -1,7 +1,7 @@
 import os
 import sys
 
-if sys.version_info >= (3, 8, 0) and sys.platform == 'win32' \
+if sys.platform == 'win32' \
        and 'SYMENGINE_PY_ADD_PATH_TO_SEARCH_DIRS' in os.environ:
     for directory in os.environ['PATH'].split(';'):
         if os.path.isdir(directory):
@@ -63,7 +63,7 @@ def __getattr__(name):
         raise AttributeError(f"module 'symengine' has no attribute '{name}'")
 
 
-__version__ = "0.10.0"
+__version__ = "0.11.0"
 
 
 # To not expose internals

diff --git a/symengine_version.txt b/symengine_version.txt
@@ -1 +1 @@
-v0.10.1
+v0.11.1