From 7137010b13dcede2f6efcff0be902e1676b40144 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 5 Jun 2015 15:29:22 +0200
Subject: [PATCH] release 3.2.2 - pip package hopefully has dependencies dealt
 with by pip

---
 .gitignore                       |  2 ++
 Makefile                         | 18 ++++++++++++++----
 VERSION                          |  2 +-
 setup.py                         |  8 +++++++-
 src/nepi/resources/linux/node.py |  2 +-
 5 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..0ac64c4d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+dist/*.gz
+MANIFEST
diff --git a/Makefile b/Makefile
index 118c778b..100dcdb6 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,8 @@ dist: MANIFEST
 .PHONY: all clean distclean dist test coverage install MANIFEST
 
 ########## for uploading onto pypi
-# use pypitest instead for tests (both entries need to be defined in your .pypirc)
+# this assumes you have an entry 'pypi' in your .pypirc
+# see pypi documentation on how to create .pypirc
 PYPI_TARGET=pypi
 PYPI_TARBALL_HOST=root@build.onelab.eu
 PYPI_TARBALL_TOPDIR=/build/nepi
@@ -75,7 +76,16 @@ VERSIONTAG=$(shell cat VERSION)
 
 # run this only once the sources are in on the right tag
 pypi: 
-	setup.py sdist upload -r $(PYPI_TARGET)
-	ssh $(PYPI_TARBALL_HOST) mkdir -p $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
-	rsync -av dist/nepi-$(VERSIONTAG).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/
+	setup.py sdist upload -r pypi
+	@if [ ssh $(PYPI_TARBALL_HOST) ls $(PYPI_TARBALL_TOPDIR)/nepi-$(VERSIONTAG).tar.gz ] ;\
+	  then echo "nepi-$(VERSIONTAG).tar.gz already present on $(PYPI_TARBALL_HOST) - ignored" ;\
+	  else rsync -av dist/nepi-$(VERSIONTAG).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/ ;\
+	  fi
 
+
+# it can be convenient to define a test entry, say testpypi
+# that points at the testpypi public site
+# in this case we do not want to upload anything on the build box though
+
+testpypi: 
+	setup.py sdist upload -r testpypi
diff --git a/VERSION b/VERSION
index e4604e3a..be94e6f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.1
+3.2.2
diff --git a/setup.py b/setup.py
index 7821ac9e..c4311b49 100755
--- a/setup.py
+++ b/setup.py
@@ -52,5 +52,11 @@ setup(
         "nepi.resources.planetlab" : [ "scripts/*.py" ],
         "nepi.resources.linux" : [ "scripts/*.py" ],
         "nepi.resources.linux.ns3" : [ "dependencies/*.tar.gz" ]
-    }
+    },
+    install_requires = [
+        "ipaddr",
+        "networkx",
+        "pygraphviz",
+        "matplotlib",
+        ]
 )
diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py
index 0896ed04..ab10baee 100644
--- a/src/nepi/resources/linux/node.py
+++ b/src/nepi/resources/linux/node.py
@@ -443,7 +443,7 @@ class LinuxNode(ResourceManager):
                 import pickle
                 pids = pickle.load(open("/tmp/save.proc", "rb"))
                 pids_temp = dict()
-                ps_aux = "ps aux |awk '{print $2,$11}'"
+                ps_aux = "ps aux | awk '{print $2,$11}'"
                 (out, err), proc = self.execute(ps_aux)
                 if len(out) != 0:
                     for line in out.strip().split("\n"):
-- 
2.43.0