diff --git a/python/helpers/pip-10.0.1.tar.gz b/python/helpers/pip-10.0.1.tar.gz new file mode 100644 index 000000000000..f5a1d243acae Binary files /dev/null and b/python/helpers/pip-10.0.1.tar.gz differ diff --git a/python/helpers/setuptools-39.0.1.tar.gz b/python/helpers/setuptools-39.0.1.tar.gz deleted file mode 100644 index c149e503b9c9..000000000000 Binary files a/python/helpers/setuptools-39.0.1.tar.gz and /dev/null differ diff --git a/python/helpers/setuptools-39.1.0.tar.gz b/python/helpers/setuptools-39.1.0.tar.gz new file mode 100644 index 000000000000..00f345bd1dbc Binary files /dev/null and b/python/helpers/setuptools-39.1.0.tar.gz differ diff --git a/python/helpers/virtualenv-16.0.0.tar.gz b/python/helpers/virtualenv-16.0.0.tar.gz new file mode 100644 index 000000000000..98b35c75297a Binary files /dev/null and b/python/helpers/virtualenv-16.0.0.tar.gz differ diff --git a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java index 9ed7f9a4eff2..48f953f9a4f3 100644 --- a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java +++ b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java @@ -48,10 +48,12 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public class PyPackageManagerImpl extends PyPackageManager { - private static final String SETUPTOOLS_VERSION = "39.0.1"; + private static final String SETUPTOOLS_VERSION = "39.1.0"; private static final String SETUPTOOLS_VERSION_26 = "36.8.0"; - private static final String PIP_VERSION = "9.0.3"; - private static final String VIRTUALENV_VERSION = "15.2.0"; + private static final String PIP_VERSION = "10.0.1"; + private static final String PIP_VERSION_26 = "9.0.3"; + private static final String VIRTUALENV_VERSION = "16.0.0"; + private static final String VIRTUALENV_VERSION_26 = "15.2.0"; private static final int ERROR_NO_SETUPTOOLS = 3; @@ -98,7 +100,7 @@ public class PyPackageManagerImpl extends PyPackageManager { installManagement(PyPackageUtil.SETUPTOOLS + "-" + (py26 ? SETUPTOOLS_VERSION_26 : SETUPTOOLS_VERSION)); } if (PyPackageUtil.findPackage(refreshAndGetPackages(false), PyPackageUtil.PIP) == null) { - installManagement(PyPackageUtil.PIP + "-" + PIP_VERSION); + installManagement(PyPackageUtil.PIP + "-" + (py26 ? PIP_VERSION_26 : PIP_VERSION)); } } @@ -338,7 +340,8 @@ public class PyPackageManagerImpl extends PyPackageManager { args.add("--system-site-packages"); } args.add(destinationDir); - final String name = "virtualenv-" + VIRTUALENV_VERSION; + final boolean py26 = languageLevel == LanguageLevel.PYTHON26; + final String name = "virtualenv-" + (py26 ? VIRTUALENV_VERSION_26 : VIRTUALENV_VERSION); final String dirName = extractHelper(name + ".tar.gz"); try { final String fileName = dirName + name + File.separatorChar + "virtualenv.py";