diff --git a/python/build/build-debug-binaries/src/build.gradle b/python/build/build-debug-binaries/src/build.gradle index 20dc82efb54b..1af5f462744a 100644 --- a/python/build/build-debug-binaries/src/build.gradle +++ b/python/build/build-debug-binaries/src/build.gradle @@ -17,9 +17,6 @@ envs { zipRepository = new URL("https://repo.labs.intellij.net/pycharm/python-archives-windows/") shouldUseZipsFromRepository = Os.isFamily(Os.FAMILY_WINDOWS) - python "python26_64", "2.6.6", "64" - virtualenv "py26_64", "python26_64", ["cython"] - python "python27_64", "2.7.15", "64" virtualenv "py27_64", "python27_64", ["cython"] @@ -36,9 +33,6 @@ envs { virtualenv "py37_64", "python37_64", ["cython"] if (Os.isFamily(Os.FAMILY_WINDOWS)) { - python "python26_32", "2.6.6", "32" - virtualenv "py26_32", "python26_32", ["cython"] - python "python27_32", "2.7.15", "32" virtualenv "py27_32", "python27_32", ["cython"] diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py b/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py index b1d67aee82db..8d62de84202f 100644 --- a/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py +++ b/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py @@ -63,11 +63,11 @@ else: if python_implementation == 'CPython' and not IS_PYTHON_STACKLESS: # Only available for CPython! if ( - (sys.version_info[0] == 2 and sys.version_info[1] >= 6) - or (sys.version_info[0] == 3 and sys.version_info[1] >= 3) + (sys.version_info[0] == 2 and sys.version_info[1] >= 7) + or (sys.version_info[0] == 3 and sys.version_info[1] >= 4) or (sys.version_info[0] > 3) ): - # Supported in 2.6,2.7 or 3.3 onwards (32 or 64) + # Supported in 2.7 or 3.4 onwards (32 or 64) CYTHON_SUPPORTED = True diff --git a/python/helpers/pydev/build_tools/build.py b/python/helpers/pydev/build_tools/build.py index 6dbdcd185c60..5625d725d8b1 100644 --- a/python/helpers/pydev/build_tools/build.py +++ b/python/helpers/pydev/build_tools/build.py @@ -104,11 +104,11 @@ def build(): env = os.environ.copy() - if sys.version_info[:2] in ((2, 6), (2, 7), (3, 5), (3, 6), (3, 7)): + if sys.version_info[:2] in ((2, 7), (3, 5), (3, 6), (3, 7)): import setuptools # We have to import it first for the compiler to be found from distutils import msvc9compiler - if sys.version_info[:2] in ((2, 6), (2, 7)): + if sys.version_info[:2] == (2, 7): vcvarsall = msvc9compiler.find_vcvarsall(9.0) elif sys.version_info[:2] in ((3, 5), (3, 6), (3, 7)): vcvarsall = msvc9compiler.find_vcvarsall(14.0) @@ -124,7 +124,7 @@ def build(): [vcvarsall, 'x86'], initial=os.environ.copy())) - elif sys.version_info[:2] in ((3,3), (3,4)): + elif sys.version_info[:2] == (3, 4): if is_python_64bit(): env.update(get_environment_from_batch_command( [r"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd", '/x64'], diff --git a/python/helpers/pydev/build_tools/build_binaries_osx.py b/python/helpers/pydev/build_tools/build_binaries_osx.py index 795b2d4b6ee2..62908d17e2cd 100644 --- a/python/helpers/pydev/build_tools/build_binaries_osx.py +++ b/python/helpers/pydev/build_tools/build_binaries_osx.py @@ -7,7 +7,6 @@ import sys miniconda64_envs = os.getenv('MINICONDA64_ENVS') python_installations = [ - r'%s/py26_64/bin/python' % miniconda64_envs, r'%s/py27_64/bin/python' % miniconda64_envs, r'%s/py34_64/bin/python' % miniconda64_envs, r'%s/py35_64/bin/python' % miniconda64_envs, diff --git a/python/helpers/pydev/build_tools/build_binaries_windows.py b/python/helpers/pydev/build_tools/build_binaries_windows.py index aaf82c91f1cb..61786c6a8c0b 100644 --- a/python/helpers/pydev/build_tools/build_binaries_windows.py +++ b/python/helpers/pydev/build_tools/build_binaries_windows.py @@ -72,14 +72,12 @@ miniconda32_envs = os.getenv('MINICONDA32_ENVS', r'C:\tools\Miniconda32\envs') miniconda64_envs = os.getenv('MINICONDA64_ENVS', r'C:\tools\Miniconda\envs') python_installations = [ - r'%s\py26_32\Scripts\python.exe' % miniconda32_envs, r'%s\py27_32\Scripts\python.exe' % miniconda32_envs, r'%s\py34_32\Scripts\python.exe' % miniconda32_envs, r'%s\py35_32\Scripts\python.exe' % miniconda32_envs, r'%s\py36_32\Scripts\python.exe' % miniconda32_envs, r'%s\py37_32\Scripts\python.exe' % miniconda32_envs, - r'%s\py26_64\Scripts\python.exe' % miniconda64_envs, r'%s\py27_64\Scripts\python.exe' % miniconda64_envs, r'%s\py34_64\Scripts\python.exe' % miniconda64_envs, r'%s\py35_64\Scripts\python.exe' % miniconda64_envs,