summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-06-14 04:31:14 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-06-14 16:29:24 +0200
commit9014c7d1c3c4da5147c195a1956dbd0d3a295f6d (patch)
treec9c8b89d8677dc5180fa3ddc4a6d00042b020bd1
parent01508fe34b6595f8b47ea808e433bc8cb210e94e (diff)
Leverage on pbr (Python Build Reasonableness)
It also updates requirements according to OpenStack stable/ocata except for nova client version as snaps needs nova support of floating IP which has been removed in pike [1] (8.0.0 [2]). It must be reverted to >=6.0.0,!=7.0.0 as soon as snaps calls the related neutron commands. [1] https://github.com/openstack/python-novaclient/blob/master/releasenotes/notes/pike-rm-deprecated-net-272aeb62b329a5bc.yaml [2] https://docs.openstack.org/releasenotes/python-novaclient/unreleased.html Change-Id: Iaa0285471da5f2f73cbfef038c9902e1c39fa009 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--requirements.txt9
-rw-r--r--setup.cfg9
-rw-r--r--setup.py53
3 files changed, 31 insertions, 40 deletions
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..c3e748f
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,9 @@
+python-novaclient!=7.0.0,<8.0.0,>=6.0.0 # Apache-2.0
+python-neutronclient>=5.1.0 # Apache-2.0
+python-keystoneclient>=3.8.0 # Apache-2.0
+python-glanceclient>=2.5.0 # Apache-2.0
+python-heatclient>=1.6.1 # Apache-2.0
+ansible>=2.1.0
+wrapt>=1.7.0 # BSD License
+scp
+cryptography!=1.3.0,>=1.0 # BSD/Apache-2.0
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..c999c81
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,9 @@
+[metadata]
+name = snaps
+version = 1.0
+home-page = https://gerrit.opnfv.org/gerrit/gitweb?p=snaps.git;a=summary
+author = Steve Pisarski
+author-email = s.pisarski@cablelabs.com
+
+[files]
+packages = snaps
diff --git a/setup.py b/setup.py
index 46376e4..f0cf5e8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,44 +1,17 @@
-# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs")
-# and others. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
+#!/usr/bin/env python
+
+# Copyright (c) 2016 Cable Television Laboratories and others.
#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-__author__ = 'spisarski'
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
-try:
- from setuptools import setup, find_packages
-except ImportError:
- from distutils.core import setup
+from setuptools import setup
-config = {
- 'description': 'Virtual Environment Deployment, Provisioning, and Testing Framework',
- 'author': 'Steve Pisarski',
- 'url': 'URL to get it at.',
- 'download_url': 'Where to download it.',
- 'author_email': 's.pisarski@cablelabs.com',
- 'version': '1.0',
- 'packages': find_packages(),
- 'install_requires': ['python-novaclient>=6.0.0,<8.0.0',
- 'python-neutronclient>=5.1.0',
- 'python-keystoneclient>=2.3.1',
- 'python-glanceclient>=2.5.0',
- 'python-heatclient',
- 'ansible>=2.1.0',
- 'wrapt',
- 'scp',
- 'cryptography'],
- 'scripts': [],
- 'name': 'snaps'
-}
+__author__ = 'spisarski'
-# setup(**config, requires=['ansible', 'Crypto', 'python-keystoneclient', 'scp', 'PyYAML'])
-setup(**config)
+setup(
+ setup_requires=['pbr>=1.9', 'setuptools>=17.1'],
+ pbr=True,
+)