@@ -19,7 +19,7 @@ RUN yum --enablerepo=extras install epel-release -y
1919RUN yum update -y
2020
2121# Install packages
22- RUN yum install tk-devel lapack-devel cmake tcl tcl-devel expect tkinter openssh-server gcc gcc-c++ wget xz make vim openssl-devel openssh-clients rpm-build ruby-devel libpng libpng-devel sqlite-devel qt5-qtbase qt5-qtbase-devel -y
22+ RUN yum install tk-devel lapack-devel cmake tcl tcl-devel expect tkinter openssh-server gcc gcc-c++ wget xz make vim openssl-devel openssh-clients rpm-build ruby-devel libpng libpng-devel sqlite-devel qt5-qtbase qt5-qtbase-devel qt5-qtdeclarative qt5-qtdeclarative-devel -y
2323
2424# Download python 2.7.11
2525# 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
@@ -71,35 +71,16 @@ RUN echo '#!/bin/bash' >> /opt/mlc-python-2.7.11/bin/mlc_pip && \
7171 echo "fi" >> /opt/mlc-python-2.7.11/bin/mlc_pip && \
7272 chmod 755 /opt/mlc-python-2.7.11/bin/mlc_pip
7373
74-
75- # Install mlc dependencies
76- RUN /opt/mlc-python-2.7.11/bin/mlc_pip install pyserial numpy nose matplotlib scipy pyyaml flask requests
77-
78- # Create .sh who will load the desired enviroment to run nosetests within it
79- RUN echo '#!/bin/bash' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests && \
80- echo "" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
81- echo "# Add the correct path to the LD_LIBRARY_PATH enviroment variable" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
82- echo 'export LD_LIBRARY_PATH=/opt/mlc-python-2.7.11/lib:$LD_LIBRARY_PATH' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
83- echo 'NOSETESTS="/opt/mlc-python-2.7.11/bin/nosetests"' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
84- echo "" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
85- echo "# Run the dynamically compiled nosetests" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
86- echo 'if [ "$#" -ne 0 ]; then' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
87- echo ' $NOSETESTS $@' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
88- echo "else" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
89- echo ' $NOSETESTS' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
90- echo "fi" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
91- chmod 755 /opt/mlc-python-2.7.11/bin/mlc_nosetests
92-
9374# Install PyQt5 Environment
94- RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.18.1 /sip-4.18.1 .tar.gz && \
95- tar xzvf sip-4.18.1 .tar.gz && \
96- cd sip-4.18.1 && \
75+ RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19 /sip-4.19 .tar.gz && \
76+ tar xzvf sip-4.19 .tar.gz && \
77+ cd sip-4.19 && \
9778 /opt/mlc-python-2.7.11/bin/mlc_python configure.py && \
9879 make && make install
9980
100- RUN wget https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7/PyQt5_gpl-5.7.tar.gz && \
101- tar xzvf PyQt5_gpl-5.7.tar.gz && \
102- cd PyQt5_gpl-5.7 && \
81+ RUN wget https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7.1 /PyQt5_gpl-5.7.1 .tar.gz && \
82+ tar xzvf PyQt5_gpl-5.7.1. tar.gz && \
83+ cd PyQt5_gpl-5.7.1 && \
10384 /opt/mlc-python-2.7.11/bin/mlc_python configure.py --qmake /usr/bin/qmake-qt5 --confirm-license --sip /opt/mlc-python-2.7.11/bin/sip && \
10485 make && make install
10586
@@ -125,11 +106,40 @@ RUN git clone git://code.qt.io/qt/qtcharts.git && \
125106 git checkout release-2.1.0 && \
126107 /usr/bin/qmake-qt5 && make && make install
127108
128- RUN wget https://sourceforge.net/projects/pyqt/files/PyQtChart/PyQtChart-5.7/PyQtChart_gpl-5.7.tar.gz && \
129- tar xzvf PyQtChart_gpl-5.7.tar.gz && \
130- cd PyQtChart_gpl-5.7 && \
109+ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtChart/PyQtChart-5.7.1 /PyQtChart_gpl-5.7.1 .tar.gz && \
110+ tar xzvf PyQtChart_gpl-5.7.1. tar.gz && \
111+ cd PyQtChart_gpl-5.7.1 && \
131112 /opt/mlc-python-2.7.11/bin/mlc_python configure.py --qmake /usr/bin/qmake-qt5 --qtchart-version=2.1.0 --sip /opt/mlc-python-2.7.11/bin/sip && \
132113 make && make install
133114
115+ RUN git clone git://code.qt.io/qt/qtdatavis3d.git && \
116+ cd qtdatavis3d && \
117+ git checkout 5.7 && \
118+ /usr/bin/qmake-qt5 && make && make install
119+
120+ 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 && \
121+ tar xzvf PyQtDataVisualization_gpl-5.7.1.tar.gz && \
122+ cd PyQtDataVisualization_gpl-5.7.1 && \
123+ /opt/mlc-python-2.7.11/bin/mlc_python configure.py --qmake /usr/bin/qmake-qt5 --sip /opt/mlc-python-2.7.11/bin/sip && \
124+ make && make install
125+
126+ # Install mlc dependencies
127+ RUN /opt/mlc-python-2.7.11/bin/mlc_pip install pyserial numpy nose matplotlib scipy pyyaml flask requests
128+
129+ # Create .sh who will load the desired enviroment to run nosetests within it
130+ RUN echo '#!/bin/bash' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests && \
131+ echo "" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
132+ echo "# Add the correct path to the LD_LIBRARY_PATH enviroment variable" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
133+ echo 'export LD_LIBRARY_PATH=/opt/mlc-python-2.7.11/lib:$LD_LIBRARY_PATH' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
134+ echo 'NOSETESTS="/opt/mlc-python-2.7.11/bin/nosetests"' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
135+ echo "" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
136+ echo "# Run the dynamically compiled nosetests" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
137+ echo 'if [ "$#" -ne 0 ]; then' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
138+ echo ' $NOSETESTS $@' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
139+ echo "else" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
140+ echo ' $NOSETESTS' >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
141+ echo "fi" >> /opt/mlc-python-2.7.11/bin/mlc_nosetests \
142+ chmod 755 /opt/mlc-python-2.7.11/bin/mlc_nosetests
143+
134144# Install fpm and create .deb package
135- RUN gem install fpm && fpm -s dir -t rpm -v 0.4 -n mlc-python /opt/mlc-python-2.7.11
145+ RUN gem install fpm && fpm -s dir -t rpm -v 0.5 -n mlc-python /opt/mlc-python-2.7.11
0 commit comments