Merge branch 'individual_tree_visualization'

Author: Ezequiel Torres

.gitignore

@@ -30,3 +30,5 @@ MLC/GUI/workspace
 
 # Ignore the Qtcreator user configuration file
 *.pro.user
+
+tools/installer/Dockerfiles/release/*

tools/installer/Dockerfiles/README

@@ -2,4 +2,4 @@
 docker build -f ubuntu1604.dockerfile -t mlc_ubuntu:16.04 --build-arg RELEASE=0.0.2 .
 
 # Then get the .tar.gz related with the OS running the docker container
-docker run --rm -it mlc_ubuntu:16.04 bash
+docker run --rm -v $(pwd)/release:/tmp/release -it mlc_ubuntu:16.04 bash

tools/installer/Dockerfiles/centos7.dockerfile

@@ -98,8 +98,11 @@ RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3
 
 RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
 
+<<<<<<< HEAD
 RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
 
+=======
+>>>>>>> individual_tree_visualization
 # Add PyQt5 Support
 RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
     tar xzvf sip-4.19.tar.gz && \

tools/installer/Dockerfiles/debian8.dockerfile

@@ -124,8 +124,6 @@ RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3
 
 RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
 
-RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
-
 # Add PyQt5 Support
 RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
     tar xzvf sip-4.19.tar.gz && \

tools/installer/Dockerfiles/deploy_scripts/create_MLC_folder.sh

@@ -6,6 +6,7 @@ mkdir -p $MLC_PATH/tools
 # Download the MLC code from Github
 wget "https://github.com/Ezetowers/MLC/archive/v$RELEASE.tar.gz"
 tar xzvf v$RELEASE.tar.gz -C $MLC_PATH
+mv $MLC_PATH/OpenMLC-Python-$RELEASE $MLC_PATH/MLC-$RELEASE
 rm -rf /tmp/v$RELEASE.tar.gz
 
 # Add libs and binaries used by Python before creating the .deb
@@ -55,4 +56,5 @@ rm -rf $MLC_PATH/Qt-5.7.1/mkspecs
 # Create the MLC Package
 tar cJvpf /tmp/MLC-$RELEASE-$OS_VERSION.tar.xz -C /tmp MLC-$RELEASE
 fpm -s dir -t $PACKAGE_TYPE -v $RELEASE -n mlc-python-$OS_VERSION /opt/mlc-python-2.7.11
-bash
+mv /tmp/MLC-$RELEASE/*.deb /tmp/release
+mv /tmp/*.tar.xz /tmp/release

tools/installer/Dockerfiles/fedora20.dockerfile

@@ -105,8 +105,6 @@ RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3
 
 RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
 
-RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
-
 # Add PyQt5 Support
 RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
     tar xzvf sip-4.19.tar.gz && \

tools/installer/Dockerfiles/release/README

@@ -0,0 +1 @@
+Releases comes here

tools/installer/Dockerfiles/ubuntu1404.dockerfile

@@ -125,8 +125,6 @@ RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3
 
 RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
 
-RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
-
 # Add PyQt5 Support
 RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
     tar xzvf sip-4.19.tar.gz && \

tools/installer/Dockerfiles/ubuntu1604.dockerfile

@@ -125,8 +125,6 @@ RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3
 
 RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
 
-RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
-
 # Add PyQt5 Support
 RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
     tar xzvf sip-4.19.tar.gz && \

tools/installer/Dockerfiles/ubuntu1610.dockerfile

@@ -125,8 +125,6 @@ RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3
 
 RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
 
-RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
-
 # Add PyQt5 Support
 RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
     tar xzvf sip-4.19.tar.gz && \