Skip to content

Commit 9d749e1

Browse files
committed
minor fixes on building release
1 parent 3b3af90 commit 9d749e1

File tree

6 files changed

+5
-11
lines changed

6 files changed

+5
-11
lines changed

Malmo/samples/CSharp_examples/install_files/RunMission.csproj.in renamed to Malmo/samples/CSharp_examples/install_files/RunMission.csproj

File renamed without changes.

scripts/docker/build_console_ubuntu1604_python3.dockerfile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,10 @@ RUN sudo dos2unix /home/malmo/build.sh
7575
ENV MALMO_XSD_PATH=/home/malmo/MalmoPlatform/Schemas
7676

7777
# Build Malmo - no install; no testing and branch specified for now!!!
78-
RUN /home/malmo/build.sh -boost 1_66_0 -python 3.5 -with_display -branch malmorel -no_testing
78+
RUN /home/malmo/build.sh -boost 1_66_0 -python 3.5 -with_display -branch master -no_testing
7979

8080
WORKDIR /home/malmo/MalmoPlatform
8181

82-
# TODO for now pip install package "malmo" from the test pypi web site.
83-
# The pip3 install and download could be moved to docker build time.
84-
# Pass in --build-arg MALMOVERSION="x.x.x" to re-install
85-
ARG MALMOVERSION=unknown
86-
RUN MALMOVERSION=${MALMOVERSION} sudo pip3 install --index-url https://test.pypi.org/simple/ malmo
87-
8882
# Install Jupyter:
8983
RUN sudo pip3 install jupyter
9084

scripts/docker/install_console_ubuntu1604_python3.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ENV MALMO_XSD_PATH=/home/malmo/MalmoPlatform/Schemas
3838
# TODO for now pip install package "malmo" from the test pypi web site.
3939
# Pass in --build-arg MALMOVERSION="x.x.x" to re-install
4040
ARG MALMOVERSION=unknown
41-
RUN MALMOVERSION=${MALMOVERSION} sudo pip3 install --index-url https://test.pypi.org/simple/ "malmo==0.35.5"
41+
RUN MALMOVERSION=${MALMOVERSION} sudo pip3 install --index-url https://test.pypi.org/simple/ "malmo==0.35.6"
4242
RUN python3 -c "import malmo.minecraftbootstrap;malmo.minecraftbootstrap.download(buildMod=True, branch='malmorel')"
4343

4444
# Install Jupyter:

scripts/python-wheel/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ and is set up to allow remote access via the
4040
so that you are able to see the Minecraft game running inside the container.
4141

4242
```
43-
docker run -it -p 5901:5901 -p 6901:6901 -p8888:8888 -e VNC_PW=vncpassword andkram/malmo_0_35_5
43+
docker run -it -p 5901:5901 -p 6901:6901 -p8888:8888 -e VNC_PW=vncpassword andkram/malmo_0_35_6
4444
```
4545

4646
You can add a `-v drive:/somedir:/somedir` option to the above docker run command to mount a directory

scripts/python-wheel/linux_macos_wheel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Optionally pass in the platform tag (e.g. manylinux1) as first arg.
2+
# Optionally pass in the platform tag (e.g. manylinux1_x86_64) as first arg.
33
if [ "$#" -eq "0" ]; then
44
plat=""
55
else

scripts/python-wheel/windows_wheel.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ copy ..\..\Minecraft\launch_minecraft_in_background.py package\malmo
88
cd package
99
python setup.py bdist_wheel
1010
del package\malmo\MalmoPython.lib package\malmo\MalmoPython.pyd
11-
twine upload package/dist/*
11+
twine upload dist/*

0 commit comments

Comments
 (0)