Remove networkx dependency

Conflicts:

	util/install.sh

closes #100
This commit is contained in:
ryanc
2013-05-22 15:24:22 -07:00
committed by Bob Lantz
parent 1ea5c91fcc
commit 65c35b6595
4 changed files with 26 additions and 16 deletions
+1 -6
View File
@@ -123,14 +123,9 @@ function kernel_clean {
function mn_deps {
echo "Installing Mininet dependencies"
$install gcc make socat psmisc xterm ssh iperf iproute telnet \
python-setuptools python-networkx cgroup-bin ethtool help2man \
python-setuptools cgroup-bin ethtool help2man \
pyflakes pylint pep8
if [ "$DIST" = "Ubuntu" ] && [ "$RELEASE" = "10.04" ]; then
echo "Upgrading networkx to avoid deprecation warning"
sudo easy_install --upgrade networkx
fi
# Add sysctl parameters as noted in the INSTALL file to increase kernel
# limits to support larger setups:
if ! grep Mininet /etc/sysctl.conf; then