diff --git a/docs/changelog/1291.feature.rst b/docs/changelog/1291.feature.rst new file mode 100644 index 000000000..c0032f1a4 --- /dev/null +++ b/docs/changelog/1291.feature.rst @@ -0,0 +1 @@ +bump vendored pip from ``18.1`` to ``19.0.1`` diff --git a/tox.ini b/tox.ini index 2c2471eb3..89f454292 100644 --- a/tox.ini +++ b/tox.ini @@ -6,11 +6,11 @@ skip_missing_interpreters = true [testenv] description = run tests with {basepython} -setenv = PIP_DISABLE_VERSION_CHECK = 1 - COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}} - jython: PIP_NO_CACHE_DIR = off +deps = pip >= 19.0.1 +setenv = COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}} passenv = https_proxy http_proxy no_proxy HOME PYTEST_ADDOPTS PYTEST_DEBUG CI_RUN TERM extras = testing +install_command = python -m pip install {opts} {packages} --disable-pip-version-check commands = coverage run --source=virtualenv \ -m pytest tests \ {posargs:\ @@ -22,13 +22,13 @@ commands = coverage run --source=virtualenv \ !jython: coverage report --show-missing [testenv:jython] -# pip 18.1 cache does not work with jython -install_command = python -m pip install {opts} {packages} --no-cache +install_command = python -m pip install {opts} {packages} --disable-pip-version-check --cache-dir={toxworkdir}/jython [testenv:coverage] description = [run locally after tests]: combine coverage data and create report; generates a diff coverage against origin/master (can be changed by setting DIFF_AGAINST env var) -deps = coverage >= 4.4.1, < 5 +deps = {[testenv]deps} + coverage >= 4.4.1, < 5 diff_cover extras = skip_install = True @@ -64,8 +64,8 @@ commands = sphinx-build -d "{envtmpdir}/doctree" -W docs "{toxworkdir}/docs_out" [testenv:package_readme] description = check that the long description is valid (need for PyPi) -deps = twine >= 1.12.1 - pip >= 18.0.0 +deps = {[testenv]deps} + twine >= 1.12.1 skip_install = true extras = commands = pip wheel -w {envtmpdir}/build --no-deps . @@ -81,7 +81,6 @@ commands = python update_embedded.py [testenv:upgrade] description = upgrade pip/wheels/setuptools to latest skip_install = true -deps = pip >= 18.1.0 changedir = {toxinidir}/tasks commands = python upgrade_wheels.py @@ -89,7 +88,8 @@ commands = python upgrade_wheels.py description = format the code base to adhere to our styles, and complain about what we cannot do automatically basepython = python3.7 passenv = * -deps = pre-commit == 1.12.0 +deps = {[testenv]deps} + pre-commit == 1.12.0 skip_install = True commands = pre-commit run --all-files --show-diff-on-failure python -c 'import pathlib; print("hint: run \{\} install to add checks as pre-commit hook".format(pathlib.Path(r"{envdir}") / "bin" / "pre-commit"))' @@ -124,7 +124,8 @@ description = do a release, required posarg of the version number basepython = python3.7 skip_install = true passenv = * -deps = gitpython >= 2.1.10, < 3 +deps = {[testenv]deps} + gitpython >= 2.1.10, < 3 towncrier >= 18.5.0 packaging >= 17.1 changedir = {toxinidir}/tasks diff --git a/virtualenv.py b/virtualenv.py index fe7424bca..80cb85e4e 100755 --- a/virtualenv.py +++ b/virtualenv.py @@ -41,7 +41,7 @@ # noinspection PyPep8Naming import configparser as ConfigParser -__version__ = "16.2.0" +__version__ = "16.3.0" virtualenv_version = __version__ # legacy DEBUG = os.environ.get("_VIRTUALENV_DEBUG", None) == "1" if sys.version_info < (2, 7): diff --git a/virtualenv_support/pip-18.1-py2.py3-none-any.whl b/virtualenv_support/pip-19.0.1-py2.py3-none-any.whl similarity index 50% rename from virtualenv_support/pip-18.1-py2.py3-none-any.whl rename to virtualenv_support/pip-19.0.1-py2.py3-none-any.whl index c3c146f6d..4c6363afe 100644 Binary files a/virtualenv_support/pip-18.1-py2.py3-none-any.whl and b/virtualenv_support/pip-19.0.1-py2.py3-none-any.whl differ