Skip to content

Commit 2c42698

Browse files
authored
Remove old Python versions from manifest: no package uses these python versions anymore. (#1465)
1 parent 8e661c8 commit 2c42698

File tree

5 files changed

+2
-104
lines changed

5 files changed

+2
-104
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ https://emscripten.org/docs/building_from_source/toolchain_what_is_needed.html.
6565

6666
### Linux
6767

68-
- `python`: Version 2.7.0 or above.
68+
- `python`: Version 3.9.2 or above.
6969
- `java`: For running closure compiler (optional)
7070

7171
The emsdk pre-compiled binaries are built against Ubuntu/Focal 20.04 LTS and

emsdk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
# First look for python bundled in Emsdk
1010
if [ -z "$EMSDK_PYTHON" ]; then
1111
PYTHON3="$(dirname "$0")/python/3.9.2-1_64bit/bin/python3"
12-
if [ ! -f "$PYTHON3" ]; then
13-
PYTHON3="$(dirname "$0")/python/3.7.4-2_64bit/bin/python3"
14-
fi
1512
if [ -f "$PYTHON3" ]; then
1613
EMSDK_PYTHON="$PYTHON3"
1714

emsdk.bat

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,6 @@ if exist "%~dp0python\3.9.2-nuget_64bit\python.exe" (
2121
goto end
2222
)
2323

24-
if exist "%~dp0python\3.7.4-pywin32_64bit\python.exe" (
25-
set EMSDK_PY="%~dp0python\3.7.4-pywin32_64bit\python.exe"
26-
set PYTHONHOME=
27-
set PYTHONPATH=
28-
goto end
29-
)
30-
31-
if exist "%~dp0python\3.7.4_64bit\python.exe" (
32-
set EMSDK_PY="%~dp0python\3.7.4_64bit\python.exe"
33-
set PYTHONHOME=
34-
set PYTHONPATH=
35-
goto end
36-
)
37-
38-
if exist "%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe" (
39-
set EMSDK_PY="%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe"
40-
set PYTHONHOME=
41-
set PYTHONPATH=
42-
goto end
43-
)
44-
4524
:: As a last resort, access from PATH.
4625
set EMSDK_PY=python
4726

emsdk.ps1

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@ $ScriptDirectory = Split-Path -parent $PSCommandPath
22

33
$PythonLocations = $(
44
"python\3.9.2-1_64bit\python.exe",
5-
"python\3.9.2-nuget_64bit\python.exe",
6-
"python\3.7.4-pywin32_64bit\python.exe",
7-
"python\3.7.4_64bit\python.exe",
8-
"python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe",
9-
"python\2.7.13.1_32bit\python-2.7.13\python.exe",
10-
"python\2.7.5.3_64bit\python.exe",
11-
"python\2.7.5.3_32bit\python.exe",
12-
"python\2.7.5_64bit\python.exe",
13-
"python\2.7.5.1_32bit\python.exe"
5+
"python\3.9.2-nuget_64bit\python.exe"
146
)
157

168
# Find python from an explicit location relative to the Emscripten SDK.

emsdk_manifest.json

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -395,76 +395,6 @@
395395
},
396396

397397

398-
{
399-
"id": "python",
400-
"version": "2.7.13.1",
401-
"bitness": 32,
402-
"arch": "x86",
403-
"windows_url": "WinPython-32bit-2.7.13.1Zero.zip",
404-
"activated_cfg": "PYTHON='%installation_dir%/python-2.7.13/python%.exe%'",
405-
"activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13/python%.exe%",
406-
"is_old": true
407-
},
408-
{
409-
"id": "python",
410-
"version": "2.7.13.1",
411-
"bitness": 64,
412-
"arch": "x86_64",
413-
"windows_url": "WinPython-64bit-2.7.13.1Zero.zip",
414-
"activated_cfg": "PYTHON='%installation_dir%/python-2.7.13.amd64/python%.exe%'",
415-
"activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13.amd64/python%.exe%",
416-
"is_old": true
417-
},
418-
{
419-
"id": "python",
420-
"version": "3.7.4",
421-
"bitness": 32,
422-
"arch": "x86",
423-
"windows_url": "python-3.7.4-embed-win32-patched.zip",
424-
"activated_cfg": "PYTHON='%installation_dir%/python.exe'",
425-
"activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
426-
"is_old": true
427-
},
428-
{
429-
"id": "python",
430-
"version": "3.7.4",
431-
"bitness": 64,
432-
"arch": "x86_64",
433-
"windows_url": "python-3.7.4-embed-amd64-patched.zip",
434-
"activated_cfg": "PYTHON='%installation_dir%/python.exe'",
435-
"activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
436-
"is_old": true
437-
},
438-
{
439-
"id": "python",
440-
"version": "3.7.4-pywin32",
441-
"bitness": 32,
442-
"arch": "x86",
443-
"windows_url": "python-3.7.4-embed-win32+pywin32.zip",
444-
"activated_cfg": "PYTHON='%installation_dir%/python.exe'",
445-
"activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
446-
"is_old": true
447-
},
448-
{
449-
"id": "python",
450-
"version": "3.7.4-pywin32",
451-
"bitness": 64,
452-
"arch": "x86_64",
453-
"windows_url": "python-3.7.4-embed-amd64+pywin32.zip",
454-
"activated_cfg": "PYTHON='%installation_dir%/python.exe'",
455-
"activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
456-
"is_old": true
457-
},
458-
{
459-
"id": "python",
460-
"version": "3.7.4-2",
461-
"bitness": 64,
462-
"arch": "x86_64",
463-
"macos_url": "python-3.7.4-2-macos.tar.gz",
464-
"activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
465-
"activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.7/site-packages/certifi/cacert.pem",
466-
"is_old": true
467-
},
468398
{
469399
"id": "python",
470400
"version": "3.9.2-nuget",

0 commit comments

Comments
 (0)