From 55ccc5e723c8cb4966089b446e0bd3ee94eb946e Mon Sep 17 00:00:00 2001 From: Utkarsh Ayachit Date: Wed, 7 Oct 2020 08:03:53 -0400 Subject: [PATCH 1/3] python: update to 3.8.6 --- projects/apple-unix/python3.cmake | 18 +++++++++--------- projects/win32/python3.cmake | 10 +++++----- versions.cmake | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/projects/apple-unix/python3.cmake b/projects/apple-unix/python3.cmake index 04f9b05ba..b153a1df9 100644 --- a/projects/apple-unix/python3.cmake +++ b/projects/apple-unix/python3.cmake @@ -39,17 +39,17 @@ else () CACHE INTERNAL "") endif () -set(superbuild_python_version "3.7" +set(superbuild_python_version "3.8" CACHE INTERNAL "") superbuild_add_extra_cmake_args( - -DPython3_EXECUTABLE:FILEPATH=/bin/python${superbuild_python_version}m - -DPython3_INCLUDE_DIR:PATH=/include/python${superbuild_python_version}m - -DPython3_LIBRARY:FILEPATH=/lib/libpython${superbuild_python_version}m${CMAKE_SHARED_LIBRARY_SUFFIX} - -DPython3_LIBRARY_RELEASE:FILEPATH=/lib/libpython${superbuild_python_version}m${CMAKE_SHARED_LIBRARY_SUFFIX} + -DPython3_EXECUTABLE:FILEPATH=/bin/python${superbuild_python_version} + -DPython3_INCLUDE_DIR:PATH=/include/python${superbuild_python_version} + -DPython3_LIBRARY:FILEPATH=/lib/libpython${superbuild_python_version}${CMAKE_SHARED_LIBRARY_SUFFIX} + -DPython3_LIBRARY_RELEASE:FILEPATH=/lib/libpython${superbuild_python_version}${CMAKE_SHARED_LIBRARY_SUFFIX} - -DPYTHON_EXECUTABLE:FILEPATH=/bin/python${superbuild_python_version}m - -DPYTHON_INCLUDE_DIR:PATH=/include/python${superbuild_python_version}m - -DPYTHON_LIBRARY:FILEPATH=/lib/libpython${superbuild_python_version}m${CMAKE_SHARED_LIBRARY_SUFFIX} - -DPYTHON_LIBRARY_RELEASE:FILEPATH=/lib/libpython${superbuild_python_version}m${CMAKE_SHARED_LIBRARY_SUFFIX} + -DPYTHON_EXECUTABLE:FILEPATH=/bin/python${superbuild_python_version} + -DPYTHON_INCLUDE_DIR:PATH=/include/python${superbuild_python_version} + -DPYTHON_LIBRARY:FILEPATH=/lib/libpython${superbuild_python_version}${CMAKE_SHARED_LIBRARY_SUFFIX} + -DPYTHON_LIBRARY_RELEASE:FILEPATH=/lib/libpython${superbuild_python_version}${CMAKE_SHARED_LIBRARY_SUFFIX} ) diff --git a/projects/win32/python3.cmake b/projects/win32/python3.cmake index c9bd1c678..d7eaf264c 100644 --- a/projects/win32/python3.cmake +++ b/projects/win32/python3.cmake @@ -20,19 +20,19 @@ else () CACHE INTERNAL "") endif () -set(superbuild_python_version "3.7" +set(superbuild_python_version "3.8" CACHE INTERNAL "") superbuild_add_extra_cmake_args( -DPython3_EXECUTABLE:FILEPATH=/Python/python.exe -DPython3_INCLUDE_DIR:PATH=/Python/include/ - -DPython3_LIBRARY:FILEPATH=/Python/libs/python37.lib - -DPython3_LIBRARY_RELEASE:FILEPATH=/Python/libs/python37.lib + -DPython3_LIBRARY:FILEPATH=/Python/libs/python38.lib + -DPython3_LIBRARY_RELEASE:FILEPATH=/Python/libs/python38.lib -DPython3_FIND_REGISTRY:STRING=NEVER -DPYTHON_EXECUTABLE:FILEPATH=/Python/python.exe -DPYTHON_INCLUDE_DIR:PATH=/Python/include/ - -DPYTHON_LIBRARY:FILEPATH=/Python/libs/python37.lib - -DPYTHON_LIBRARY_RELEASE:FILEPATH=/Python/libs/python37.lib + -DPYTHON_LIBRARY:FILEPATH=/Python/libs/python38.lib + -DPYTHON_LIBRARY_RELEASE:FILEPATH=/Python/libs/python38.lib -DPYTHON_FIND_REGISTRY:STRING=NEVER ) diff --git a/versions.cmake b/versions.cmake index c6ed3800d..849f8b840 100644 --- a/versions.cmake +++ b/versions.cmake @@ -56,12 +56,12 @@ endif() if (WIN32) superbuild_set_revision(python3 - URL "https://www.paraview.org/files/dependencies/Python-3.7.4-win64-no-ssl.tar.xz" - URL_MD5 c73455c755f2c79031fc92036040a90b) + URL "https://www.paraview.org/files/dependencies/python-win64-3.8.6-no-ssl.tar.xz" + URL_MD5 8cece55f80ef13ae8e839595e1c090d2) else() superbuild_set_revision(python3 - URL "https://www.paraview.org/files/dependencies/Python-3.7.4.tar.xz" - URL_MD5 d33e4aae66097051c2eca45ee3604803) + URL "https://www.paraview.org/files/dependencies/Python-3.8.6.tar.xz" + URL_MD5 69e73c49eeb1a853cefd26d18c9d069d) endif() superbuild_set_revision(ftjam -- GitLab From f38c49883801b3a351d705b5338466efc538ef46 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 9 Oct 2020 13:02:14 -0400 Subject: [PATCH 2/3] pywin32: update for Python 3.8 --- versions.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.cmake b/versions.cmake index 849f8b840..b83f15520 100644 --- a/versions.cmake +++ b/versions.cmake @@ -152,8 +152,8 @@ if (WIN32 AND NOT superbuild_building_prebuilt_python AND NOT ENABLE_python3 AND endif () elseif (ENABLE_python3 OR python3_enabled) superbuild_set_revision(pywin32 - URL "https://www.paraview.org/files/dependencies/pywin32-224-amd64.tar.xz" - URL_MD5 1a79e2571d276eeb26f54d944daf39e4) + URL "https://www.paraview.org/files/dependencies/pywin32-228-cp38-cp38-win_amd64.tar.xz" + URL_MD5 46fc0684aa4818e622929fc031be77ba) else () superbuild_set_revision(pywin32 URL "https://www.paraview.org/files/dependencies/pywin32-220.zip" -- GitLab From 886eaf54de8d1ede6c677a3769faee65175d3db6 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 14 Oct 2020 16:55:08 -0400 Subject: [PATCH 3/3] pythonautobahn: add a patch for Python 3.8 --- .../patches/pythonautobahn-python3.8.patch | 32 +++++++++++++++++++ projects/pythonautobahn.cmake | 4 +++ 2 files changed, 36 insertions(+) create mode 100644 projects/patches/pythonautobahn-python3.8.patch diff --git a/projects/patches/pythonautobahn-python3.8.patch b/projects/patches/pythonautobahn-python3.8.patch new file mode 100644 index 000000000..cd181a960 --- /dev/null +++ b/projects/patches/pythonautobahn-python3.8.patch @@ -0,0 +1,32 @@ +From 897c349952ead7f69f6e720183a2b4c17987a64b Mon Sep 17 00:00:00 2001 +From: Omer Akram +Date: Fri, 18 Oct 2019 12:58:08 +0100 +Subject: [PATCH] Add py38 compatibility (#1259) + +* add python 3.8 compatibility + +* dont update examples for now + +* use perf_counter instead + +* minor change +--- + autobahn/util.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/autobahn/util.py b/autobahn/util.py +index 519b714a..c248459d 100644 +--- a/autobahn/util.py ++++ b/autobahn/util.py +@@ -463,7 +463,10 @@ def generate_serial_number(): + # first call to this function, as a floating point number, based on the + # Win32 function QueryPerformanceCounter(). The resolution is typically + # better than one microsecond +- _rtime = time.clock ++ if sys.version_info >= (3, 8): ++ _rtime = time.perf_counter ++ else: ++ _rtime = time.clock + _ = _rtime() # this starts wallclock + else: + # On Unix-like platforms, this used the first available from this list: diff --git a/projects/pythonautobahn.cmake b/projects/pythonautobahn.cmake index f89d55b6c..7da1a0fe8 100644 --- a/projects/pythonautobahn.cmake +++ b/projects/pythonautobahn.cmake @@ -1,3 +1,7 @@ superbuild_add_project_python(pythonautobahn PACKAGE autobahn DEPENDS pythonsetuptools pythonsix pythontwisted pythontxaio pythonzopeinterface) + +# https://github.com/crossbario/autobahn-python/commit/897c349952ead7f69f6e720183a2b4c17987a64b +superbuild_apply_patch(pythonautobahn python3.8 + "Support for Python 3.8") -- GitLab