diff --git a/python/build/build-debug-binaries/src/build.gradle b/python/build/build-debug-binaries/src/build.gradle index 6ed4dc05159d..4132000da24e 100644 --- a/python/build/build-debug-binaries/src/build.gradle +++ b/python/build/build-debug-binaries/src/build.gradle @@ -16,6 +16,7 @@ envs { conda "Miniconda3_64", "Miniconda3-latest", "64" + condaenv "py26_64", "2.6", "Miniconda3_64", ["cython"] condaenv "py27_64", "2.7", "Miniconda3_64", ["cython"] condaenv "py34_64", "3.4", "Miniconda3_64", ["cython"] condaenv "py35_64", "3.5", "Miniconda3_64", ["cython"] @@ -24,6 +25,7 @@ envs { if (Os.isFamily(Os.FAMILY_WINDOWS)) { conda "Miniconda3_32", "Miniconda3-latest", "32" + condaenv "py26_32", "2.6", "Miniconda3_32", ["cython"] condaenv "py27_32", "2.7", "Miniconda3_32", ["cython"] condaenv "py34_32", "3.4", "Miniconda3_32", ["cython"] condaenv "py35_32", "3.5", "Miniconda3_32", ["cython"] diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py b/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py index 6f905cbed5e5..0dfff327d05e 100644 --- a/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py +++ b/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py @@ -57,11 +57,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] >= 7) + (sys.version_info[0] == 2 and sys.version_info[1] >= 6) or (sys.version_info[0] == 3 and sys.version_info[1] >= 3) or (sys.version_info[0] > 3) ): - # Supported in 2.7 or 3.3 onwards (32 or 64) + # Supported in 2.6,2.7 or 3.3 onwards (32 or 64) CYTHON_SUPPORTED = True @@ -133,7 +133,6 @@ def protect_libraries_from_patching(): del sys.modules[name] # import for side effects - import _pydev_imps._pydev_saved_modules for name in patched_modules: sys.modules[name] = patched_modules[name] diff --git a/python/helpers/pydev/build_tools/build.py b/python/helpers/pydev/build_tools/build.py index 63a3f0d83bb5..265d65f7e205 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,7), (3,5), (3, 6)): + if sys.version_info[:2] in ((2,6), (2,7), (3,5), (3, 6)): import setuptools # We have to import it first for the compiler to be found from distutils import msvc9compiler - if sys.version_info[:2] == (2,7): + if sys.version_info[:2] in ((2,6), (2,7)): vcvarsall = msvc9compiler.find_vcvarsall(9.0) elif sys.version_info[:2] in ((3,5), (3,6)): vcvarsall = msvc9compiler.find_vcvarsall(14.0) diff --git a/python/helpers/pydev/build_tools/build_binaries_windows.py b/python/helpers/pydev/build_tools/build_binaries_windows.py index 60a409515b5b..7f91a08f11ee 100644 --- a/python/helpers/pydev/build_tools/build_binaries_windows.py +++ b/python/helpers/pydev/build_tools/build_binaries_windows.py @@ -72,11 +72,13 @@ 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\python.exe' % miniconda32_envs, r'%s\py27_32\python.exe' % miniconda32_envs, r'%s\py34_32\python.exe' % miniconda32_envs, r'%s\py35_32\python.exe' % miniconda32_envs, r'%s\py36_32\python.exe' % miniconda32_envs, + r'%s\py26_64\python.exe' % miniconda64_envs, r'%s\py27_64\python.exe' % miniconda64_envs, r'%s\py34_64\python.exe' % miniconda64_envs, r'%s\py35_64\python.exe' % miniconda64_envs,