diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 1ebf585554..413ef5711d 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -96,7 +96,7 @@ jobs: id: python_tests continue-on-error: true run: docker exec kphp-build-container-${{matrix.os}} bash -c - "chown -R kitten /home && su kitten -c 'GITHUB_ACTIONS=1 KPHP_TESTS_POLYFILLS_REPO=${{env.kphp_polyfills_dir}} KPHP_CXX=${{matrix.compiler}} python3 -m pytest --tb=native -n$(nproc) ${{env.kphp_root_dir}}/tests/python/'" + "chown -R kitten /home && su kitten -c 'GITHUB_ACTIONS=1 KPHP_TESTS_POLYFILLS_REPO=${{env.kphp_polyfills_dir}} KPHP_CXX=${{matrix.compiler}} python3.7 -m pytest --tb=native -n$(nproc) ${{env.kphp_root_dir}}/tests/python/'" - name: Prepare python tests artifacts if: steps.python_tests.outcome == 'failure' diff --git a/.github/workflows/Dockerfile.focal b/.github/workflows/Dockerfile.focal index b0cef4b501..255e51a82d 100644 --- a/.github/workflows/Dockerfile.focal +++ b/.github/workflows/Dockerfile.focal @@ -3,9 +3,6 @@ ARG DEBIAN_FRONTEND=noninteractive COPY tests/python/requirements.txt /tmp/ -# python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \ -# python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \ - RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget pkg-config software-properties-common && \ wget -qO /etc/apt/trusted.gpg.d/vkpartner.asc https://artifactory-external.vkpartner.ru/artifactory/api/gpg/key/public && \ @@ -16,8 +13,8 @@ RUN apt-get update && \ apt-get update && \ apt-get install -y --no-install-recommends \ git cmake make clang g++ g++-10 gperf netcat \ - python3 python3-pip python3-dev libpython3-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \ - pip3 install -r /tmp/requirements.txt && \ + python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \ + python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \ apt-get install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \ libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \ postgresql postgresql-server-dev-all libnuma-dev composer unzip && \ diff --git a/.github/workflows/Dockerfile.jammy b/.github/workflows/Dockerfile.jammy index 55ca24d186..1dd63369c2 100644 --- a/.github/workflows/Dockerfile.jammy +++ b/.github/workflows/Dockerfile.jammy @@ -6,8 +6,6 @@ COPY tests/python/requirements.txt /tmp/ # package software-properties-common, repo ppa:ondrej/php are only required for installing # php 7.4 on ubuntu 22, where default php version is 8.1 -# python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \ -# python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \ RUN apt update && \ apt install -y --no-install-recommends apt-utils ca-certificates gnupg wget software-properties-common pkg-config && \ wget -qO /etc/apt/trusted.gpg.d/vkpartner.asc https://artifactory-external.vkpartner.ru/artifactory/api/gpg/key/public && \ @@ -17,8 +15,8 @@ RUN apt update && \ apt update && \ apt install -y --no-install-recommends \ git cmake make g++ lld gperf netcat \ - python3 python3-pip python3-dev libpython3-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \ - pip3 install -r /tmp/requirements.txt && \ + python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \ + python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \ apt install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \ libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libnuma-dev unzip \ libldap-dev libkrb5-dev postgresql postgresql-server-dev-all && \