Remove old Python versions from manifest: no package uses these python versions anymore.
diff --git a/README.md b/README.md index 9736aea..cf4c0ce 100644 --- a/README.md +++ b/README.md
@@ -64,7 +64,7 @@ ### Linux -- `python`: Version 2.7.0 or above. +- `python`: Version 3.9.2 or above. - `java`: For running closure compiler (optional) The emsdk pre-compiled binaries are built against Ubuntu/Focal 20.04 LTS and
diff --git a/emsdk b/emsdk index 55d46b9..78c0288 100755 --- a/emsdk +++ b/emsdk
@@ -9,9 +9,6 @@ # First look for python bundled in Emsdk if [ -z "$EMSDK_PYTHON" ]; then PYTHON3="$(dirname "$0")/python/3.9.2-1_64bit/bin/python3" - if [ ! -f "$PYTHON3" ]; then - PYTHON3="$(dirname "$0")/python/3.7.4-2_64bit/bin/python3" - fi if [ -f "$PYTHON3" ]; then EMSDK_PYTHON="$PYTHON3"
diff --git a/emsdk.bat b/emsdk.bat index 6842bca..d0c599d 100644 --- a/emsdk.bat +++ b/emsdk.bat
@@ -21,27 +21,6 @@ goto end ) -if exist "%~dp0python\3.7.4-pywin32_64bit\python.exe" ( - set EMSDK_PY="%~dp0python\3.7.4-pywin32_64bit\python.exe" - set PYTHONHOME= - set PYTHONPATH= - goto end -) - -if exist "%~dp0python\3.7.4_64bit\python.exe" ( - set EMSDK_PY="%~dp0python\3.7.4_64bit\python.exe" - set PYTHONHOME= - set PYTHONPATH= - goto end -) - -if exist "%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe" ( - set EMSDK_PY="%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe" - set PYTHONHOME= - set PYTHONPATH= - goto end -) - :: As a last resort, access from PATH. set EMSDK_PY=python
diff --git a/emsdk.ps1 b/emsdk.ps1 index b37da4b..e9e6008 100644 --- a/emsdk.ps1 +++ b/emsdk.ps1
@@ -2,15 +2,7 @@ $PythonLocations = $( "python\3.9.2-1_64bit\python.exe", - "python\3.9.2-nuget_64bit\python.exe", - "python\3.7.4-pywin32_64bit\python.exe", - "python\3.7.4_64bit\python.exe", - "python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe", - "python\2.7.13.1_32bit\python-2.7.13\python.exe", - "python\2.7.5.3_64bit\python.exe", - "python\2.7.5.3_32bit\python.exe", - "python\2.7.5_64bit\python.exe", - "python\2.7.5.1_32bit\python.exe" + "python\3.9.2-nuget_64bit\python.exe" ) # Find python from an explicit location relative to the Emscripten SDK.
diff --git a/emsdk_manifest.json b/emsdk_manifest.json index 6af26c2..61b3e2d 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json
@@ -397,76 +397,6 @@ { "id": "python", - "version": "2.7.13.1", - "bitness": 32, - "arch": "x86", - "windows_url": "WinPython-32bit-2.7.13.1Zero.zip", - "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13/python%.exe%'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13/python%.exe%", - "is_old": true - }, - { - "id": "python", - "version": "2.7.13.1", - "bitness": 64, - "arch": "x86_64", - "windows_url": "WinPython-64bit-2.7.13.1Zero.zip", - "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13.amd64/python%.exe%'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13.amd64/python%.exe%", - "is_old": true - }, - { - "id": "python", - "version": "3.7.4", - "bitness": 32, - "arch": "x86", - "windows_url": "python-3.7.4-embed-win32-patched.zip", - "activated_cfg": "PYTHON='%installation_dir%/python.exe'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe", - "is_old": true - }, - { - "id": "python", - "version": "3.7.4", - "bitness": 64, - "arch": "x86_64", - "windows_url": "python-3.7.4-embed-amd64-patched.zip", - "activated_cfg": "PYTHON='%installation_dir%/python.exe'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe", - "is_old": true - }, - { - "id": "python", - "version": "3.7.4-pywin32", - "bitness": 32, - "arch": "x86", - "windows_url": "python-3.7.4-embed-win32+pywin32.zip", - "activated_cfg": "PYTHON='%installation_dir%/python.exe'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe", - "is_old": true - }, - { - "id": "python", - "version": "3.7.4-pywin32", - "bitness": 64, - "arch": "x86_64", - "windows_url": "python-3.7.4-embed-amd64+pywin32.zip", - "activated_cfg": "PYTHON='%installation_dir%/python.exe'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe", - "is_old": true - }, - { - "id": "python", - "version": "3.7.4-2", - "bitness": 64, - "arch": "x86_64", - "macos_url": "python-3.7.4-2-macos.tar.gz", - "activated_cfg": "PYTHON='%installation_dir%/bin/python3'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.7/site-packages/certifi/cacert.pem", - "is_old": true - }, - { - "id": "python", "version": "3.9.2-nuget", "bitness": 64, "arch": "x86_64",