MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-29779 Bundle the most recent versions of pip and setuptools

Browse Source 
using those included in virtualenv 16.0.0 as the baseline.

Since pip 10.0.0 has dropped support of Python 2.6 and we plan to
keep it until PyCharm 2019.1, now we need to bundle older compatible
versions of all related packages as we previously did for Python <= 2.5.
This commit is contained in:
Mikhail Golubev
2018-05-21 20:38:05 +03:00
parent eecb44a913
commit bff4ba2538
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/helpers/pip-10.0.1.tar.gz
BIN
View File
Binary file not shown.
python/helpers/setuptools-39.0.1.tar.gz
BIN
View File
Binary file not shown.
python/helpers/setuptools-39.1.0.tar.gz
BIN
View File
Binary file not shown.
python/helpers/virtualenv-16.0.0.tar.gz
BIN
View File
Binary file not shown.
python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
+8 -5
View File
@@ -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";