minor fixes on building release

microsoft · Jun 12, 2018 · 9d749e1 · 9d749e1
1 parent 3b3af90
commit 9d749e1
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 deletions.
diff --git a/...amples/install_files/RunMission.csproj.in → ..._examples/install_files/RunMission.csproj b/...amples/install_files/RunMission.csproj.in → ..._examples/install_files/RunMission.csproj
diff --git a/scripts/docker/build_console_ubuntu1604_python3.dockerfile b/scripts/docker/build_console_ubuntu1604_python3.dockerfile
@@ -75,16 +75,10 @@ RUN sudo dos2unix /home/malmo/build.sh
 ENV MALMO_XSD_PATH=/home/malmo/MalmoPlatform/Schemas
 
 # Build Malmo - no install; no testing and branch specified for now!!!
-RUN /home/malmo/build.sh -boost 1_66_0 -python 3.5 -with_display -branch malmorel -no_testing
+RUN /home/malmo/build.sh -boost 1_66_0 -python 3.5 -with_display -branch master -no_testing
 
 WORKDIR /home/malmo/MalmoPlatform
 
-# TODO for now pip install package "malmo" from the test pypi web site. 
-# The pip3 install and download could be moved to docker build time.
-# Pass in --build-arg MALMOVERSION="x.x.x" to re-install
-ARG MALMOVERSION=unknown
-RUN MALMOVERSION=${MALMOVERSION} sudo pip3 install --index-url https://test.pypi.org/simple/ malmo
-
 # Install Jupyter:
 RUN sudo pip3 install jupyter
 

diff --git a/scripts/docker/install_console_ubuntu1604_python3.dockerfile b/scripts/docker/install_console_ubuntu1604_python3.dockerfile
@@ -38,7 +38,7 @@ ENV MALMO_XSD_PATH=/home/malmo/MalmoPlatform/Schemas
 # TODO for now pip install package "malmo" from the test pypi web site. 
 # Pass in --build-arg MALMOVERSION="x.x.x" to re-install
 ARG MALMOVERSION=unknown
-RUN MALMOVERSION=${MALMOVERSION} sudo pip3 install --index-url https://test.pypi.org/simple/ "malmo==0.35.5"
+RUN MALMOVERSION=${MALMOVERSION} sudo pip3 install --index-url https://test.pypi.org/simple/ "malmo==0.35.6"
 RUN python3 -c "import malmo.minecraftbootstrap;malmo.minecraftbootstrap.download(buildMod=True, branch='malmorel')"
 
 # Install Jupyter:

diff --git a/scripts/python-wheel/README.md b/scripts/python-wheel/README.md
@@ -40,7 +40,7 @@ and is set up to allow remote access via the
 so that you are able to see the Minecraft game running inside the container.
 
 ```
-docker run -it -p 5901:5901 -p 6901:6901 -p8888:8888 -e VNC_PW=vncpassword andkram/malmo_0_35_5
+docker run -it -p 5901:5901 -p 6901:6901 -p8888:8888 -e VNC_PW=vncpassword andkram/malmo_0_35_6
 ```
 
 You can add a `-v drive:/somedir:/somedir` option to the above docker run command to mount a directory 

diff --git a/scripts/python-wheel/linux_macos_wheel.sh b/scripts/python-wheel/linux_macos_wheel.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Optionally pass in the platform tag (e.g. manylinux1) as first arg.
+# Optionally pass in the platform tag (e.g. manylinux1_x86_64) as first arg.
 if [ "$#" -eq  "0" ]; then
     plat=""
 else

diff --git a/scripts/python-wheel/windows_wheel.bat b/scripts/python-wheel/windows_wheel.bat
@@ -8,4 +8,4 @@ copy ..\..\Minecraft\launch_minecraft_in_background.py package\malmo
 cd package
 python setup.py bdist_wheel
 del package\malmo\MalmoPython.lib package\malmo\MalmoPython.pyd
-twine upload package/dist/*
+twine upload dist/*