Remove support for python 2 and 3.5

rikardn · isuruf · commit ac3aaa620e22 · 2021-03-13T19:43:07.000-06:00
diff --git a/benchmarks/expand1.py b/benchmarks/expand1.py
@@ -7,4 +7,4 @@
 t1 = clock()
 g = e.expand()
 t2 = clock()
-print "Total time:", t2-t1, "s"
+print("Total time:", t2-t1, "s")
diff --git a/benchmarks/expand1_sage.py b/benchmarks/expand1_sage.py
@@ -5,4 +5,4 @@
 t1 = clock()
 g = e.expand()
 t2 = clock()
-print "Total time:", t2-t1, "s"
+print("Total time:", t2-t1, "s")
diff --git a/benchmarks/expand2_sage.py b/benchmarks/expand2_sage.py
@@ -7,4 +7,4 @@
 t1 = clock()
 g = f.expand()
 t2 = clock()
-print "Total time:", t2-t1, "s"
+print("Total time:", t2-t1, "s")
diff --git a/benchmarks/expand2b_sympy.py b/benchmarks/expand2b_sympy.py
@@ -6,5 +6,5 @@
 f = e*(e+w)
 t2 = clock()
 #print f
-print "Total time:", t2-t1, "s"
-print "number of terms:", len(f)
+print("Total time:", t2-t1, "s")
+print("number of terms:", len(f))
diff --git a/benchmarks/expand3.py b/benchmarks/expand3.py
@@ -8,4 +8,4 @@
 t1 = clock()
 g = f.expand()
 t2 = clock()
-print "Total time:", t2-t1, "s"
+print("Total time:", t2-t1, "s")
diff --git a/benchmarks/expand4.py b/benchmarks/expand4.py
@@ -6,8 +6,7 @@
 e = 1
 for i in range(1, 351):
     e *= (i+x)**3
-#print e
 t1 = clock()
 f = e.expand()
 t2 = clock()
-print "Total time:", t2-t1, "s"
+print("Total time:", t2-t1, "s")
diff --git a/benchmarks/expand4_sage.py b/benchmarks/expand4_sage.py
@@ -10,4 +10,4 @@
 t1 = clock()
 f = e.expand()
 t2 = clock()
-print "Total time:", t2-t1, "s"
+print("Total time:", t2-t1, "s")
diff --git a/benchmarks/expand5.py b/benchmarks/expand5.py
@@ -9,4 +9,4 @@
 t1 = clock()
 g = f.expand()
 t2 = clock()
-print "Total time:", t2-t1, "s"
+print("Total time:", t2-t1, "s")
diff --git a/benchmarks/kane.py b/benchmarks/kane.py
@@ -4,29 +4,29 @@
 from symengine import var, sympify, function_symbol, Symbol
 import sympy
 s = open("expr.txt").read()
-print "Converting to SymPy..."
+printr("Converting to SymPy...")
 e = sympy.sympify(s)
-print "Converting to SymEngine..."
+print("Converting to SymEngine...")
 ce = sympify(e)
-print "    Done."
-print "SymPy subs:"
+print("    Done.")
+print("SymPy subs:")
 t1 = clock()
 f = e.subs(sympy.Function("q5")(sympy.Symbol("t")), sympy.Symbol("sq5"))
 t2 = clock()
-print "Total time:", t2-t1, "s"
-print "SymEngine subs:"
+print("Total time:", t2-t1, "s")
+print("SymEngine subs:")
 t1 = clock()
 cf = ce.subs(function_symbol("q5", Symbol("t")), Symbol("sq5"))
 t2 = clock()
-print "Total time:", t2-t1, "s"
+print("Total time:", t2-t1, "s")
 
 print "SymPy diff:"
 t1 = clock()
 g = f.diff(sympy.Symbol("sq5"))
 t2 = clock()
-print "Total time:", t2-t1, "s"
-print "SymEngine diff:"
+print("Total time:", t2-t1, "s")
+print("SymEngine diff:")
 t1 = clock()
 cg = cf.diff(Symbol("sq5"))
 t2 = clock()
-print "Total time:", t2-t1, "s"
+print("Total time:", t2-t1, "s")
diff --git a/benchmarks/kane_generate.py b/benchmarks/kane_generate.py
@@ -253,7 +253,7 @@ def test_bicycle():
     #import symengine
     #print "Converting to symengine..."
     #f = symengine.sympify(e)
-    print "Saving to expr.txt"
+    print("Saving to expr.txt")
     s = str(e)
     open("expr.txt", "w").write(s)
     return
diff --git a/benchmarks/legendre1.py b/benchmarks/legendre1.py
@@ -20,9 +20,9 @@ def legendre(n, x):
 
 var("x")
 for n in range(10):
-    print n, legendre(n, x)
+    print(n, legendre(n, x))
 
 t1 = clock()
 e = legendre(500, x)
 t2 = clock()
-print "Total time for legendre(500, x):", t2-t1, "s"
+print("Total time for legendre(500, x):", t2-t1, "s")
diff --git a/benchmarks/legendre1_sage.py b/benchmarks/legendre1_sage.py
@@ -1,7 +1,7 @@
-print "import..."
+print("import...")
 from timeit import default_timer as clock
 from sage.all import var, Integer
-print "    done."
+print("    done.")
 
 def fact(n):
     if n in [0, 1]:
@@ -20,9 +20,9 @@ def legendre(n, x):
 
 var("x")
 for n in range(10):
-    print n, legendre(n, x)
+    print(n, legendre(n, x))
 
 t1 = clock()
 e = legendre(500, x)
 t2 = clock()
-print "Total time for legendre(500, x):", t2-t1, "s"
+print("Total time for legendre(500, x):", t2-t1, "s")
diff --git a/cmake/get_suffix.py b/cmake/get_suffix.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 from distutils.sysconfig import get_config_var
 extsuffix = get_config_var('EXT_SUFFIX')
 if extsuffix is None:
diff --git a/setup.py b/setup.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 from os import getenv, path, makedirs
 import os
 import subprocess
@@ -8,8 +7,8 @@
 from distutils.command.build import build as _build
 
 # Make sure the system has the right Python version.
-if sys.version_info[:2] < (2, 7):
-    print("SymEngine requires Python 2.7 or newer. "
+if sys.version_info[:2] < (3, 6):
+    print("SymEngine requires Python 3.6 or newer. "
           "Python %d.%d detected" % sys.version_info[:2])
     sys.exit(-1)
 
@@ -139,8 +138,6 @@ def get_generator(self):
 
     def run(self):
         self.cmake_build()
-        # can't use super() here because
-        #  _build_ext is an old style class in 2.7
         _build_ext.run(self)
 
 
@@ -165,8 +162,6 @@ def finalize_options(self):
         cmake_opts.extend(self.define)
         cmake_build_type[0] = self.build_type
         cmake_opts.extend([('PYTHON_INSTALL_PATH', path.join(os.getcwd(), self.install_platlib))])
-        #cmake_opts.extend([('PYTHON_INSTALL_HEADER_PATH',
-        #                    path.join(os.getcwd(), self.install_headers))])
 
     def cmake_install(self):
         source_dir = path.dirname(path.realpath(__file__))
@@ -189,7 +184,6 @@ def cmake_install(self):
         compileall.compile_dir(path.join(self.install_platlib, "symengine"))
 
     def run(self):
-        # can't use super() here because _install is an old style class in 2.7
         _install.run(self)
         self.cmake_install()
 
@@ -228,7 +222,11 @@ def finalize_options(self):
       author_email="symengine@googlegroups.com",
       license="MIT",
       url="https://github.com/symengine/symengine.py",
+<<<<<<< HEAD
       python_requires='>=3.6.*,<4',
+=======
+      python_requires='!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,<4',
+>>>>>>> 916b786... Remove support for python 2 and 3.5
       zip_safe=False,
       cmdclass = cmdclass,
       classifiers=[
diff --git a/symengine/CMakeLists.txt b/symengine/CMakeLists.txt
@@ -2,6 +2,6 @@ add_subdirectory(lib)
 add_subdirectory(tests)
 
 set(PY_PATH ${PYTHON_INSTALL_PATH}/symengine)
-install(FILES __init__.py utilities.py compatibility.py sympy_compat.py functions.py printing.py
+install(FILES __init__.py utilities.py sympy_compat.py functions.py printing.py
     DESTINATION ${PY_PATH}
     )
diff --git a/symengine/compatibility.py b/symengine/compatibility.py
diff --git a/symengine/lib/symengine_wrapper.pxd b/symengine/lib/symengine_wrapper.pxd
diff --git a/symengine/lib/symengine_wrapper.pyx b/symengine/lib/symengine_wrapper.pyx
diff --git a/symengine/utilities.py b/symengine/utilities.py
