Skip to content

Commit d445c86

Browse files
EzetowersEzetowers
committed
Deploy modified to Python3
1 parent 317e800 commit d445c86

15 files changed

Lines changed: 288 additions & 259 deletions

‎tools/installer/Dockerfiles/centos7.dockerfile‎

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CMD ["/usr/sbin/init"]
1515

1616
WORKDIR /tmp
1717

18-
RUN mkdir -p /opt/mlc-python-2.7.11/bin
18+
RUN mkdir -p /opt/mlc-python-3.6.2/bin
1919

2020
# Update the current system
2121
RUN yum update -y
@@ -29,107 +29,90 @@ RUN yum install libxkbcommon tk-devel lapack-devel cmake tcl tcl-devel expect tk
2929
# For more information about the compilation of the Python: http://www.mathworks.com/help/matlab/matlab_external/system-requirements-for-matlab-engine-for-python.html?requestedDomain=www.mathworks.com
3030
RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
3131
tar xJvf Python-2.7.11.tar.xz && \
32-
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-2.7.11 && make && make install && \
32+
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
3333
rm -rf /tmp/Python-2.7.11*
3434

3535
# Install Qt5.7
3636
RUN git clone git://code.qt.io/qt/qtbase.git && \
3737
cd qtbase && \
3838
git checkout 5.7 && \
39-
./configure --prefix=/opt/mlc-python-2.7.11/Qt-5.7.1 -xkb-config-root /usr/share/X11/xkb -no-gtk -nomake tests -nomake examples -qt-xcb --opensource --confirm-license && make -j4 && make install && \
39+
./configure --prefix=/opt/mlc-python-3.6.2/Qt-5.7.1 -xkb-config-root /usr/share/X11/xkb -no-gtk -nomake tests -nomake examples -qt-xcb --opensource --confirm-license && make -j4 && make install && \
4040
rm -rf /tmp/qtbase
4141

4242
RUN git clone git://code.qt.io/qt/qttools.git && \
4343
cd qttools && \
4444
git checkout 5.7 && \
45-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
45+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
4646
rm -rf /tmp/qttools
4747

4848
RUN git clone git://code.qt.io/qt/qtcharts.git && \
4949
cd qtcharts && \
5050
git checkout 5.7 && \
51-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
51+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
5252
rm -rf /tmp/qtcharts
5353

5454
RUN git clone git://code.qt.io/qt/qtdatavis3d.git && \
5555
cd qtdatavis3d && \
5656
git checkout 5.7 && \
57-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
57+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
5858
rm -rf /tmp/qtdatavis3d
5959

6060
RUN git clone git://code.qt.io/qt/qtdeclarative.git && \
6161
cd qtdeclarative && \
6262
git checkout 5.7 && \
63-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
63+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
6464
rm -rf /tmp/qtdeclarative
6565

6666
RUN git clone git://code.qt.io/qt/qtx11extras.git && \
6767
cd qtx11extras && \
6868
git checkout 5.7 && \
69-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
69+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
7070
rm -rf /tmp/qtx11extras
7171

7272
RUN git clone https://github.com/Ezetowers/qt5ct.git && \
7373
cd qt5ct && \
74-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake PREFIX=/opt/mlc-python-2.7.11/qt5ct && make -j4 && make install && \
74+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake PREFIX=/opt/mlc-python-3.6.2/qt5ct && make -j4 && make install && \
7575
rm -rf /tmp/qt5ct
7676

7777
RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
7878
cd qtstyleplugins && \
79-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake && make && \
80-
mkdir -p /opt/mlc-python-2.7.11/Qt-5.7.1/plugins/styles && \
81-
cp -r ./plugins/styles/* /opt/mlc-python-2.7.11/Qt-5.7.1/plugins/styles && \
79+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake && make && \
80+
mkdir -p /opt/mlc-python-3.6.2/Qt-5.7.1/plugins/styles && \
81+
cp -r ./plugins/styles/* /opt/mlc-python-3.6.2/Qt-5.7.1/plugins/styles && \
8282
rm -rf /tmp/qtstyleplugins
8383

8484
# Add Python scripts
85-
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
85+
ADD mlc_python_scripts/* /opt/mlc-python-3.6.2/bin/
8686

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*
87+
RUN /opt/mlc-python-3.6.2/bin/mlc_pip install --upgrade pip
9288

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-
99-
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
100-
101-
<<<<<<< HEAD
102-
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
103-
104-
=======
105-
>>>>>>> individual_tree_visualization
10689
# Add PyQt5 Support
10790
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
10891
tar xzvf sip-4.19.tar.gz && \
10992
cd sip-4.19 && \
110-
/opt/mlc-python-2.7.11/bin/mlc_python configure.py && \
93+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py && \
11194
make -j4 && make install && \
11295
rm -rf /tmp/sip-4.19*
11396

11497
RUN wget https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7.1/PyQt5_gpl-5.7.1.tar.gz && \
11598
tar xzvf PyQt5_gpl-5.7.1.tar.gz && \
11699
cd PyQt5_gpl-5.7.1 && \
117-
/opt/mlc-python-2.7.11/bin/mlc_python configure.py --qmake /opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake --confirm-license --sip /opt/mlc-python-2.7.11/bin/sip && \
100+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake --confirm-license --sip /opt/mlc-python-3.6.2/bin/sip && \
118101
make -j4 && make install && \
119102
rm -rf /tmp/PyQt5_gpl-5.7.1*
120103

121104
# Add PyQt5 Charts
122105
RUN wget https://sourceforge.net/projects/pyqt/files/PyQtChart/PyQtChart-5.7.1/PyQtChart_gpl-5.7.1.tar.gz && \
123106
tar xzvf PyQtChart_gpl-5.7.1.tar.gz && \
124107
cd PyQtChart_gpl-5.7.1 && \
125-
/opt/mlc-python-2.7.11/bin/mlc_python configure.py --qmake /opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake --sip /opt/mlc-python-2.7.11/bin/sip && \
108+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake --sip /opt/mlc-python-3.6.2/bin/sip && \
126109
make -j4 && make install && \
127110
rm -rf /tmp/PyQtChart_gpl-5.7.1*
128111

129112
RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtDataVisualization-5.7.1/PyQtDataVisualization_gpl-5.7.1.tar.gz/download -O PyQtDataVisualization_gpl-5.7.1.tar.gz && \
130113
tar xzvf PyQtDataVisualization_gpl-5.7.1.tar.gz && \
131114
cd PyQtDataVisualization_gpl-5.7.1 && \
132-
/opt/mlc-python-2.7.11/bin/mlc_python configure.py --qmake /opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake --sip /opt/mlc-python-2.7.11/bin/sip && \
115+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake --sip /opt/mlc-python-3.6.2/bin/sip && \
133116
make -j4 && make install && \
134117
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
135118

@@ -142,24 +125,26 @@ RUN wget http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar
142125
# Install mlc dependencies
143126
# Create .sh who will load the desired enviroment to run nosetests within it
144127
RUN export CFLAGS="-I/tmp/graphviz-2.40.1/include" \
145-
export LD_LIBRARY_PATH=/opt/mlc-python-2.7.11/custom_libs:$LD_LIBRARY_PATH && \
146-
export LD_LIBRARY_PATH=/opt/mlc-python-2.7.11/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
128+
export LD_LIBRARY_PATH=/opt/mlc-python-3.6.2/custom_libs:$LD_LIBRARY_PATH && \
129+
export LD_LIBRARY_PATH=/opt/mlc-python-3.6.2/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
147130
export LD_LIBRARY_PATH=/tmp/graphviz-2.40.1/lib:$LD_LIBRARY_PATH && \
148131
export PKG_CONFIG_PATH=/tmp/graphviz-2.40.1/lib/pkgconfig:$PKG_CONFIG_PATH && \
149-
export PATH=/opt/mlc-python-2.7.11/Qt-5.7.1/bin:$PATH && \
150-
export PATH=/opt/mlc-python-2.7.11/custom_bins:$PATH && \
132+
export PATH=/opt/mlc-python-3.6.2/Qt-5.7.1/bin:$PATH && \
133+
export PATH=/opt/mlc-python-3.6.2/custom_bins:$PATH && \
151134
export PATH=/tmp/graphviz-2.40.1/bin:$PATH && \
152-
/opt/mlc-python-2.7.11/bin/mlc_pip install networkx pydotplus pygraphviz 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
135+
/opt/mlc-python-3.6.2/bin/mlc_pip install networkx pydotplus pygraphviz 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
153136

154-
RUN mkdir -p /opt/mlc-python-2.7.11/custom_libs /opt/mlc-python-2.7.11/custom_bins && \
155-
cp -r /tmp/graphviz-2.40.1/lib/*.so* /tmp/graphviz-2.40.1/lib/graphviz /opt/mlc-python-2.7.11/custom_libs && \
156-
cp -r /tmp/graphviz-2.40.1/bin/* /opt/mlc-python-2.7.11/custom_bins && \
137+
RUN mkdir -p /opt/mlc-python-3.6.2/custom_libs /opt/mlc-python-3.6.2/custom_bins && \
138+
cp -r /tmp/graphviz-2.40.1/lib/*.so* /tmp/graphviz-2.40.1/lib/graphviz /opt/mlc-python-3.6.2/custom_libs && \
139+
cp -r /tmp/graphviz-2.40.1/bin/* /opt/mlc-python-3.6.2/custom_bins && \
157140
rm -rf /tmp/graphviz-2.40.1*
158141

159142
RUN gem install fpm
160143

161144
ARG RELEASE
162-
ENV RELEASE ${RELEASE}
145+
ARG PYTHON_VERSION
146+
ENV RELEASE=${RELEASE}
147+
ENV PYTHON_VERSION=${PYTHON_VERSION}
163148
ENV OS_VERSION centos-7
164149
ENV PACKAGE_TYPE rpm
165150
ADD deploy_scripts/* /tmp/deploy_scripts/

‎tools/installer/Dockerfiles/debian8.dockerfile‎

Lines changed: 29 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM debian:8
33

44
WORKDIR /tmp
55

6-
RUN mkdir -p /opt/mlc-python-2.7.11/bin /tmp/MLC /tmp/Scripts
6+
RUN mkdir -p /opt/mlc-python-3.6.2/bin
77

88
# Update the current system
99
RUN apt-get update && apt-get upgrade -y
@@ -54,103 +54,91 @@ RUN apt-get install cmake \
5454
# For more information about the compilation of the Python: http://www.mathworks.com/help/matlab/matlab_external/system-requirements-for-matlab-engine-for-python.html?requestedDomain=www.mathworks.com
5555
RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
5656
tar xJvf Python-2.7.11.tar.xz && \
57-
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-2.7.11 && make && make install && \
57+
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
5858
rm -rf /tmp/Python-2.7.11*
5959

6060
# Install Qt5.7
6161
RUN git clone git://code.qt.io/qt/qtbase.git && \
6262
cd qtbase && \
6363
git checkout 5.7 && \
64-
./configure --prefix=/opt/mlc-python-2.7.11/Qt-5.7.1 -xkb-config-root /usr/share/X11/xkb -no-gtk -nomake tests -nomake examples -qt-xcb --opensource --confirm-license && \
64+
./configure --prefix=/opt/mlc-python-3.6.2/Qt-5.7.1 -xkb-config-root /usr/share/X11/xkb -no-gtk -nomake tests -nomake examples -qt-xcb --opensource --confirm-license && \
6565
make -j4 && make install && \
6666
rm -rf /tmp/qtbase
6767

6868
RUN git clone git://code.qt.io/qt/qttools.git && \
6969
cd qttools && \
7070
git checkout 5.7 && \
71-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
71+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
7272
rm -rf /tmp/qttools
7373

7474
RUN git clone git://code.qt.io/qt/qtcharts.git && \
7575
cd qtcharts && \
7676
git checkout 5.7 && \
77-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
77+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
7878
rm -rf /tmp/qtcharts
7979

8080
RUN git clone git://code.qt.io/qt/qtdatavis3d.git && \
8181
cd qtdatavis3d && \
8282
git checkout 5.7 && \
83-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
83+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
8484
rm -rf /tmp/qtdatavis3d
8585

8686
RUN git clone git://code.qt.io/qt/qtdeclarative.git && \
8787
cd qtdeclarative && \
8888
git checkout 5.7 && \
89-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
89+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
9090
rm -rf /tmp/qtdeclarative
9191

9292
RUN git clone git://code.qt.io/qt/qtx11extras.git && \
9393
cd qtx11extras && \
9494
git checkout 5.7 && \
95-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
95+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
9696
rm -rf /tmp/qtx11extras
9797

9898
RUN git clone https://github.com/Ezetowers/qt5ct.git && \
9999
cd qt5ct && \
100-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake PREFIX=/opt/mlc-python-2.7.11/qt5ct && make -j4 && make install && \
100+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake PREFIX=/opt/mlc-python-3.6.2/qt5ct && make -j4 && make install && \
101101
rm -rf /tmp/qt5ct
102102

103103
RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
104104
cd qtstyleplugins && \
105-
/opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake && make && \
106-
mkdir -p /opt/mlc-python-2.7.11/Qt-5.7.1/plugins/styles && \
107-
cp -r ./plugins/styles/* /opt/mlc-python-2.7.11/Qt-5.7.1/plugins/styles && \
105+
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake && make && \
106+
mkdir -p /opt/mlc-python-3.6.2/Qt-5.7.1/plugins/styles && \
107+
cp -r ./plugins/styles/* /opt/mlc-python-3.6.2/Qt-5.7.1/plugins/styles && \
108108
rm -rf /tmp/qtstyleplugins
109109

110110
# Add Python scripts
111-
ADD mlc_python_scripts/* /opt/mlc-python-2.7.11/bin/
111+
ADD mlc_python_scripts/* /opt/mlc-python-3.6.2/bin/
112112

113-
# Install Python Setuptools
114-
RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1.1.tar.gz#md5=10a0f4feb9f2ea99acf634c8d7136d6d && \
115-
tar xzvf setuptools-20.1.1.tar.gz && \
116-
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 && \
117-
rm -rf /tmp/setuptools-20.1.1*
118-
119-
# Idem with pip
120-
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
121-
tar xzvf pip-8.0.2.tar.gz && \
122-
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 && \
123-
rm -rf /tmp/pip-8.0.2*
124-
125-
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
113+
RUN /opt/mlc-python-3.6.2/bin/mlc_pip install --upgrade pip
126114

127115
# Add PyQt5 Support
128116
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
129117
tar xzvf sip-4.19.tar.gz && \
130118
cd sip-4.19 && \
131-
/opt/mlc-python-2.7.11/bin/mlc_python configure.py && \
119+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py && \
132120
make -j4 && make install && \
133121
rm -rf /tmp/sip-4.19*
134122

135123
RUN wget https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7.1/PyQt5_gpl-5.7.1.tar.gz && \
136124
tar xzvf PyQt5_gpl-5.7.1.tar.gz && \
137125
cd PyQt5_gpl-5.7.1 && \
138-
/opt/mlc-python-2.7.11/bin/mlc_python configure.py --qmake /opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake --confirm-license --sip /opt/mlc-python-2.7.11/bin/sip && \
126+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake --confirm-license --sip /opt/mlc-python-3.6.2/bin/sip && \
139127
make -j4 && make install && \
140128
rm -rf /tmp/PyQt5_gpl-5.7.1*
141129

142130
# Add PyQt5 Charts
143131
RUN wget https://sourceforge.net/projects/pyqt/files/PyQtChart/PyQtChart-5.7.1/PyQtChart_gpl-5.7.1.tar.gz && \
144132
tar xzvf PyQtChart_gpl-5.7.1.tar.gz && \
145133
cd PyQtChart_gpl-5.7.1 && \
146-
/opt/mlc-python-2.7.11/bin/mlc_python configure.py --qmake /opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake --sip /opt/mlc-python-2.7.11/bin/sip && \
134+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake --sip /opt/mlc-python-3.6.2/bin/sip && \
147135
make -j4 && make install && \
148136
rm -rf /tmp/PyQtChart_gpl-5.7.1*
149137

150138
RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtDataVisualization-5.7.1/PyQtDataVisualization_gpl-5.7.1.tar.gz/download -O PyQtDataVisualization_gpl-5.7.1.tar.gz && \
151139
tar xzvf PyQtDataVisualization_gpl-5.7.1.tar.gz && \
152140
cd PyQtDataVisualization_gpl-5.7.1 && \
153-
/opt/mlc-python-2.7.11/bin/mlc_python configure.py --qmake /opt/mlc-python-2.7.11/Qt-5.7.1/bin/qmake --sip /opt/mlc-python-2.7.11/bin/sip && \
141+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake --sip /opt/mlc-python-3.6.2/bin/sip && \
154142
make -j4 && make install && \
155143
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
156144

@@ -163,24 +151,26 @@ RUN wget http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar
163151
# Install mlc dependencies
164152
# Create .sh who will load the desired enviroment to run nosetests within it
165153
RUN export CFLAGS="-I/tmp/graphviz-2.40.1/include" \
166-
export LD_LIBRARY_PATH=/opt/mlc-python-2.7.11/custom_libs:$LD_LIBRARY_PATH && \
167-
export LD_LIBRARY_PATH=/opt/mlc-python-2.7.11/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
154+
export LD_LIBRARY_PATH=/opt/mlc-python-3.6.2/custom_libs:$LD_LIBRARY_PATH && \
155+
export LD_LIBRARY_PATH=/opt/mlc-python-3.6.2/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
168156
export LD_LIBRARY_PATH=/tmp/graphviz-2.40.1/lib:$LD_LIBRARY_PATH && \
169157
export PKG_CONFIG_PATH=/tmp/graphviz-2.40.1/lib/pkgconfig:$PKG_CONFIG_PATH && \
170-
export PATH=/opt/mlc-python-2.7.11/Qt-5.7.1/bin:$PATH && \
171-
export PATH=/opt/mlc-python-2.7.11/custom_bins:$PATH && \
158+
export PATH=/opt/mlc-python-3.6.2/Qt-5.7.1/bin:$PATH && \
159+
export PATH=/opt/mlc-python-3.6.2/custom_bins:$PATH && \
172160
export PATH=/tmp/graphviz-2.40.1/bin:$PATH && \
173-
/opt/mlc-python-2.7.11/bin/mlc_pip install networkx pydotplus pygraphviz 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
161+
/opt/mlc-python-3.6.2/bin/mlc_pip install networkx pydotplus pygraphviz 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
174162

175-
RUN mkdir -p /opt/mlc-python-2.7.11/custom_libs /opt/mlc-python-2.7.11/custom_bins && \
176-
cp -r /tmp/graphviz-2.40.1/lib/*.so* /tmp/graphviz-2.40.1/lib/graphviz /opt/mlc-python-2.7.11/custom_libs && \
177-
cp -r /tmp/graphviz-2.40.1/bin/* /opt/mlc-python-2.7.11/custom_bins && \
163+
RUN mkdir -p /opt/mlc-python-3.6.2/custom_libs /opt/mlc-python-3.6.2/custom_bins && \
164+
cp -r /tmp/graphviz-2.40.1/lib/*.so* /tmp/graphviz-2.40.1/lib/graphviz /opt/mlc-python-3.6.2/custom_libs && \
165+
cp -r /tmp/graphviz-2.40.1/bin/* /opt/mlc-python-3.6.2/custom_bins && \
178166
rm -rf /tmp/graphviz-2.40.1*
179167

180168
RUN gem install fpm
181169

182170
ARG RELEASE
183-
ENV RELEASE ${RELEASE}
171+
ARG PYTHON_VERSION
172+
ENV RELEASE=${RELEASE}
173+
ENV PYTHON_VERSION=${PYTHON_VERSION}
184174
ENV OS_VERSION debian-8
185175
ENV PACKAGE_TYPE deb
186176
ADD deploy_scripts/* /tmp/deploy_scripts/

‎tools/installer/Dockerfiles/deploy_scripts/create_MLC_folder.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ mv $MLC_PATH/OpenMLC-Python-$RELEASE $MLC_PATH/MLC-$RELEASE
1010
rm -rf /tmp/v$RELEASE.tar.gz
1111

1212
# Add libs and binaries used by Python before creating the .deb
13-
mkdir -p /opt/mlc-python-2.7.11/custom_bins
14-
mkdir -p /opt/mlc-python-2.7.11/custom_libs
15-
cp -r /usr/bin/dot /opt/mlc-python-2.7.11/custom_bins
13+
mkdir -p /opt/mlc-python-$PYTHON_VERSION/custom_bins
14+
mkdir -p /opt/mlc-python-$PYTHON_VERSION/custom_libs
15+
cp -r /usr/bin/dot /opt/mlc-python-$PYTHON_VERSION/custom_bins
1616

1717
# Add the mlc_python
18-
cp -r /opt/mlc-python-2.7.11 $MLC_PATH/mlc_python
18+
cp -r /opt/mlc-python-$PYTHON_VERSION $MLC_PATH/mlc_python
1919
chmod a+x $MLC_PATH/mlc_python/bin/*
2020

2121
# Add project scripts
@@ -55,6 +55,6 @@ rm -rf $MLC_PATH/Qt-5.7.1/mkspecs
5555

5656
# Create the MLC Package
5757
tar cJvpf /tmp/MLC-$RELEASE-$OS_VERSION.tar.xz -C /tmp MLC-$RELEASE
58-
fpm -s dir -t $PACKAGE_TYPE -v $RELEASE -n mlc-python-$OS_VERSION /opt/mlc-python-2.7.11
58+
fpm -s dir -t $PACKAGE_TYPE -v $RELEASE -n mlc-python-$OS_VERSION /opt/mlc-python-$PYTHON_VERSION
5959
mv /tmp/MLC-$RELEASE/*.deb /tmp/release
60-
mv /tmp/*.tar.xz /tmp/release
60+
mv /tmp/*.tar.xz /tmp/release

0 commit comments

Comments
 (0)