Skip to content

Commit

Permalink
Merge pull request #1112 from atugushev/address-todos-pip-20.1
Browse files Browse the repository at this point in the history
Pin pip-20.1 and its betas in tox and CIs
  • Loading branch information
Asif Saif Uddin committed Apr 21, 2020
2 parents 6847146 + 6766a62 commit 7a52ce8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
22 changes: 10 additions & 12 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,28 @@ environment:
PYTHON: "C:\\Python36"

matrix:
# TODO: change "20.1" to "20.0" after pip==20.1 being released

- TOXENV: py27-pip20.1-coverage
PIP: 20.1
- TOXENV: py27-pip20.0-coverage
PIP: 20.0
- TOXENV: py27-piplatest-coverage
PIP: latest

- TOXENV: py35-pip20.1
PIP: 20.1
- TOXENV: py35-pip20.0
PIP: 20.0
- TOXENV: py35-piplatest
PIP: latest

- TOXENV: py36-pip20.1
PIP: 20.1
- TOXENV: py36-pip20.0
PIP: 20.0
- TOXENV: py36-piplatest
PIP: latest

- TOXENV: py37-pip20.1
PIP: 20.1
- TOXENV: py37-pip20.0
PIP: 20.0
- TOXENV: py37-piplatest
PIP: latest

- TOXENV: py38-pip20.1-coverage
PIP: 20.1
- TOXENV: py38-pip20.0-coverage
PIP: 20.0
- TOXENV: py38-piplatest-coverage
PIP: latest

Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ python:

env:
# NOTE: keep this in sync with envlist in tox.ini for tox-travis.
- PIP=20.1 # TODO: change to "20.0" after pip==20.1 being released
- PIP=20.0
- PIP=latest

cache: false
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ extras =
deps =
pipmaster: -e git+https://github.com/pypa/pip.git@master#egg=pip
pip20.0: pip==20.0.*
# TODO: change to "pip==20.1.*" after 20.1 being released
pip20.1: -e git+https://github.com/pypa/pip.git@master#egg=pip
pip20.1: pip~=20.1b1
setenv =
piplatest: PIP=latest
pipmaster: PIP=master
Expand All @@ -27,6 +26,7 @@ commands_pre =
pip --version
commands = pytest {posargs}
passenv = CI
pip_pre=True

[testenv:checkqa]
basepython = python3
Expand Down

0 comments on commit 7a52ce8

Please sign in to comment.