mirror of
https://github.com/curl/curl.git
synced 2026-04-15 01:51:41 +03:00
GHA: use pip requirements.txt with pins, and more venv
- requirements.txt: shorten copyright headers. - requirements.txt: pin packages to versions. - GHA/windows: use `tests/requirements.txt`. Pick a `cryptography` package version that satifies both `impacket` and pytests dependencies. - GHA/checksrc: move pip deps into a new `requirements.txt`. To make Dependabot detect and bump them. - GHA/checksrc: replace apt packages for python test deps with pip install `tests/**/requirements.txt` to a venv. - GHA/checksrc: use venv and drop `--break-system-packages`. - GHA/linux: fix to actually activate venvs. Follow-up to2638570241#15578 - GHA/linux: fixup (did not cause an issue) Follow-up tod75785c7de#18660 - GHA: create venvs later, simplify commands. - GHA: sync pip command-line options, e.g. drop progress-bar, everywhere. Assisted-by: Dan Fandrich Closes #18708
This commit is contained in:
parent
7f38bf51ad
commit
7d5f8be532
8 changed files with 50 additions and 83 deletions
18
.github/workflows/linux.yml
vendored
18
.github/workflows/linux.yml
vendored
|
|
@ -321,8 +321,9 @@ jobs:
|
|||
libpsl-dev zlib1g-dev libbrotli-dev libzstd-dev \
|
||||
${INSTALL_PACKAGES} \
|
||||
${MATRIX_INSTALL_PACKAGES}
|
||||
[ -n "${INSTALL_PACKAGES_BREW}" ] && /home/linuxbrew/.linuxbrew/bin/brew install ${INSTALL_PACKAGES_BREW}
|
||||
python3 -m venv ~/venv
|
||||
if [ -n "${INSTALL_PACKAGES_BREW}" ]; then
|
||||
/home/linuxbrew/.linuxbrew/bin/brew install ${INSTALL_PACKAGES_BREW}
|
||||
fi
|
||||
|
||||
- name: 'install prereqs'
|
||||
if: ${{ contains(matrix.build.name, 'i686') }}
|
||||
|
|
@ -335,7 +336,6 @@ jobs:
|
|||
libtool autoconf automake pkgconf stunnel4 \
|
||||
libpsl-dev:i386 libbrotli-dev:i386 libzstd-dev:i386 \
|
||||
${MATRIX_INSTALL_PACKAGES}
|
||||
python3 -m venv ~/venv
|
||||
|
||||
- name: 'install dependencies'
|
||||
if: ${{ startsWith(matrix.build.container, 'alpine') }}
|
||||
|
|
@ -657,8 +657,8 @@ jobs:
|
|||
- name: 'install test prereqs'
|
||||
if: ${{ !contains(matrix.build.install_steps, 'skipall') && !contains(matrix.build.install_steps, 'skiprun') && matrix.build.container == null }}
|
||||
run: |
|
||||
[ -x ~/venv/bin/activate ] && source ~/venv/bin/activate
|
||||
python3 -m pip install -r tests/requirements.txt
|
||||
python3 -m venv ~/venv
|
||||
~/venv/bin/pip --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary -r tests/requirements.txt
|
||||
|
||||
- name: 'run tests'
|
||||
if: ${{ !contains(matrix.build.install_steps, 'skipall') && !contains(matrix.build.install_steps, 'skiprun') }}
|
||||
|
|
@ -675,7 +675,7 @@ jobs:
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
[ -x ~/venv/bin/activate ] && source ~/venv/bin/activate
|
||||
[ -f ~/venv/bin/activate ] && source ~/venv/bin/activate
|
||||
if [[ "${MATRIX_INSTALL_STEPS}" = *'codeset-test'* ]]; then
|
||||
locale || true
|
||||
export LC_ALL=C
|
||||
|
|
@ -691,8 +691,8 @@ jobs:
|
|||
- name: 'install pytest prereqs'
|
||||
if: ${{ contains(matrix.build.install_steps, 'pytest') }}
|
||||
run: |
|
||||
[ -x ~/venv/bin/activate ] && source ~/venv/bin/activate
|
||||
python3 -m pip install -r tests/http/requirements.txt
|
||||
[ -d ~/venv ] || python3 -m venv ~/venv
|
||||
~/venv/bin/pip --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary -r tests/http/requirements.txt
|
||||
|
||||
- name: 'run pytest'
|
||||
if: ${{ contains(matrix.build.install_steps, 'pytest') }}
|
||||
|
|
@ -700,7 +700,7 @@ jobs:
|
|||
PYTEST_ADDOPTS: '--color=yes'
|
||||
PYTEST_XDIST_AUTO_NUM_WORKERS: 4
|
||||
run: |
|
||||
[ -x ~/venv/bin/activate ] && source ~/venv/bin/activate
|
||||
[ -f ~/venv/bin/activate ] && source ~/venv/bin/activate
|
||||
if [ "${MATRIX_BUILD}" = 'cmake' ]; then
|
||||
cmake --build bld --verbose --target curl-pytest-ci
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue