Skip to content

Commit fb31217

Browse files
EzetowersEzetowers
committed
Added Pygraphviz as a project dependency
1 parent 4f39750 commit fb31217

File tree

8 files changed

+94
-12
lines changed

8 files changed

+94
-12
lines changed

‎tools/installer/Dockerfiles/centos7.dockerfile‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1
9494
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
9595
tar xzvf pip-8.0.2.tar.gz && \
9696
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*
97+
rm -rf /tmp/pip-8.0.2* && \
98+
/opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
9899

99100
# Add PyQt5 Support
100101
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
@@ -126,8 +127,18 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
126127
make -j4 && make install && \
127128
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
128129

130+
RUN wget http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz && \
131+
tar xzvf graphviz-2.40.1.tar.gz && \
132+
cd graphviz-2.40.1 && \
133+
./configure --prefix=/tmp/graphviz-2.40.1 && \
134+
make -j4 && make install && \
135+
mkdir -p /opt/mlc-python-2.7.11/custom_libs /opt/mlc-python-2.7.11/custom_bins && \
136+
cp -r /tmp/graphviz-2.40.1/lib/* /opt/mlc-python-2.7.11/custom_libs && \
137+
cp -r /tmp/graphviz-2.40.1/bin/* /opt/mlc-python-2.7.11/custom_bins && \
138+
rm -rf /tmp/graphviz-2.40.1*
139+
129140
# Install mlc dependencies
130-
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install 'ipython<6.0.0' pyserial numpy nose matplotlib scipy pyyaml flask requests pyusb
141+
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install networkx pydotplus pygraphviz 'ipython<6.0.0' pyserial numpy nose matplotlib scipy pyyaml flask requests pyusb
131142
RUN gem install fpm
132143

133144
ARG RELEASE

‎tools/installer/Dockerfiles/debian8.dockerfile‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ RUN apt-get install cmake \
4747
libreadline6-dev \
4848
libreadline-dev \
4949
rubygems \
50+
pkg-config \
5051
-y
5152

5253
# Download python 2.7.11
@@ -119,7 +120,8 @@ RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1
119120
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
120121
tar xzvf pip-8.0.2.tar.gz && \
121122
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+
rm -rf /tmp/pip-8.0.2* && \
124+
/opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
123125

124126
# Add PyQt5 Support
125127
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
@@ -151,11 +153,21 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
151153
make -j4 && make install && \
152154
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
153155

156+
RUN wget http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz && \
157+
tar xzvf graphviz-2.40.1.tar.gz && \
158+
cd graphviz-2.40.1 && \
159+
./configure --prefix=/tmp/graphviz-2.40.1 && \
160+
make -j4 && make install && \
161+
mkdir -p /opt/mlc-python-2.7.11/custom_libs /opt/mlc-python-2.7.11/custom_bins && \
162+
cp -r /tmp/graphviz-2.40.1/lib/* /opt/mlc-python-2.7.11/custom_libs && \
163+
cp -r /tmp/graphviz-2.40.1/bin/* /opt/mlc-python-2.7.11/custom_bins && \
164+
rm -rf /tmp/graphviz-2.40.1*
165+
154166
# Install mlc dependencies
155167
# Create .sh who will load the desired enviroment to run nosetests within it
156168
RUN export LD_LIBRARY_PATH=/usr/local/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
157169
export PATH=/usr/local/Qt-5.7.1/bin:$PATH && \
158-
/opt/mlc-python-2.7.11/bin/mlc_pip install 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
170+
/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
159171

160172
RUN gem install fpm
161173

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ wget "https://github.com/Ezetowers/MLC/archive/v$RELEASE.tar.gz"
88
tar xzvf v$RELEASE.tar.gz -C $MLC_PATH
99
rm -rf /tmp/v$RELEASE.tar.gz
1010

11+
# Add libs and binaries used by Python before creating the .deb
12+
mkdir -p /opt/mlc-python-2.7.11/custom_bins
13+
mkdir -p /opt/mlc-python-2.7.11/custom_libs
14+
cp -r /usr/bin/dot /opt/mlc-python-2.7.11/custom_bins
15+
1116
# Add the mlc_python
1217
cp -r /opt/mlc-python-2.7.11 $MLC_PATH/mlc_python
1318
chmod a+x $MLC_PATH/mlc_python/bin/*

‎tools/installer/Dockerfiles/fedora20.dockerfile‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1
101101
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
102102
tar xzvf pip-8.0.2.tar.gz && \
103103
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*
104+
rm -rf /tmp/pip-8.0.2* && \
105+
/opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
105106

106107
# Add PyQt5 Support
107108
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
@@ -133,8 +134,18 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
133134
make -j4 && make install && \
134135
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
135136

137+
RUN wget http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz && \
138+
tar xzvf graphviz-2.40.1.tar.gz && \
139+
cd graphviz-2.40.1 && \
140+
./configure --prefix=/tmp/graphviz-2.40.1 && \
141+
make -j4 && make install && \
142+
mkdir -p /opt/mlc-python-2.7.11/custom_libs /opt/mlc-python-2.7.11/custom_bins && \
143+
cp -r /tmp/graphviz-2.40.1/lib/* /opt/mlc-python-2.7.11/custom_libs && \
144+
cp -r /tmp/graphviz-2.40.1/bin/* /opt/mlc-python-2.7.11/custom_bins && \
145+
rm -rf /tmp/graphviz-2.40.1*
146+
136147
# Install mlc dependencies
137-
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install 'ipython<6.0.0' pyserial numpy nose matplotlib scipy pyyaml flask requests pyusb
148+
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install networkx pydotplus pygraphviz 'ipython<6.0.0' pyserial numpy nose matplotlib scipy pyyaml flask requests pyusb
138149
RUN gem install fpm
139150

140151
ARG RELEASE

‎tools/installer/Dockerfiles/mlc_python_scripts/mlc_python‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
export ROOTPATH="$(dirname "$(readlink -f "$0")")/.."
33

44
# Add the correct path to the LD_LIBRARY_PATH enviroment variable
5+
export PATH=$ROOTPATH/custom_bins:$PATH
56
export LD_LIBRARY_PATH=$ROOTPATH/lib:$LD_LIBRARY_PATH
67
export LD_LIBRARY_PATH=$ROOTPATH/custom_libs:$LD_LIBRARY_PATH
78
export LD_LIBRARY_PATH=$ROOTPATH/Qt-5.7.1/lib:$LD_LIBRARY_PATH

‎tools/installer/Dockerfiles/ubuntu1404.dockerfile‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ RUN apt-get install cmake \
4646
libreadline6 \
4747
libreadline6-dev \
4848
libreadline-dev \
49+
graphviz \
50+
libgraphviz-dev \
51+
pkg-config \
4952
-y
5053

5154
# Download python 2.7.11
@@ -118,7 +121,8 @@ RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1
118121
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
119122
tar xzvf pip-8.0.2.tar.gz && \
120123
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*
124+
rm -rf /tmp/pip-8.0.2* && \
125+
/opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
122126

123127
# Add PyQt5 Support
124128
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
@@ -150,11 +154,21 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
150154
make -j4 && make install && \
151155
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
152156

157+
RUN wget http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz && \
158+
tar xzvf graphviz-2.40.1.tar.gz && \
159+
cd graphviz-2.40.1 && \
160+
./configure --prefix=/tmp/graphviz-2.40.1 && \
161+
make -j4 && make install && \
162+
mkdir -p /opt/mlc-python-2.7.11/custom_libs /opt/mlc-python-2.7.11/custom_bins && \
163+
cp -r /tmp/graphviz-2.40.1/lib/* /opt/mlc-python-2.7.11/custom_libs && \
164+
cp -r /tmp/graphviz-2.40.1/bin/* /opt/mlc-python-2.7.11/custom_bins && \
165+
rm -rf /tmp/graphviz-2.40.1*
166+
153167
# Install mlc dependencies
154168
# Create .sh who will load the desired enviroment to run nosetests within it
155169
RUN export LD_LIBRARY_PATH=/usr/local/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
156170
export PATH=/usr/local/Qt-5.7.1/bin:$PATH && \
157-
/opt/mlc-python-2.7.11/bin/mlc_pip install 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
171+
/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
158172

159173
RUN gem install fpm
160174

‎tools/installer/Dockerfiles/ubuntu1604.dockerfile‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ RUN apt-get install cmake \
4646
libreadline6 \
4747
libreadline6-dev \
4848
libreadline-dev \
49+
graphviz \
50+
libgraphviz-dev \
51+
pkg-config \
4952
-y
5053

5154
# Download python 2.7.11
@@ -118,7 +121,8 @@ RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1
118121
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
119122
tar xzvf pip-8.0.2.tar.gz && \
120123
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*
124+
rm -rf /tmp/pip-8.0.2* && \
125+
/opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
122126

123127
# Add PyQt5 Support
124128
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
@@ -150,11 +154,21 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
150154
make -j4 && make install && \
151155
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
152156

157+
RUN wget http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz && \
158+
tar xzvf graphviz-2.40.1.tar.gz && \
159+
cd graphviz-2.40.1 && \
160+
./configure --prefix=/tmp/graphviz-2.40.1 && \
161+
make -j4 && make install && \
162+
mkdir -p /opt/mlc-python-2.7.11/custom_libs /opt/mlc-python-2.7.11/custom_bins && \
163+
cp -r /tmp/graphviz-2.40.1/lib/* /opt/mlc-python-2.7.11/custom_libs && \
164+
cp -r /tmp/graphviz-2.40.1/bin/* /opt/mlc-python-2.7.11/custom_bins && \
165+
rm -rf /tmp/graphviz-2.40.1*
166+
153167
# Install mlc dependencies
154168
# Create .sh who will load the desired enviroment to run nosetests within it
155169
RUN export LD_LIBRARY_PATH=/usr/local/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
156170
export PATH=/usr/local/Qt-5.7.1/bin:$PATH && \
157-
/opt/mlc-python-2.7.11/bin/mlc_pip install 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
171+
/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
158172

159173
RUN gem install fpm
160174

‎tools/installer/Dockerfiles/ubuntu1610.dockerfile‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ RUN apt-get install cmake \
4646
libreadline6 \
4747
libreadline6-dev \
4848
libreadline-dev \
49+
graphviz \
50+
libgraphviz-dev \
51+
pkg-config \
4952
-y
5053

5154
# Download python 2.7.11
@@ -118,7 +121,8 @@ RUN wget -q https://pypi.python.org/packages/source/s/setuptools/setuptools-20.1
118121
RUN wget -q https://pypi.python.org/packages/source/p/pip/pip-8.0.2.tar.gz#md5=3a73c4188f8dbad6a1e6f6d44d117eeb && \
119122
tar xzvf pip-8.0.2.tar.gz && \
120123
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*
124+
rm -rf /tmp/pip-8.0.2* && \
125+
/opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
122126

123127
# Add PyQt5 Support
124128
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
@@ -150,11 +154,21 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
150154
make -j4 && make install && \
151155
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
152156

157+
RUN wget http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz && \
158+
tar xzvf graphviz-2.40.1.tar.gz && \
159+
cd graphviz-2.40.1 && \
160+
./configure --prefix=/tmp/graphviz-2.40.1 && \
161+
make -j4 && make install && \
162+
mkdir -p /opt/mlc-python-2.7.11/custom_libs /opt/mlc-python-2.7.11/custom_bins && \
163+
cp -r /tmp/graphviz-2.40.1/lib/* /opt/mlc-python-2.7.11/custom_libs && \
164+
cp -r /tmp/graphviz-2.40.1/bin/* /opt/mlc-python-2.7.11/custom_bins && \
165+
rm -rf /tmp/graphviz-2.40.1*
166+
153167
# Install mlc dependencies
154168
# Create .sh who will load the desired enviroment to run nosetests within it
155169
RUN export LD_LIBRARY_PATH=/usr/local/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
156170
export PATH=/usr/local/Qt-5.7.1/bin:$PATH && \
157-
/opt/mlc-python-2.7.11/bin/mlc_pip install 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
171+
/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
158172

159173
RUN gem install fpm
160174

0 commit comments

Comments
 (0)