removed use of six package for unicode.py

Author: Danil42Russia

.github/workflows/macos.yml

@@ -40,7 +40,7 @@ jobs:
           brew update
           brew install python@3.13 re2c coreutils libiconv googletest shivammathur/php/php@7.4
           brew link --overwrite --force shivammathur/php/php@7.4
-          /opt/homebrew/opt/python@3.13/libexec/bin/python -m pip install --upgrade pip --user --break-system-packages && /opt/homebrew/opt/python@3.13/libexec/bin/pip install --break-system-packages jsonschema six cmake==3.31.6
+          /opt/homebrew/opt/python@3.13/libexec/bin/python -m pip install --upgrade pip --user --break-system-packages && /opt/homebrew/opt/python@3.13/libexec/bin/pip install --break-system-packages jsonschema cmake==3.31.6
 
       - name: Run cmake
         run: cmake -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDOWNLOAD_MISSING_LIBRARIES=On -S $GITHUB_WORKSPACE -B ${{runner.workspace}}/build

docs/kphp-internals/developing-and-extending-kphp/compiling-kphp-from-sources.md

@@ -47,7 +47,7 @@ wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 Install packages
 ```bash
 apt-get update
-apt install git cmake-data=3.18* cmake=3.18* make patch re2c g++ gperf python3-minimal python3-jsonschema python3-six \
+apt install git cmake-data=3.18* cmake=3.18* make patch re2c g++ gperf python3-minimal python3-jsonschema \
             libfmt-dev libgtest-dev libgmock-dev \
             zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \
             libpq5=14.* postgresql-14 postgresql-server-dev-14 libpq-dev=14.* composer
@@ -71,7 +71,7 @@ Install packages
 ```bash
 apt-get update
 apt install git cmake make g++ gperf netcat patch re2c \
-            python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools python3-six \
+            python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools \
             libfmt-dev libgtest-dev libgmock-dev \
             zlib1g-dev php7.4-dev libldap-dev libkrb5-dev mysql-server libmysqlclient-dev \
             libpq5=14.* postgresql-14 postgresql-server-dev-14 libpq-dev=14.* composer
@@ -86,7 +86,7 @@ brew tap shivammathur/php
 brew update
 brew install python@3.13 re2c cmake coreutils libiconv googletest shivammathur/php/php@7.4
 brew link --overwrite shivammathur/php/php@7.4
-python3.13 -m pip install jsonschema six
+python3.13 -m pip install jsonschema
 
 # Build kphp
 git clone https://github.com/VKCOM/kphp.git && cd kphp

tests/python/requirements.txt

@@ -11,4 +11,3 @@ pytest-postgresql==4.1.1
 psycopg==3.1.9
 pytest-xdist==3.3.1
 zstandard==0.21.0
-six==1.17.0

third-party/re2-cmake/patches/kphp-remove-six-package.patch.template

@@ -0,0 +1,19 @@
+Should use Python's native function instead of the six package for unicode.py
+
+---
+ re2/unicode.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/re2/unicode.py b/re2/unicode.py
+index 727bea5f..e3293839 100644
+--- a/re2/unicode.py
++++ b/re2/unicode.py
+@@ -10,7 +10,7 @@
+ 
+ import os
+ import re
+-from six.moves import urllib
++import urllib.request
+ 
+ # Directory or URL where Unicode tables reside.
+ _UNICODE_DIR = "${UNICODE_AUTO_RAW_DATA_DIR}"

third-party/re2-cmake/patches/series

@@ -1 +1,2 @@
 kphp-unicode-data.patch
+kphp-remove-six-package.patch

third-party/re2-cmake/re2.cmake

@@ -1,4 +1,3 @@
-check_python_package(six)
 update_git_submodule(${THIRD_PARTY_DIR}/re2 "--recursive")
 get_submodule_version(${THIRD_PARTY_DIR}/re2 RE2_VERSION)
 get_submodule_remote_url(third-party/re2 RE2_SOURCE_URL)