Skip to content

Commit e5fcbc2

Browse files
committed
run python tests with python 3.7
1 parent 38b643f commit e5fcbc2

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

.github/workflows/Build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
id: python_tests
9797
continue-on-error: true
9898
run: docker exec kphp-build-container-${{matrix.os}} bash -c
99-
"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/'"
99+
"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/'"
100100

101101
- name: Prepare python tests artifacts
102102
if: steps.python_tests.outcome == 'failure'

.github/workflows/Dockerfile.focal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ ARG DEBIAN_FRONTEND=noninteractive
44
COPY tests/python/requirements.txt /tmp/
55

66
RUN apt-get update && \
7-
apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget pkg-config && \
7+
apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget pkg-config software-properties-common && \
88
wget -qO /etc/apt/trusted.gpg.d/vkpartner.asc https://artifactory-external.vkpartner.ru/artifactory/api/gpg/key/public && \
99
echo "deb https://artifactory-external.vkpartner.ru/artifactory/kphp focal main" >> /etc/apt/sources.list && \
1010
echo "deb http://apt.postgresql.org/pub/repos/apt focal-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
1111
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
12+
add-apt-repository ppa:deadsnakes/ppa && \
1213
apt-get update && \
1314
apt-get install -y --no-install-recommends \
1415
git cmake make clang g++ g++-10 gperf netcat \
15-
python3.7 python3-dev libpython3-dev python3-pip python3-setuptools mysql-server libmysqlclient-dev && \
16-
pip3 install -r /tmp/requirements.txt && \
16+
python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \
17+
python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \
1718
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 \
1819
libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \
1920
postgresql postgresql-server-dev-all libnuma-dev composer unzip && \

.github/workflows/Dockerfile.jammy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ RUN apt update && \
1515
apt update && \
1616
apt install -y --no-install-recommends \
1717
git cmake make g++ lld gperf netcat \
18-
python3.7 python3-dev libpython3-dev python3-pip python3-setuptools mysql-server libmysqlclient-dev && \
19-
pip3 install -r /tmp/requirements.txt && \
18+
python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \
19+
python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \
2020
apt install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \
2121
libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libnuma-dev unzip \
2222
libldap-dev libkrb5-dev postgresql postgresql-server-dev-all && \

tests/python/requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ wheel==0.37.0
22
jsonschema==4.17.3
33
portalocker==2.7.0
44
psutil==5.9.5
5-
urllib3==1.26.7
6-
requests-toolbelt==0.10.1
5+
requests==2.28.1
6+
urllib3==1.26.12
7+
requests-toolbelt==0.9.1
78
pytest==7.3.1
89
pytest-mysql==2.3.1
910
pytest-postgresql==4.1.1

0 commit comments

Comments
 (0)