Invoke pipstrap in tox and during the CI

This commit is contained in:
Adrien Ferrand 2020-09-23 20:43:44 +02:00
parent b20aaff661
commit b984880942
3 changed files with 9 additions and 4 deletions

View file

@ -80,6 +80,7 @@ jobs:
displayName: Retrieve Windows installer
- script: |
py -3 -m venv venv
venv\Scripts\python letsencrypt-auto-source\pieces\pipstrap.py
venv\Scripts\python tools\pip_install.py -e certbot-ci
displayName: Prepare Certbot-CI
- script: |
@ -138,7 +139,9 @@ jobs:
- script: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends nginx-light snapd
python tools/pip_install.py -U tox
python3 -m venv venv
venv/bin/python letsencrypt-auto-source/pieces/pipstrap.py
venv/bin/python tools/pip_install.py -U tox
displayName: Install dependencies
- task: DownloadPipelineArtifact@2
inputs:
@ -149,7 +152,7 @@ jobs:
sudo snap install --dangerous --classic snap/certbot_*_amd64.snap
displayName: Install Certbot snap
- script: |
python -m tox -e integration-external,apacheconftest-external-with-pebble
venv/bin/python -m tox -e integration-external,apacheconftest-external-with-pebble
displayName: Run tox
- job: snap_dns_run
dependsOn: snaps_build
@ -171,6 +174,7 @@ jobs:
displayName: Retrieve Certbot snaps
- script: |
python3 -m venv venv
venv/bin/python letsencrypt-auto-source/pieces/pipstrap.py
venv/bin/python tools/pip_install.py -e certbot-ci
displayName: Prepare Certbot-CI
- script: |

View file

@ -30,6 +30,7 @@ steps:
# set, pip updates dependencies it thinks are already satisfied to avoid some
# problems with its lack of real dependency resolution.
- bash: |
python letsencrypt-auto-source/pieces/pipstrap.py
python tools/pip_install.py -I tox virtualenv
displayName: Install runtime dependencies
- task: DownloadSecureFile@1

View file

@ -7,12 +7,11 @@ skipsdist = true
envlist = modification,py3-cover,lint,mypy
[base]
# pip installs the requested packages in editable mode
pip_install = python {toxinidir}/tools/pip_install_editable.py
# pip installs the requested packages in editable mode and runs unit tests on
# them. Each package is installed and tested in the order they are provided
# before the script moves on to the next package. All dependencies are pinned
# to a specific version for increased stability for developers.
pip_install = python {toxinidir}/tools/pip_install_editable.py
install_and_test = python {toxinidir}/tools/install_and_test.py
dns_packages =
certbot-dns-cloudflare \
@ -62,6 +61,7 @@ source_paths =
[testenv]
passenv =
CERTBOT_NO_PIN
commands_pre = python {toxinidir}/letsencrypt-auto-source/pieces/pipstrap.py
commands =
!cover: {[base]install_and_test} {[base]all_packages}
!cover: python tests/lock_test.py