THRIFT-5537: Drop support for end-of-life python versions (including python 2)

.github/workflows/build.yml

@@ -547,6 +547,9 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v5
+
       - name: Python setup
         run: |
           python -m pip install --upgrade pip setuptools wheel flake8 "tornado>=6.3.0" "twisted>=24.3.0" "zope.interface>=6.1"
@@ -609,6 +612,9 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v5
+
       - name: Python setup
         run: |
           python -m pip install --upgrade pip setuptools wheel flake8 "tornado>=6.3.0" "twisted>=24.3.0" "zope.interface>=6.1"

.github/workflows/pypi.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.8"
+          python-version: "3.10"
 
       - name: Build
         run: |

.gitignore

@@ -57,6 +57,12 @@ project.lock.json
 .vscode
 .vs
 
+/.venv*
+/build-cmake/
+/lib/py/src/protocol/*.so
+# Generated from test/test_thrift_file/TestServer.thrift during make check
+/lib/py/test/TestServer/
+
 /aclocal/libtool.m4
 /aclocal/lt*.m4
 /autoscan.log

LANGUAGES.md

@@ -300,7 +300,7 @@ Thrift's core protocol is TBinary, supported by all languages except for JavaScr
 <td align=left><a href="https://github.com/apache/thrift/blob/master/lib/py/README.md">Python</a></td>
 <!-- Since -----------------><td>0.2.0</td>
 <!-- Build Systems ---------><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
-<!-- Language Levels -------><td>2.7.12, 3.5.2</td><td>2.7.15, 3.6.8</td>
+<!-- Language Levels -------><td>3.10</td><td>3.14</td>
 <!-- Field types -----------><td><img src="/doc/images/cred.png" alt=""/></td>
 <!-- Low-Level Transports --><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
 <!-- Transport Wrappers ----><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>

Makefile.am

@@ -78,14 +78,10 @@ empty :=
 space := $(empty) $(empty)
 comma := ,
 
-CROSS_LANGS = @MAYBE_CPP@ @MAYBE_C_GLIB@ @MAYBE_CL@ @MAYBE_D@ @MAYBE_JAVA@ @MAYBE_PYTHON@ @MAYBE_PY3@ @MAYBE_RUBY@ @MAYBE_PERL@ @MAYBE_PHP@ @MAYBE_GO@ @MAYBE_NODEJS@ @MAYBE_DART@ @MAYBE_ERLANG@ @MAYBE_LUA@ @MAYBE_RS@ @MAYBE_NETSTD@ @MAYBE_NODETS@ @MAYBE_KOTLIN@ @MAYBE_SWIFT@
+CROSS_LANGS = @MAYBE_CPP@ @MAYBE_C_GLIB@ @MAYBE_CL@ @MAYBE_D@ @MAYBE_JAVA@ @MAYBE_PYTHON@ @MAYBE_RUBY@ @MAYBE_PERL@ @MAYBE_PHP@ @MAYBE_GO@ @MAYBE_NODEJS@ @MAYBE_DART@ @MAYBE_ERLANG@ @MAYBE_LUA@ @MAYBE_RS@ @MAYBE_NETSTD@ @MAYBE_NODETS@ @MAYBE_KOTLIN@ @MAYBE_SWIFT@
 CROSS_LANGS_COMMA_SEPARATED = $(subst $(space),$(comma),$(CROSS_LANGS))
 
-if WITH_PY3
-CROSS_PY=$(PYTHON3)
-else
 CROSS_PY=$(PYTHON)
-endif
 
 if WITH_PYTHON
 crossfeature: precross

build/appveyor/MSVC-appveyor-full.bat

@@ -145,9 +145,7 @@ IF "%WITH_PYTHON%" == "ON" (
   "!PYTHON_ROOT!\python.exe" -m ensurepip --upgrade || EXIT /B
   "!PYTHON_ROOT!\python.exe" -m pip install --upgrade pip setuptools wheel || EXIT /B
   "!PYTHON_ROOT!\python.exe" -m pip ^
-      install backports.ssl_match_hostname ^
-              ipaddress ^
-              tornado>=6.3.0 ^
+      install tornado>=6.3.0 ^
               twisted>=24.3.0 ^
               zope.interface>=6.1 || EXIT /B
 )

build/cmake/DefineOptions.cmake

@@ -117,7 +117,7 @@ CMAKE_DEPENDENT_OPTION(BUILD_NODEJS "Build NodeJS library" ON
 
 # Python
 option(WITH_PYTHON "Build Python Thrift library" ON)
-find_package(Python3
+find_package(Python3 3.10
     COMPONENTS
         Interpreter # for Python executable
         Development # for Python.h

build/docker/README.md

@@ -172,31 +172,30 @@ Last updated: March 5, 2024
 
 ## Compiler/Language Versions per Dockerfile ##
 
-| Tool      | ubuntu-focal  | ubuntu-jammy  | ubuntu-noble  | Notes |
-| :-------- | :------------ | :------------ | :------------ | :---- |
-| as of     | Mar 06, 2018  | Jul 1, 2019   |               |       |
-| as3       | 4.6.0         | 4.6.0         |               |       |
-| C++ gcc   | 9.4.0         | 11.4.0        |               |       |
-| C++ clang | 13.0.0        | 13.0.0        |               |       |
-| c\_glib   | 3.2.12        | 3.2.12        |               |       |
-| cl (sbcl) |               | 1.5.3         |               |       |
-| d         | 2.087.0       | 2.087.0       |               |       |
-| dart      | 2.7.2-1       | 2.7.2-1       |               |       |
-| delphi    |               |               |               | Not in CI |
-| erlang    | OTP-25.3.2.9  | OTP-25.3.2.9  |               |       |
-| go        | 1.21.7        | 1.21.7        |               |       |
-| haxe      | 4.2.1         | 4.2.1         |               |       |
-| java      | 17            | 17            |               |       |
-| js        | Node.js 16.20.2, npm 8.19.4 | |               | Node.js 16.20.2, npm 8.19.4 |
-| lua       | 5.2.4         | 5.2.4         |               | Lua 5.3: see THRIFT-4386 |
-| netstd    | 9.0           | 9.0           | 9.0           |       |
-| nodejs    | 16.20.2       | 16.20.2       |               |       |
-| ocaml     | 4.08.1        | 4.13.1        |               |       |
-| perl      | 5.30.0        | 5.34.0        |               |       |
-| php       | 7.4.3         | 8.1.2         | 8.3           |       |
-| python2   | 2.7.18        |               |               |       |
-| python3   | 3.8.10        | 3.10.12       |               |       |
-| ruby      | 2.7.0p0       | 3.0.2p107     |               |       |
-| rust      | 1.83.0        | 1.83.0        |               |       |
-| smalltalk |               |               |               | Not in CI |
-| swift     | 5.7           | 5.7           | 6.1           |       |
+| Tool      | ubuntu-focal  | ubuntu-jammy  | ubuntu-noble  | Notes                                          |
+| :-------- | :------------ | :------------ | :------------ |:-----------------------------------------------|
+| as of     | Mar 06, 2018  | Jul 1, 2019   |               |                                                |
+| as3       | 4.6.0         | 4.6.0         |               |                                                |
+| C++ gcc   | 9.4.0         | 11.4.0        |               |                                                |
+| C++ clang | 13.0.0        | 13.0.0        |               |                                                |
+| c\_glib   | 3.2.12        | 3.2.12        |               |                                                |
+| cl (sbcl) |               | 1.5.3         |               |                                                |
+| d         | 2.087.0       | 2.087.0       |               |                                                |
+| dart      | 2.7.2-1       | 2.7.2-1       |               |                                                |
+| delphi    |               |               |               | Not in CI                                      |
+| erlang    | OTP-25.3.2.9  | OTP-25.3.2.9  |               |                                                |
+| go        | 1.21.7        | 1.21.7        |               |                                                |
+| haxe      | 4.2.1         | 4.2.1         |               |                                                |
+| java      | 17            | 17            |               |                                                |
+| js        | Node.js 16.20.2, npm 8.19.4 | |               | Node.js 16.20.2, npm 8.19.4                    |
+| lua       | 5.2.4         | 5.2.4         |               | Lua 5.3: see THRIFT-4386                       |
+| netstd    | 9.0           | 9.0           | 9.0           |                                                |
+| nodejs    | 16.20.2       | 16.20.2       |               |                                                |
+| ocaml     | 4.08.1        | 4.13.1        |               |                                                |
+| perl      | 5.30.0        | 5.34.0        |               |                                                |
+| php       | 7.4.3         | 8.1.2         | 8.3           |                                                |
+| python    | 3.10.14       | 3.10.12       | 3.12.3        | focal: built from source (ships with 3.8)      |
+| ruby      | 2.7.0p0       | 3.0.2p107     |               |                                                |
+| rust      | 1.83.0        | 1.83.0        |               |                                                |
+| smalltalk |               |               |               | Not in CI                                      |
+| swift     | 5.7           | 5.7           | 6.1           |                                                |

build/docker/ubuntu-focal/Dockerfile

@@ -254,16 +254,37 @@ RUN apt-get install -y --no-install-recommends \
       re2c \
       composer
 
+# Python 3.10 built from source (Focal ships with 3.8, but we require 3.10+)
+ENV PYTHON_VERSION=3.10.14
 RUN apt-get install -y --no-install-recommends \
-      `# Python3 dependencies` \
-      python3-all \
-      python3-all-dbg \
-      python3-all-dev \
-      python3-pip \
-      python3-setuptools \
-      python3-wheel
-
-RUN python3 -m pip install --no-cache-dir --upgrade "tornado>=6.3.0" "twisted>=24.3.0" "zope.interface>=6.1"
+      `# Python build dependencies` \
+      libbz2-dev \
+      libffi-dev \
+      libgdbm-dev \
+      liblzma-dev \
+      libncurses5-dev \
+      libreadline-dev \
+      libsqlite3-dev \
+      libssl-dev \
+      tk-dev \
+      uuid-dev \
+      xz-utils && \
+    cd /tmp && \
+    wget -q https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz && \
+    tar xzf Python-${PYTHON_VERSION}.tgz && \
+    cd Python-${PYTHON_VERSION} && \
+    ./configure --enable-optimizations --with-ensurepip=install && \
+    make -j$(nproc) && \
+    make altinstall && \
+    cd / && rm -rf /tmp/Python-${PYTHON_VERSION}* && \
+    update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.10 1 && \
+    python3.10 -m pip install --upgrade pip && \
+    pip3.10 install --no-cache-dir \
+      setuptools \
+      wheel \
+      tornado>=6.3.0 \
+      twisted>=24.3.0 \
+      zope.interface>=6.1
 
 RUN apt-get install -y --no-install-recommends \
       `# Ruby dependencies` \
@@ -281,7 +302,6 @@ USER root
 RUN apt-get install -yq \
       libedit-dev \
       libz3-dev \
-      libpython2-dev \
       libxml2-dev && \
       cd / && \
       wget --quiet https://download.swift.org/swift-5.7-release/ubuntu2004/swift-5.7-RELEASE/swift-5.7-RELEASE-ubuntu20.04.tar.gz && \

build/docker/ubuntu-jammy/Dockerfile

@@ -274,7 +274,6 @@ USER root
 RUN apt-get install -yq \
   libedit-dev \
   libz3-dev \
-  libpython2-dev \
   libxml2-dev && \
   cd / && \
   wget --quiet https://download.swift.org/swift-5.7-release/ubuntu2204/swift-5.7-RELEASE/swift-5.7-RELEASE-ubuntu22.04.tar.gz && \

build/docker/ubuntu-noble/Dockerfile

@@ -295,8 +295,8 @@ RUN apt-get install -y --no-install-recommends \
 RUN apt-get install -y --no-install-recommends \
   `# Static Code Analysis dependencies` \
   cppcheck \
-  sloccount 
-  
+  sloccount
+
 #RUN pip install flake8
 
 # NOTE: this does not reduce the image size but adds an additional layer.

compiler/cpp/CMakeLists.txt

@@ -108,7 +108,7 @@ THRIFT_ADD_COMPILER(netstd        "Enable compiler for .NET Standard" ON)
 THRIFT_ADD_COMPILER(ocaml         "Enable compiler for OCaml" ON)
 THRIFT_ADD_COMPILER(perl          "Enable compiler for Perl" ON)
 THRIFT_ADD_COMPILER(php           "Enable compiler for PHP" ON)
-THRIFT_ADD_COMPILER(py            "Enable compiler for Python 2.0" ON)
+THRIFT_ADD_COMPILER(py            "Enable compiler for Python" ON)
 THRIFT_ADD_COMPILER(rb            "Enable compiler for Ruby" ON)
 THRIFT_ADD_COMPILER(rs            "Enable compiler for Rust" ON)
 THRIFT_ADD_COMPILER(st            "Enable compiler for Smalltalk" ON)