Skip to content

Commit f46dbca

Browse files
EzetowersEzetowers
committed
Fixes in mlc_pip, mlc_ipython, mlc_nosetests and mlc_pyuic5 scripts
1 parent 4f410a6 commit f46dbca

File tree

10 files changed

+94
-98
lines changed

10 files changed

+94
-98
lines changed

‎tools/installer/Dockerfiles/centos7.dockerfile‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ WORKDIR /tmp
1717

1818
RUN mkdir -p /opt/mlc-python-2.7.11/bin
1919

20-
# Create project structure
21-
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
22-
2320
# Update the current system
2421
RUN yum update -y
2522
RUN yum --enablerepo=extras install epel-release -y
@@ -35,18 +32,6 @@ RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
3532
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-2.7.11 && make && make install && \
3633
rm -rf /tmp/Python-2.7.11*
3734

38-
# Install Python Setuptools
39-
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
40-
tar xzvf setuptools-20.1.1.tar.gz && \
41-
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
42-
rm -rf /tmp/setuptools-20.1.1*
43-
44-
# Idem with pip
45-
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
46-
tar xzvf pip-8.0.2.tar.gz && \
47-
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
48-
rm -rf /tmp/pip-8.0.2*
49-
5035
# Install Qt5.7
5136
RUN git clone git://code.qt.io/qt/qtbase.git && \
5237
cd qtbase && \
@@ -96,6 +81,21 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
9681
cp -r ./plugins/styles/* /opt/mlc-python-2.7.11/Qt-5.7.1/plugins/styles && \
9782
rm -rf /tmp/qtstyleplugins
9883

84+
# Add Python scripts
85+
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
86+
87+
# Install Python Setuptools
88+
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
89+
tar xzvf setuptools-20.1.1.tar.gz && \
90+
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
91+
rm -rf /tmp/setuptools-20.1.1*
92+
93+
# Idem with pip
94+
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
95+
tar xzvf pip-8.0.2.tar.gz && \
96+
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
97+
rm -rf /tmp/pip-8.0.2*
98+
9999
# Add PyQt5 Support
100100
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
101101
tar xzvf sip-4.19.tar.gz && \

‎tools/installer/Dockerfiles/debian8.dockerfile‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ WORKDIR /tmp
55

66
RUN mkdir -p /opt/mlc-python-2.7.11/bin /tmp/MLC /tmp/Scripts
77

8-
# Create project structure
9-
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
10-
118
# Update the current system
129
RUN apt-get update && apt-get upgrade -y
1310

@@ -59,19 +56,6 @@ RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
5956
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-2.7.11 && make && make install && \
6057
rm -rf /tmp/Python-2.7.11*
6158

62-
# Install Python Setuptools
63-
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
64-
tar xzvf setuptools-20.1.1.tar.gz && \
65-
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
66-
rm -rf /tmp/setuptools-20.1.1*
67-
68-
69-
# Idem with pip
70-
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
71-
tar xzvf pip-8.0.2.tar.gz && \
72-
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
73-
rm -rf /tmp/pip-8.0.2*
74-
7559
# Install Qt5.7
7660
RUN git clone git://code.qt.io/qt/qtbase.git && \
7761
cd qtbase && \
@@ -122,6 +106,21 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
122106
cp -r ./plugins/styles/* /opt/mlc-python-2.7.11/Qt-5.7.1/plugins/styles && \
123107
rm -rf /tmp/qtstyleplugins
124108

109+
# Add Python scripts
110+
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
111+
112+
# Install Python Setuptools
113+
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
114+
tar xzvf setuptools-20.1.1.tar.gz && \
115+
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
116+
rm -rf /tmp/setuptools-20.1.1*
117+
118+
# Idem with pip
119+
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
120+
tar xzvf pip-8.0.2.tar.gz && \
121+
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
122+
rm -rf /tmp/pip-8.0.2*
123+
125124
# Add PyQt5 Support
126125
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
127126
tar xzvf sip-4.19.tar.gz && \

‎tools/installer/Dockerfiles/fedora20.dockerfile‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ WORKDIR /tmp
1717

1818
RUN mkdir -p /opt/mlc-python-2.7.11/bin
1919

20-
# Create project structure
21-
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
22-
2320
# Update the current system
2421
RUN yum update -y
2522
# RUN yum --enablerepo=extras install epel-release -y
@@ -42,18 +39,6 @@ RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
4239
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-2.7.11 && make && make install && \
4340
rm -rf /tmp/Python-2.7.11*
4441

45-
# Install Python Setuptools
46-
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
47-
tar xzvf setuptools-20.1.1.tar.gz && \
48-
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
49-
rm -rf /tmp/setuptools-20.1.1*
50-
51-
# Idem with pip
52-
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
53-
tar xzvf pip-8.0.2.tar.gz && \
54-
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
55-
rm -rf /tmp/pip-8.0.2*
56-
5742
# Install Qt5.7
5843
RUN git clone git://code.qt.io/qt/qtbase.git && \
5944
cd qtbase && \
@@ -103,6 +88,21 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
10388
cp -r ./plugins/styles/* /opt/mlc-python-2.7.11/Qt-5.7.1/plugins/styles && \
10489
rm -rf /tmp/qtstyleplugins
10590

91+
# Add Python scripts
92+
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
93+
94+
# Install Python Setuptools
95+
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
96+
tar xzvf setuptools-20.1.1.tar.gz && \
97+
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
98+
rm -rf /tmp/setuptools-20.1.1*
99+
100+
# Idem with pip
101+
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
102+
tar xzvf pip-8.0.2.tar.gz && \
103+
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
104+
rm -rf /tmp/pip-8.0.2*
105+
106106
# Add PyQt5 Support
107107
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
108108
tar xzvf sip-4.19.tar.gz && \

‎tools/installer/Dockerfiles/mlc_python_scripts/mlc_ipython‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export ROOTPATH="$(dirname "$(readlink -f "$0")")/.."
55
export LD_LIBRARY_PATH=$ROOTPATH/lib:$LD_LIBRARY_PATH
66
export LD_LIBRARY_PATH=$ROOTPATH/custom_libs:$LD_LIBRARY_PATH
77
export LD_LIBRARY_PATH=$ROOTPATH/Qt-5.7.1/lib:$LD_LIBRARY_PATH
8-
IPYTHON="$ROOTPATH/bin/ipython2"
8+
IPYTHON="$ROOTPATH/bin/mlc_python $ROOTPATH/bin/ipython2"
99

1010
# Run the dynamically compiled python for matlab
1111
if [ "$#" -ne 0 ]; then

‎tools/installer/Dockerfiles/mlc_python_scripts/mlc_nosetests‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export ROOTPATH="$(dirname "$(readlink -f "$0")")/.."
55
export LD_LIBRARY_PATH=$ROOTPATH/lib:$LD_LIBRARY_PATH
66
export LD_LIBRARY_PATH=$ROOTPATH/custom_libs:$LD_LIBRARY_PATH
77
export LD_LIBRARY_PATH=$ROOTPATH/Qt-5.7.1/lib:$LD_LIBRARY_PATH
8-
NOSETESTS="$ROOTPATH/bin/nosetests"
8+
NOSETESTS="$ROOTPATH/bin/mlc_python $ROOTPATH/bin/nosetests"
99

1010
# Run the dynamically compiled nosetests
1111
if [ "$#" -ne 0 ]; then

‎tools/installer/Dockerfiles/mlc_python_scripts/mlc_pip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export ROOTPATH="$(dirname "$(readlink -f "$0")")/.."
55
export LD_LIBRARY_PATH=$ROOTPATH/lib:$LD_LIBRARY_PATH
66
export LD_LIBRARY_PATH=$ROOTPATH/custom_libs:$LD_LIBRARY_PATH
77
export LD_LIBRARY_PATH=$ROOTPATH/Qt-5.7.1/lib:$LD_LIBRARY_PATH
8-
PIP="$ROOTPATH/bin/pip2.7"
8+
PIP="$ROOTPATH/bin/mlc_python $ROOTPATH/bin/pip2.7"
99

1010
# Run the dynamically compiled pip
1111
if [ "$#" -ne 0 ]; then

‎tools/installer/Dockerfiles/mlc_python_scripts/mlc_pyuic5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export ROOTPATH="$(dirname "$(readlink -f "$0")")/.."
55
export LD_LIBRARY_PATH=$ROOTPATH/lib:$LD_LIBRARY_PATH
66
export LD_LIBRARY_PATH=$ROOTPATH/custom_libs:$LD_LIBRARY_PATH
77
export LD_LIBRARY_PATH=$ROOTPATH/Qt-5.7.1/lib:$LD_LIBRARY_PATH
8-
PYUIC="$ROOTPATH/bin/pyuic5"
8+
PYUIC="$ROOTPATH/bin/mlc_python $ROOTPATH/bin/pyuic5"
99

1010
# Run the dynamically compiled pip
1111
if [ "$#" -ne 0 ]; then

‎tools/installer/Dockerfiles/ubuntu1404.dockerfile‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ WORKDIR /tmp
55

66
RUN mkdir -p /opt/mlc-python-2.7.11/bin
77

8-
# Create project structure
9-
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
10-
118
# Update the current system
129
RUN apt-get update && apt-get upgrade -y
1310

@@ -58,19 +55,6 @@ RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
5855
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-2.7.11 && make && make install && \
5956
rm -rf /tmp/Python-2.7.11*
6057

61-
# Install Python Setuptools
62-
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
63-
tar xzvf setuptools-20.1.1.tar.gz && \
64-
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
65-
rm -rf /tmp/setuptools-20.1.1*
66-
67-
68-
# Idem with pip
69-
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
70-
tar xzvf pip-8.0.2.tar.gz && \
71-
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
72-
rm -rf /tmp/pip-8.0.2*
73-
7458
# Install Qt5.7
7559
RUN git clone git://code.qt.io/qt/qtbase.git && \
7660
cd qtbase && \
@@ -121,6 +105,21 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
121105
cp -r ./plugins/styles/* /opt/mlc-python-2.7.11/Qt-5.7.1/plugins/styles && \
122106
rm -rf /tmp/qtstyleplugins
123107

108+
# Add Python scripts
109+
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
110+
111+
# Install Python Setuptools
112+
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
113+
tar xzvf setuptools-20.1.1.tar.gz && \
114+
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
115+
rm -rf /tmp/setuptools-20.1.1*
116+
117+
# Idem with pip
118+
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
119+
tar xzvf pip-8.0.2.tar.gz && \
120+
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
121+
rm -rf /tmp/pip-8.0.2*
122+
124123
# Add PyQt5 Support
125124
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
126125
tar xzvf sip-4.19.tar.gz && \

‎tools/installer/Dockerfiles/ubuntu1604.dockerfile‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ WORKDIR /tmp
55

66
RUN mkdir -p /opt/mlc-python-2.7.11/bin /tmp/MLC /tmp/Scripts
77

8-
# Create project structure
9-
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
10-
118
# Update the current system
129
RUN apt-get update && apt-get upgrade -y
1310

@@ -58,19 +55,6 @@ RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
5855
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-2.7.11 && make && make install && \
5956
rm -rf /tmp/Python-2.7.11*
6057

61-
# Install Python Setuptools
62-
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
63-
tar xzvf setuptools-20.1.1.tar.gz && \
64-
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
65-
rm -rf /tmp/setuptools-20.1.1*
66-
67-
68-
# Idem with pip
69-
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
70-
tar xzvf pip-8.0.2.tar.gz && \
71-
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
72-
rm -rf /tmp/pip-8.0.2*
73-
7458
# Install Qt5.7
7559
RUN git clone git://code.qt.io/qt/qtbase.git && \
7660
cd qtbase && \
@@ -121,6 +105,21 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
121105
cp -r ./plugins/styles/* /opt/mlc-python-2.7.11/Qt-5.7.1/plugins/styles && \
122106
rm -rf /tmp/qtstyleplugins
123107

108+
# Add Python scripts
109+
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
110+
111+
# Install Python Setuptools
112+
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
113+
tar xzvf setuptools-20.1.1.tar.gz && \
114+
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
115+
rm -rf /tmp/setuptools-20.1.1*
116+
117+
# Idem with pip
118+
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
119+
tar xzvf pip-8.0.2.tar.gz && \
120+
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
121+
rm -rf /tmp/pip-8.0.2*
122+
124123
# Add PyQt5 Support
125124
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
126125
tar xzvf sip-4.19.tar.gz && \

‎tools/installer/Dockerfiles/ubuntu1610.dockerfile‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ WORKDIR /tmp
55

66
RUN mkdir -p /opt/mlc-python-2.7.11/bin
77

8-
# Create project structure
9-
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
10-
118
# Update the current system
129
RUN apt-get update && apt-get upgrade -y
1310

@@ -58,19 +55,6 @@ RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
5855
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-2.7.11 && make && make install && \
5956
rm -rf /tmp/Python-2.7.11*
6057

61-
# Install Python Setuptools
62-
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
63-
tar xzvf setuptools-20.1.1.tar.gz && \
64-
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
65-
rm -rf /tmp/setuptools-20.1.1*
66-
67-
68-
# Idem with pip
69-
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
70-
tar xzvf pip-8.0.2.tar.gz && \
71-
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
72-
rm -rf /tmp/pip-8.0.2*
73-
7458
# Install Qt5.7
7559
RUN git clone git://code.qt.io/qt/qtbase.git && \
7660
cd qtbase && \
@@ -121,6 +105,21 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
121105
cp -r ./plugins/styles/* /opt/mlc-python-2.7.11/Qt-5.7.1/plugins/styles && \
122106
rm -rf /tmp/qtstyleplugins
123107

108+
# Add Python scripts
109+
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
110+
111+
# Install Python Setuptools
112+
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
113+
tar xzvf setuptools-20.1.1.tar.gz && \
114+
cd setuptools-20.1.1 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
115+
rm -rf /tmp/setuptools-20.1.1*
116+
117+
# Idem with pip
118+
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
119+
tar xzvf pip-8.0.2.tar.gz && \
120+
cd pip-8.0.2 && /opt/mlc-python-2.7.11/bin/mlc_python setup.py build && /opt/mlc-python-2.7.11/bin/mlc_python setup.py install && \
121+
rm -rf /tmp/pip-8.0.2*
122+
124123
# Add PyQt5 Support
125124
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
126125
tar xzvf sip-4.19.tar.gz && \

0 commit comments

Comments
 (0)