[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a
Garrett Holmstrom
gholms at fedoraproject.org
Sun Jun 16 02:31:30 UTC 2013
The following commit has been merged in the master branch:
commit f14fb33223f8fa12cf79ea967841386e5a3cd813
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Wed May 29 19:43:53 2013 -0700
Update setup.py
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index b903a60..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-requestbuilder>=0.1.0-beta1
-requests
-six
diff --git a/setup.py b/setup.py
index 0e23a53..024348f 100644
--- a/setup.py
+++ b/setup.py
@@ -32,13 +32,10 @@ from distutils.command.build_py import build_py
from distutils.command.build_scripts import build_scripts
from distutils.command.install_scripts import install_scripts
from distutils.command.sdist import sdist
+import glob
import os.path
import re
-
-try:
- from setuptools import setup
-except ImportError:
- from distutils.core import setup
+from setuptools import find_packages, setup
from euca2ools import __version__
@@ -114,228 +111,38 @@ class sdist_with_git_version(sdist):
os.rename(new_init_name, old_init_name)
-setup(name = "euca2ools",
- version = __version__,
- description = "Elastic Utility Computing Architecture Command Line Tools",
- long_description="Elastic Utility Computing Architecture Command Line Tools",
- author = "Eucalyptus Systems, Inc.",
- author_email = "support at eucalyptus.com",
-
- scripts = ["bin/euare-accountaliascreate",
- "bin/euare-accountaliasdelete",
- "bin/euare-accountaliaslist",
- "bin/euare-accountcreate",
- "bin/euare-accountdel",
- "bin/euare-accountdelpolicy",
- "bin/euare-accountgetpolicy",
- "bin/euare-accountgetsummary",
- "bin/euare-accountlist",
- "bin/euare-accountlistpolicies",
- "bin/euare-accountuploadpolicy",
- "bin/euare-getldapsyncstatus",
- "bin/euare-groupaddpolicy",
- "bin/euare-groupadduser",
- "bin/euare-groupcreate",
- "bin/euare-groupdel",
- "bin/euare-groupdelpolicy",
- "bin/euare-groupgetpolicy",
- "bin/euare-grouplistbypath",
- "bin/euare-grouplistpolicies",
- "bin/euare-grouplistusers",
- "bin/euare-groupmod",
- "bin/euare-groupremoveuser",
- "bin/euare-groupuploadpolicy",
- "bin/euare-servercertdel",
- "bin/euare-servercertgetattributes",
- "bin/euare-servercertlistbypath",
- "bin/euare-servercertmod",
- "bin/euare-servercertupload",
- "bin/euare-useraddcert",
- "bin/euare-useraddkey",
- "bin/euare-useraddloginprofile",
- "bin/euare-useraddpolicy",
- "bin/euare-usercreate",
- "bin/euare-usercreatecert",
- "bin/euare-userdeactivatemfadevice",
- "bin/euare-userdel",
- "bin/euare-userdelcert",
- "bin/euare-userdelkey",
- "bin/euare-userdelloginprofile",
- "bin/euare-userdelpolicy",
- "bin/euare-userenablemfadevice",
- "bin/euare-usergetattributes",
- "bin/euare-usergetinfo",
- "bin/euare-usergetloginprofile",
- "bin/euare-usergetpolicy",
- "bin/euare-userlistbypath",
- "bin/euare-userlistcerts",
- "bin/euare-userlistgroups",
- "bin/euare-userlistkeys",
- "bin/euare-userlistmfadevices",
- "bin/euare-userlistpolicies",
- "bin/euare-usermod",
- "bin/euare-usermodcert",
- "bin/euare-usermodkey",
- "bin/euare-usermodloginprofile",
- "bin/euare-userresyncmfadevice",
- "bin/euare-userupdateinfo",
- "bin/euare-useruploadpolicy",
- "bin/euca-allocate-address",
- "bin/euca-associate-address",
- "bin/euca-attach-volume",
- "bin/euca-authorize",
- "bin/euca-bundle-image",
- "bin/euca-bundle-instance",
- "bin/euca-bundle-upload",
- "bin/euca-bundle-vol",
- "bin/euca-cancel-bundle-task",
- "bin/euca-check-bucket",
- "bin/euca-confirm-product-instance",
- "bin/euca-create-group",
- "bin/euca-create-image",
- "bin/euca-create-keypair",
- "bin/euca-create-snapshot",
- "bin/euca-create-tags",
- "bin/euca-create-volume",
- "bin/euca-delete-bundle",
- "bin/euca-delete-group",
- "bin/euca-delete-keypair",
- "bin/euca-delete-snapshot",
- "bin/euca-delete-tags",
- "bin/euca-delete-volume",
- "bin/euca-deregister",
- "bin/euca-describe-addresses",
- "bin/euca-describe-availability-zones",
- "bin/euca-describe-bundle-tasks",
- "bin/euca-describe-group",
- "bin/euca-describe-groups",
- "bin/euca-describe-image-attribute",
- "bin/euca-describe-images",
- "bin/euca-describe-instance-attribute",
- "bin/euca-describe-instance-types",
- "bin/euca-describe-instances",
- "bin/euca-describe-keypairs",
- "bin/euca-describe-regions",
- "bin/euca-describe-snapshots",
- "bin/euca-describe-tags",
- "bin/euca-describe-volumes",
- "bin/euca-detach-volume",
- "bin/euca-disassociate-address",
- "bin/euca-download-bundle",
- "bin/euca-get-console-output",
- "bin/euca-get-password",
- "bin/euca-get-password-data",
- "bin/euca-import-keypair",
- "bin/euca-modify-image-attribute",
- "bin/euca-modify-instance-type",
- "bin/euca-monitor-instances",
- "bin/euca-reboot-instances",
- "bin/euca-register",
- "bin/euca-release-address",
- "bin/euca-reset-image-attribute",
- "bin/euca-revoke",
- "bin/euca-run-instances",
- "bin/euca-start-instances",
- "bin/euca-stop-instances",
- "bin/euca-terminate-instances",
- "bin/euca-unbundle",
- "bin/euca-unmonitor-instances",
- "bin/euca-upload-bundle",
- "bin/euca-version",
- "bin/eulb-apply-security-groups-to-lb",
- "bin/eulb-attach-lb-to-subnets",
- "bin/eulb-configure-healthcheck",
- "bin/eulb-create-app-cookie-stickiness-policy",
- "bin/eulb-create-lb",
- "bin/eulb-create-lb-cookie-stickiness-policy",
- "bin/eulb-create-lb-listeners",
- "bin/eulb-create-lb-policy",
- "bin/eulb-delete-lb",
- "bin/eulb-delete-lb-listeners",
- "bin/eulb-delete-lb-policy",
- "bin/eulb-deregister-instances-from-lb",
- "bin/eulb-describe-instance-health",
- "bin/eulb-describe-lb-policies",
- "bin/eulb-describe-lb-policy-types",
- "bin/eulb-describe-lbs",
- "bin/eulb-detach-lb-from-subnets",
- "bin/eulb-disable-zones-for-lb",
- "bin/eulb-enable-zones-for-lb",
- "bin/eulb-register-instances-with-lb",
- "bin/eulb-set-lb-listener-ssl-cert",
- "bin/eulb-set-lb-policies-for-backend-server",
- "bin/eulb-set-lb-policies-of-listener",
- "bin/euscale-create-auto-scaling-group",
- "bin/euscale-create-launch-config",
- "bin/euscale-create-or-update-tags",
- "bin/euscale-delete-auto-scaling-group",
- "bin/euscale-delete-launch-config",
- "bin/euscale-delete-notification-configuration",
- "bin/euscale-delete-policy",
- "bin/euscale-delete-scheduled-action",
- "bin/euscale-describe-adjustment-types",
- "bin/euscale-describe-auto-scaling-groups",
- "bin/euscale-describe-auto-scaling-instances",
- "bin/euscale-describe-auto-scaling-notification-types",
- "bin/euscale-describe-launch-configs",
- "bin/euscale-describe-metric-collection-types",
- "bin/euscale-describe-notification-configurations",
- "bin/euscale-describe-policies",
- "bin/euscale-describe-process-types",
- "bin/euscale-describe-scaling-activities",
- "bin/euscale-describe-scheduled-actions",
- "bin/euscale-describe-termination-policy-types",
- "bin/euscale-disable-metrics-collection",
- "bin/euscale-enable-metrics-collection",
- "bin/euscale-execute-policy",
- "bin/euscale-put-notification-configuration",
- "bin/euscale-put-scaling-policy",
- "bin/euscale-put-scheduled-update-group-action",
- "bin/euscale-resume-processes",
- "bin/euscale-set-desired-capacity",
- "bin/euscale-set-instance-health",
- "bin/euscale-suspend-processes",
- "bin/euscale-terminate-instance-in-auto-scaling-group",
- "bin/euscale-update-auto-scaling-group",
- "bin/eustore-describe-images",
- "bin/eustore-install-image",
- "bin/euwatch-delete-alarms",
- "bin/euwatch-describe-alarm-history",
- "bin/euwatch-describe-alarms",
- "bin/euwatch-describe-alarms-for-metric",
- "bin/euwatch-disable-alarm-actions",
- "bin/euwatch-enable-alarm-actions",
- "bin/euwatch-get-stats",
- "bin/euwatch-list-metrics",
- "bin/euwatch-put-data",
- "bin/euwatch-put-metric-alarm",
- "bin/euwatch-set-alarm-state"],
- url = "http://open.eucalyptus.com",
- packages = ["euca2ools",
- "euca2ools.nc",
- "euca2ools.nc.commands",
- "euca2ools.commands",
- "euca2ools.commands.autoscaling",
- "euca2ools.commands.bundle",
- "euca2ools.commands.elasticloadbalancing",
- "euca2ools.commands.euca",
- "euca2ools.commands.euare",
- "euca2ools.commands.eustore",
- "euca2ools.commands.monitoring",
- "euca2ools.commands.walrus"],
- license = 'BSD (Simplified)',
- platforms = 'Posix; MacOS X',
- classifiers = ['Development Status :: 3 - Alpha',
- 'Intended Audience :: Developers',
- 'Intended Audience :: System Administrators',
- 'License :: OSI Approved :: Simplified BSD License',
- 'Operating System :: OS Independent',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.6',
- 'Programming Language :: Python :: 2.7',
- 'Topic :: Internet'],
- cmdclass = {'build_py': build_py_with_git_version,
- 'build_scripts': build_scripts_except_symlinks,
- 'install_scripts': install_scripts_and_symlinks,
- 'sdist': sdist_with_git_version})
+setup(name="euca2ools",
+ version=__version__,
+ description="Eucalyptus Command Line Tools",
+ long_description="Eucalyptus Command Line Tools",
+ author="Eucalyptus Systems, Inc.",
+ author_email="support at eucalyptus.com",
+ url="http://www.eucalyptus.com",
+ scripts=sum((glob.glob('bin/euare-*'),
+ glob.glob('bin/euca-*'),
+ glob.glob('bin/eulb-*'),
+ glob.glob('bin/euscale-*'),
+ glob.glob('bin/eustore-*'),
+ glob.glob('bin/euwatch-*')),
+ []),
+ packages=find_packages(),
+ install_requires=['lxml',
+ 'requestbuilder',
+ 'requests',
+ 'six'],
+ license='BSD (Simplified)',
+ platforms='Posix; MacOS X',
+ classifiers=['Development Status :: 4 - Beta',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: System Administrators',
+ 'License :: OSI Approved :: Simplified BSD License',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
+ 'Topic :: Internet'],
+ cmdclass={'build_py': build_py_with_git_version,
+ 'build_scripts': build_scripts_except_symlinks,
+ 'install_scripts': install_scripts_and_symlinks,
+ 'sdist': sdist_with_git_version})
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list