Updated setup.py

- catch synnefo.util import errors
- added snf packages dependencies
- added dependency_link for snf-* package discovery

snf-app/setup.py

@@ -40,10 +40,16 @@ import os
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 from setuptools import setup, find_packages
-from synnefo.util.version import update_version
 
 HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-update_version('synnefo.versions', 'app', HERE)
+
+try:
+    # try to update the version file
+    from synnefo.util.version import update_version
+    update_version('synnefo.versions', 'app', HERE)
+except ImportError:
+    pass
+
 from synnefo.versions.app import __version__
 
 # Package info
@@ -68,7 +74,9 @@ INSTALL_REQUIRES = [
     'South>=0.7',
     'pycrypto==2.1.0',
     'amqplib==0.6.1',
-    'python-daemon==1.5.5'
+    'python-daemon==1.5.5',
+    'snf-common>=0.7.3',
+    'vncauthproxy>=1.1'
 ]
 
 EXTRAS_REQUIRES = {
@@ -197,6 +205,8 @@ setup(
     extras_require = EXTRAS_REQUIRES,
     tests_require = TESTS_REQUIRES,
 
+    dependency_links = ['http://docs.dev.grnet.gr/pypi'],
+
     entry_points = {
      'console_scripts': [
          'snf-dispatcher = synnefo.logic.dispatcher:main',

snf-common/setup.py

@@ -40,10 +40,16 @@ import os
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 from setuptools import setup, find_packages
-from synnefo.util.version import update_version
 
 HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-update_version('synnefo.versions', 'common', HERE)
+
+try:
+    # try to update the version file
+    from synnefo.util.version import update_version
+    update_version('synnefo.versions', 'common', HERE)
+except ImportError:
+    pass
+
 from synnefo.versions.common import __version__
 
 # Package info
@@ -91,5 +97,7 @@ setup(
     install_requires = INSTALL_REQUIRES,
     extras_require = EXTRAS_REQUIRES,
     tests_require = TESTS_REQUIRES,
+
+    dependency_links = ['http://docs.dev.grnet.gr/pypi']
 )
 

snf-ganeti-tools/setup.py

 #!/usr/bin/env python
+# Copyright 2011 GRNET S.A. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+#   1. Redistributions of source code must retain the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and
+# documentation are those of the authors and should not be
+# interpreted as representing official policies, either expressed
+# or implied, of GRNET S.A.
+#
 
 import os
 
 from setuptools import setup
-from synnefo.util.version import update_version
 
 HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-update_version('synnefo.versions', 'ganeti', HERE)
+
+try:
+    # try to update the version file
+    from synnefo.util.version import update_version
+    update_version('synnefo.versions', 'ganeti', HERE)
+except ImportError:
+    pass
+
 from synnefo.versions.ganeti import __version__
 
 setup(
@@ -19,6 +58,7 @@ setup(
     url="http://code.grnet.gr/projects/synnefo",
     namespace_packages=["synnefo", "synnefo.versions"],
     packages=["synnefo", "synnefo.ganeti", "synnefo.versions"],
+    dependency_links = ['http://docs.dev.grnet.gr/pypi'],
     install_requires=[
         'daemon',
         'pyinotify',

snf-okeanos-site/setup.py

+# Copyright 2011 GRNET S.A. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+#   1. Redistributions of source code must retain the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and
+# documentation are those of the authors and should not be
+# interpreted as representing official policies, either expressed
+# or implied, of GRNET S.A.
+#
+
 import distribute_setup
 distribute_setup.use_setuptools()
 
 import os
 from setuptools import setup, find_packages
-from synnefo.util.version import update_version
 
 HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-update_version('okeanos_site', 'version', HERE)
+
+try:
+    # try to update the version file
+    from synnefo.util.version import update_version
+    update_version('okeanos_site', 'version', HERE)
+except ImportError:
+    pass
+
 from okeanos_site.version import __version__
 
 
@@ -24,6 +64,9 @@ CLASSIFIERS = []
 
 # Package requirements
 INSTALL_REQUIRES = [
+        'snf-common>=0.7.3',
+        'snf-webproject>=0.7.3',
+        'snf-app>=0.7.3'
 ]
 
 TESTS_REQUIRES = [
@@ -57,6 +100,8 @@ setup(
     maintainer = 'Kostas Papadimitriou',
     maintainer_email = 'kpap@grnet.gr',
 
+    dependency_links = ['http://docs.dev.grnet.gr/pypi'],
+
     packages = PACKAGES,
     package_dir= {'': PACKAGES_ROOT},
     include_package_data = True,

snf-webproject/setup.py

@@ -40,10 +40,16 @@ import os
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 from setuptools import setup, find_packages
-from synnefo.util.version import update_version
 
 HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-update_version('synnefo.versions', 'webproject', HERE)
+
+try:
+    # try to update the version file
+    from synnefo.util.version import update_version
+    update_version('synnefo.versions', 'webproject', HERE)
+except ImportError:
+    pass
+
 from synnefo.versions.webproject import __version__
 
 # Package info
@@ -60,7 +66,8 @@ CLASSIFIERS = []
 
 # Package requirements
 INSTALL_REQUIRES = [
-        'Django>=1.2.4'
+        'Django>=1.2.4',
+        'snf-common>=0.7.3'
 ]
 
 EXTRAS_REQUIRES = {
@@ -93,6 +100,8 @@ setup(
     extras_require = EXTRAS_REQUIRES,
     tests_require = TESTS_REQUIRES,
 
+    dependency_links = ['http://docs.dev.grnet.gr/pypi'],
+
     entry_points = {
      'console_scripts': [
          'snf-manage = synnefo.webproject.manage:main',