Upgrade pip/setuptools in venv to versions from base environment

poetry/utils/env.py

@@ -318,6 +318,23 @@ def build_venv(cls, path):
 
         build(path)
 
+        # make sure pip and setuptools are on the same version as the base environment
+        from pip import __version__ as pip_version
+        from setuptools import __version__ as setuptools_version
+
+        the_venv = VirtualEnv(Path(path))
+        the_venv.run(
+            "python", "-m", "pip", "install", "--upgrade", "pip=={}".format(pip_version)
+        )
+        the_venv.run(
+            "python",
+            "-m",
+            "pip",
+            "install",
+            "--upgrade",
+            "setuptools=={}".format(setuptools_version),
+        )
+
     @classmethod
     def get_base_prefix(cls):  # type: () -> Path
         if hasattr(sys, "real_prefix"):

tests/fixtures/simple_project/pyproject.toml

@@ -1,25 +1,25 @@
-[tool.poetry]
-name = "simple-project"
-version = "1.2.3"
-description = "Some description."
-authors = [
-    "Sébastien Eustace <[email protected]>"
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
-
-keywords = ["packaging", "dependency", "poetry"]
-
-classifiers = [
-    "Topic :: Software Development :: Build Tools",
-    "Topic :: Software Development :: Libraries :: Python Modules"
-]
-
-# Requirements
-[tool.poetry.dependencies]
-python = "~2.7 || ^3.6"
+[tool.poetry]
+name = "simple-project"
+version = "1.2.3"
+description = "Some description."
+authors = [
+    "Sébastien Eustace <[email protected]>"
+]
+license = "MIT"
+
+readme = "README.rst"
+
+homepage = "https://poetry.eustace.io"
+repository = "https://github.com/sdispater/poetry"
+documentation = "https://poetry.eustace.io/docs"
+
+keywords = ["packaging", "dependency", "poetry"]
+
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+
+# Requirements
+[tool.poetry.dependencies]
+python = "~2.7 || ^3.6"

tests/utils/test_env.py

@@ -1,14 +1,14 @@
 import os
 import pytest
 import shutil
+from re import sub
 
 from poetry.utils._compat import Path
 from poetry.utils.env import Env
 from poetry.utils.env import VirtualEnv
 from poetry.utils.env import EnvCommandError
 
 MINIMAL_SCRIPT = """\
-
 print("Minimal Output"),
 """
 
@@ -82,3 +82,43 @@ def test_run_with_input_non_zero_return(tmp_dir, tmp_venv):
         result = tmp_venv.run("python", "-", input_=ERRORING_SCRIPT)
 
     assert processError.value.e.returncode == 1
+
+
+def test_virtualenvs_pip_and_setuptools_versions(tmp_dir):
+    from pip import __version__ as pip_version
+    from setuptools import __version__ as setuptools_version
+
+    if pip_version == "10.0.1" and setuptools_version == "39.0.1":
+        pytest.skip(
+            "System 'pip' and 'setuptools' are default versions from 'ensurepip'."
+            "Will not detect if they do not get updated after 'venv' creation."
+        )
+
+    venv_path = Path(tmp_dir) / "CheckPipSetuptools"
+
+    Env.build_venv(str(venv_path))
+
+    venv = VirtualEnv(venv_path)
+
+    from pip import __version__ as pip_version
+
+    venv_pip_version = venv.run(
+        "python",
+        "-c",
+        '"from __future__ import print_function;from pip import __version__; print(__version__)"',
+        shell=True,
+    )
+    venv_pip_version = sub(r"\s", "", venv_pip_version)
+
+    venv_setuptools_version = venv.run(
+        "python",
+        "-c",
+        '"from __future__ import print_function;from setuptools import __version__; print(__version__)"',
+        shell=True,
+    )
+    venv_setuptools_version = sub(r"\s", "", venv_setuptools_version)
+
+    assert (
+        venv_pip_version == pip_version
+        and venv_setuptools_version == setuptools_version
+    )