Python support cleanup: remove support of 3.6 + add support of 3.10

Tulip-Dev · Jun 27, 2022 · e982124 · e982124
1 parent 8498642
commit e982124
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/bundlers/linux/tulip_python_wheels_manylinux_build.sh b/bundlers/linux/tulip_python_wheels_manylinux_build.sh
@@ -32,8 +32,8 @@ TULIP_PYTHON_TEST="from tulip import tlp; from platform import python_version; s
 for CPYBIN in /opt/python/cp*/bin
 do
   PYTHON_MAJOR_MINOR=$(${CPYBIN}/python -c "print(__import__('sys').version.split(' ')[0])" | cut -d'.' -f '1 2')
-  # Python 3.5 is no longer supported since October 2020
-  if [ "$PYTHON_MAJOR_MINOR" = "3.5" ]
+  # Python 3.5, 3.6 no longer supported and 3.11 not yet supported
+  if [[ "$PYTHON_MAJOR_MINOR" = "3.5" ]] && [[ "$PYTHON_MAJOR_MINOR" = "3.6" ]] && [[ "$PYTHON_MAJOR_MINOR" = "3.11" ]]
   then
      continue
   fi

diff --git a/cmake/TulipPython.cmake b/cmake/TulipPython.cmake
@@ -5,7 +5,7 @@ This should only be used when packaging Tulip for a Linux distribution or MSYS2.
 
 # After finding the Python interpreter, try to find if SIP and its dev tools are installed on the host system.
 # If not, compile the SIP version located in thirdparty.
-FIND_PACKAGE(PythonInterp 3.6 REQUIRED)
+FIND_PACKAGE(PythonInterp 3.7 REQUIRED)
 
 EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} --version OUTPUT_VARIABLE PYTHON_VERSION_RAW ERROR_VARIABLE PYTHON_VERSION_RAW)
 STRING(REPLACE "\n" "" PYTHON_VERSION_RAW "${PYTHON_VERSION_RAW}")

diff --git a/library/tulip-gui/src/PythonVersionChecker.cpp b/library/tulip-gui/src/PythonVersionChecker.cpp
@@ -30,7 +30,7 @@ using namespace tlp;
 using namespace std;
 
 // Current Python versions
-static const char *pythonVersion[] = {"3.9", "3.8", "3.7", "3.6", nullptr};
+static const char *pythonVersion[] = {"3.10", "3.9", "3.8", "3.7", nullptr};
 
 // Windows specific functions
 #ifdef WIN32

diff --git a/library/tulip-python/api/CMakeLists.txt b/library/tulip-python/api/CMakeLists.txt
@@ -1,5 +1,4 @@
 INSTALL(FILES
-        Python-3.6.api
         Python-3.7.api
         Python-3.8.api
         Python-3.9.api

diff --git a/library/tulip-python/bindings/tulip-core/packaging/setup.py.in b/library/tulip-python/bindings/tulip-core/packaging/setup.py.in
@@ -151,17 +151,18 @@ setup(
 
         'Operating System :: POSIX :: Linux',
         'Operating System :: MacOS :: MacOS X',
+        'Operating System :: Microsoft :: Windows :: Windows 11',
         'Operating System :: Microsoft :: Windows :: Windows 10',
         'Operating System :: Microsoft :: Windows :: Windows 8',
         'Operating System :: Microsoft :: Windows :: Windows 7',
 
         'Programming Language :: C++',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
     ],
 
     keywords='graph theory algorithms visualization',