Fix recursive dependencies in setup.py.

bombela · bombela · commit 84e93b9591db · 2012-03-20T22:24:32.000-07:00
Thanks @msabramo (Marc Abramowitz) for the patch proposal.
diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import zerorpc
+from zerorpc.version import __version__, __author__
 
 try:
     from setuptools import setup
@@ -32,9 +32,9 @@
 
 setup(
     name='zerorpc',
-    version=zerorpc.__version__,
+    version=__version__,
     description='zerorpc is a flexible RPC based on zeromq.',
-    author=zerorpc.__author__,
+    author=__author__,
     url='https://github.com/dotcloud/zerorpc-python',
     packages=['zerorpc'],
     install_requires=[
diff --git a/zerorpc/__init__.py b/zerorpc/__init__.py
@@ -22,12 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__title__ = 'zerorpc'
-__version__ = '0.1.0'
-__author__ = 'dotCloud, Inc.'
-__license__ = 'MIT'
-__copyright__ = 'Copyright 2012 dotCloud, Inc.'
-
+from .version import *
 from .exceptions import *
 from .context import *
 from .socket import *
diff --git a/zerorpc/version.py b/zerorpc/version.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Open Source Initiative OSI - The MIT License (MIT):Licensing
+#
+# The MIT License (MIT)
+# Copyright (c) 2012 DotCloud Inc (opensource@dotcloud.com)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do
+# so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+__title__ = 'zerorpc'
+__version__ = '0.1.0'
+__author__ = 'dotCloud, Inc.'
+__license__ = 'MIT'
+__copyright__ = 'Copyright 2012 dotCloud, Inc.'
