Updated files to work with Python 3 #26296
Conversation
| @@ -61,7 +61,7 @@ line_pattern = re.compile( | |||
|
|
|||
| def _make_line_map(target_filename, stream=None): | |||
| """ | |||
| >>> from StringIO import StringIO | |||
| >>> from io import StringIO | |||
There was a problem hiding this comment.
This will not work in Python 2, I'm afraid.
You can see in https://github.com/apple/swift/pull/23038/files#diff-cca357e5f9d41d8ba84f741ccf60fe55R64 how I solved it.
| from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init | ||
| from SwiftFloatingPointTypes import getFtoIBounds | ||
| import SwiftIntTypes | ||
| import SwiftFloatingPointTypes |
There was a problem hiding this comment.
I didn’t need these changes back in January. Are you sure they are needed?
(The change with the // is needed, only the import ones werent't needed)
|
I'm not aware if there's been any more pushes towards Python 3 lately, but just to update the macOS concern above: macOS Catalina now seems to include So hopefully this will encourage us to support Python 3 in the near future (if not full-on transitioning away from Python 2). |
|
I added an additional commit to fix pulling sub-projects when using Python 3. Fedora is all-in on Python 3 now and adding it as a community build isn't possible, especially when I can't even download the source. :) |
|
Hi all, what's the status of this PR? @tachoknight do you plan to rebase it and push it through? Thank you! |
|
@hlopko Not sure what you mean; we're still waiting for someone from Apple to merge it. |
|
I interpreted (maybe incorrectly?) that 'Conflicting files' section in the CI status means the PR needs to be rebased? And by pushing-through I meant pinging Apple folks :) |
|
@tachoknight I do think this branch has grown out of date and cannot be merged as is. A merge or rebase from master might be in order. Another thing that might need to be considered in all of this PEP 394. Basically it says that runtime distributors are not required to provide I bring this up because some of the CMake steps that check for The PEP 394/CMake changes might be out of scope for this change. I just was interested in your thoughts since you've spent more time thinking about this than I have. |
|
@RLovelett I've been keeping my patches up-to-date for the Releases for Fedora, but yeah, I haven't tried to build master with them lately. In regards to your mention of |
# Conflicts: # stdlib/public/core/Mirrors.swift.gyb # utils/gyb_syntax_support/Node.py # utils/gyb_syntax_support/__init__.py
|
Unless anyone has any objections, I'm going to close this PR and replace it with two others; one that makes it possible to checkout master using Python 3 that also works with Python 2, and another that includes all the Python 3 adjustments. |
|
I've used the patches (with some modifications) to build 5.2 on Ubuntu 20.04. So first off I want to say thank you. I personally see no problem with that. Unfortunately I'm not a Python expert but is it possible that both sets of patches remain Python 2 backwards compatible? |
|
@RLovelett The checkout part is backwards compatible, and I will see about keeping the bulk of the other ones Python 2 compatible as well. |
|
Thank you for all the effort you've been putting into maintaining these patches. Also for the effort you put into making and getting the Swift package into the official Fedora repo list. That is no small feat. It never ceases to amuse me that while Ubuntu is the official supported distro it has no package and Fedora does. Again kudos. |
|
One last thing @tachoknight one of the things I had to do to get GYB working on Ubuntu 20.04 was patch CMake to use the FindPython module. You might not need that or maybe you have a better way to do it. I just thought I'd share it. diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca6c310aecd..f0e4e7b8553 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.3)
+cmake_minimum_required(VERSION 3.12.4)
# TODO: Fix RPATH usage to be CMP0068 compliant
# Disable Policy CMP0068 for CMake 3.9
@@ -881,7 +881,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
endif()
endif()
-find_package(PythonInterp REQUIRED)
+find_package(Python COMPONENTS Interpreter REQUIRED)
#
# Find optional dependencies.
diff --git a/cmake/modules/SwiftHandleGybSources.cmake b/cmake/modules/SwiftHandleGybSources.cmake
index f8dc984ea0c..37f2dec6039 100644
--- a/cmake/modules/SwiftHandleGybSources.cmake
+++ b/cmake/modules/SwiftHandleGybSources.cmake
@@ -1,7 +1,7 @@
include(SwiftAddCustomCommandTarget)
include(SwiftSetIfArchBitness)
-find_package(Python2 COMPONENTS Interpreter REQUIRED)
+find_package(Python COMPONENTS Interpreter REQUIRED)
# Create a target to process single gyb source with the 'gyb' tool.
#
@@ -60,7 +60,7 @@ function(handle_gyb_source_single dependency_out_var_name)
COMMAND
"${CMAKE_COMMAND}" -E make_directory "${dir}"
COMMAND
- "$<TARGET_FILE:Python2::Interpreter>" "${gyb_tool}" ${SWIFT_GYB_FLAGS} ${GYB_SINGLE_FLAGS} -o "${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_SOURCE}"
+ "$<TARGET_FILE:Python::Interpreter>" "${gyb_tool}" ${SWIFT_GYB_FLAGS} ${GYB_SINGLE_FLAGS} -o "${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_SOURCE}"
COMMAND
"${CMAKE_COMMAND}" -E copy_if_different "${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_OUTPUT}"
COMMAND |
|
Awesome, thanks @RLovelett! Also, the first, simpler PR is here. |
With Python 2 going out of support on January 1st, 2020, Python 3 will be the "standard" version going forward, and certain Linux distributions (e.g. Fedora) will use Python 3 as the default. These changes make Swift buildable using Python 3.
I understand that this pull request is probably too soon; I wanted to make the changes available for when it's decided to move forward with using Python 3 with Swift.