[ARVADOS] updated: d6ec5672045b29aeaf983a78c5487ae354ccb20d

[git at public.curoverse.com]

Summary of changes:
 sdk/python/setup.py           | 4 ++--
 services/fuse/setup.py        | 4 ++--
 services/nodemanager/setup.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

       via  d6ec5672045b29aeaf983a78c5487ae354ccb20d (commit)
      from  f85132f1a018179b7127c199932c1f0f3e3f76d5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d6ec5672045b29aeaf983a78c5487ae354ccb20d
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Feb 9 16:01:35 2015 -0500

    5175: Avoid egg_info name conflicts with pip.
    
    pip does its own subclassing of egg_info.  Installing with pip fails
    if setup.py includes an egg_info class that is passed in as the
    cmdclass for the egg_info command.  Avoid using that name to avoid
    conflicts with pip.  Refs #5175.

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 4856800..ca28025 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -2,9 +2,9 @@
 
 import os
 import sys
+import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
-from setuptools.command.egg_info import egg_info
 
 SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
@@ -13,7 +13,7 @@ try:
     import gittaggers
     tagger = gittaggers.EggInfoFromGit
 except ImportError:
-    tagger = egg_info
+    tagger = egg_info_cmd.egg_info
 
 setup(name='arvados-python-client',
       version='0.1',
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 98bd2d5..c65501c 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -2,9 +2,9 @@
 
 import os
 import sys
+import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
-from setuptools.command.egg_info import egg_info
 
 SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
@@ -13,7 +13,7 @@ try:
     import gittaggers
     tagger = gittaggers.EggInfoFromGit
 except ImportError:
-    tagger = egg_info
+    tagger = egg_info_cmd.egg_info
 
 setup(name='arvados_fuse',
       version='0.1',
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 71b3084..891b04f 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -2,9 +2,9 @@
 
 import os
 import sys
+import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
-from setuptools.command.egg_info import egg_info
 
 SETUP_DIR = os.path.dirname(__file__) or "."
 README = os.path.join(SETUP_DIR, 'README.rst')
@@ -13,7 +13,7 @@ try:
     import gittaggers
     tagger = gittaggers.EggInfoFromGit
 except ImportError:
-    tagger = egg_info
+    tagger = egg_info_cmd.egg_info
 
 setup(name='arvados-node-manager',
       version='0.1',

-----------------------------------------------------------------------


hooks/post-receive
--