Skip to content

Commit 9e17d54

Browse files
EzetowersEzequiel Torres
Ezetowers
authored and
Ezequiel Torres
committed
Added Pygraphviz as a project dependency
1 parent b92c33d commit 9e17d54

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
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
100101

@@ -128,8 +129,18 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
128129
make -j4 && make install && \
129130
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
130131

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

135146
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
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
125127

@@ -153,11 +155,21 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
153155
make -j4 && make install && \
154156
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
155157

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

162174
RUN gem install fpm
163175

‎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
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
107108

@@ -135,8 +136,18 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
135136
make -j4 && make install && \
136137
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
137138

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

142153
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
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
124128

@@ -152,11 +156,21 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
152156
make -j4 && make install && \
153157
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
154158

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

161175
RUN gem install fpm
162176

‎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
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
124128

@@ -152,11 +156,21 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
152156
make -j4 && make install && \
153157
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
154158

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

161175
RUN gem install fpm
162176

‎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
RUN /opt/mlc-python-2.7.11/bin/mlc_pip install --upgrade pip
124128

@@ -152,11 +156,21 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
152156
make -j4 && make install && \
153157
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
154158

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

161175
RUN gem install fpm
162176

0 commit comments

Comments
 (0)