diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index a3f06736b8..da3bf667ac 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -15,6 +15,7 @@ jobs: build-linux: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: include: - os: buster diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e3840f802e..0cd21424ac 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -41,7 +41,7 @@ jobs: brew install python@3.13 re2c coreutils libiconv googletest shivammathur/php/php@7.4 brew link --overwrite --force shivammathur/php/php@7.4 brew link --overwrite --force python@3.13 - /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: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index cb05278a43..0c0776dd77 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -15,6 +15,7 @@ jobs: build-linux: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: include: - os: focal diff --git a/docs/kphp-internals/developing-and-extending-kphp/compiling-kphp-from-sources.md b/docs/kphp-internals/developing-and-extending-kphp/compiling-kphp-from-sources.md index 7820455862..1fd927b57a 100644 --- a/docs/kphp-internals/developing-and-extending-kphp/compiling-kphp-from-sources.md +++ b/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 diff --git a/tests/python/requirements.txt b/tests/python/requirements.txt index 78fcf4b961..c9b35840c8 100644 --- a/tests/python/requirements.txt +++ b/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 diff --git a/third-party/re2-cmake/patches/kphp-remove-six-package.patch.template b/third-party/re2-cmake/patches/kphp-remove-six-package.patch.template new file mode 100644 index 0000000000..4a99cdb12f --- /dev/null +++ b/third-party/re2-cmake/patches/kphp-remove-six-package.patch.template @@ -0,0 +1,26 @@ +Should use Python's native function instead of the six package for unicode.py + +--- +diff --git a/re2/unicode.py b/re2/unicode.py +index e0f33ef..651b7cc 100644 +--- a/re2/unicode.py ++++ b/re2/unicode.py +@@ -10,7 +10,6 @@ + + import os + import re +-from six.moves import urllib + + # Directory or URL where Unicode tables reside. + _UNICODE_DIR = "${UNICODE_AUTO_RAW_DATA_DIR}" +@@ -152,10 +151,7 @@ + raise InputError("invalid number of fields %d" % (nfields,)) + + if type(filename) == str: +- if filename.startswith("https://"): +- fil = urllib.request.urlopen(filename) +- else: +- fil = open(filename, "rb") ++ fil = open(filename, "rb") + else: + fil = filename diff --git a/third-party/re2-cmake/patches/series b/third-party/re2-cmake/patches/series index 5559b33018..5657a861ba 100644 --- a/third-party/re2-cmake/patches/series +++ b/third-party/re2-cmake/patches/series @@ -1 +1,2 @@ kphp-unicode-data.patch +kphp-remove-six-package.patch diff --git a/third-party/re2-cmake/re2.cmake b/third-party/re2-cmake/re2.cmake index 446c77fe25..b5eb3ffdc7 100644 --- a/third-party/re2-cmake/re2.cmake +++ b/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)