Skip to content

Commit 7c9b509

Browse files
authored
Fix emsdk on python3 - the values() of a dict is a view there, not a list (#241)
Also add both python2 and 3 testing on CI here. Fixes #240.
1 parent e243406 commit 7c9b509

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ COPY . /root/emsdk/
88
RUN cd /root/ \
99
&& echo "int main() {}" > hello_world.cpp \
1010
&& apt-get update \
11-
&& apt-get install -y python cmake build-essential openjdk-9-jre-headless \
11+
&& apt-get install -y python python3 cmake build-essential openjdk-9-jre-headless \
1212
&& /root/emsdk/emsdk update-tags \
1313
&& echo "test latest" \
1414
&& /root/emsdk/emsdk install latest \
@@ -30,12 +30,12 @@ RUN cd /root/ \
3030
&& emcc hello_world.cpp -s WASM=0 \
3131
&& emcc --clear-cache \
3232
&& echo "test latest-releases-upstream" \
33-
&& /root/emsdk/emsdk install latest-releases-upstream \
33+
&& python2 /root/emsdk/emsdk install latest-releases-upstream \
3434
&& /root/emsdk/emsdk activate latest-releases-upstream \
3535
&& source /root/emsdk/emsdk_env.sh --build=Release \
3636
&& emcc hello_world.cpp \
3737
&& echo "test latest-releases-fastcomp" \
38-
&& /root/emsdk/emsdk install latest-releases-fastcomp \
38+
&& python3 /root/emsdk/emsdk install latest-releases-fastcomp \
3939
&& /root/emsdk/emsdk activate latest-releases-fastcomp \
4040
&& source /root/emsdk/emsdk_env.sh --build=Release \
4141
&& emcc hello_world.cpp \

emsdk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1875,7 +1875,7 @@ def load_releases_info():
18751875
# Get a list of tags for emscripten-releases.
18761876
def load_releases_tags():
18771877
info = load_releases_info()
1878-
return info.values()
1878+
return list(info.values())
18791879

18801880

18811881
def is_string(s):

0 commit comments

Comments
 (0)