From 765e38037a0c39eacc6633f79dd891c9199412e8 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 15 Oct 2015 16:41:26 +0800 Subject: [PATCH] Add license and description statment into setup.cfg Using ASL 2.0 license. Sync requirements with nova stable/liberty. Add license and copyright into setup.py Change-Id: I63f9c621d0eff0cc0a84e787540e504936e21ba5 --- requirements.txt | 18 +++++++++++------- setup.cfg | 12 ++++++------ setup.py | 22 +++++++++++++++++++++- test-requirements.txt | 10 +++++++--- 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index a2cbbf7..f923ae5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,12 @@ -pbr<2.0,>=1.6 -oslo.concurrency>=2.3.0 # Apache-2.0 -oslo.config>=2.3.0 # Apache-2.0 -oslo.log>=1.8.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.service>=0.9.0 # Apache-2.0 -oslo.utils>=2.0.0 # Apache-2.0 +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +pbr>=1.6 six>=1.9.0 +oslo.concurrency>=2.3.0 # Apache-2.0 +oslo.config>=2.3.0 # Apache-2.0 +oslo.log>=1.8.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.service>=0.7.0 # Apache-2.0 +oslo.utils!=2.6.0,>=2.0.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 2de639b..aeb75cf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,9 +1,11 @@ [metadata] name = nova-zvm-virt-driver -version = 2015.1 -summary = zVM driver for OpenStack Nova. -description-file = README.rst +version = 5.0.0 author = IBM +license = ASL 2.0 +summary = zVM driver for OpenStack Nova. +description = Implementation of Nova virtulization driver for zVM +description-file = README.rst home-page = https://wiki.openstack.org/wiki/Nova-z/VM classifier = Environment :: OpenStack @@ -16,7 +18,7 @@ classifier = Programming Language :: Python :: 2.7 [files] -packages = nova.virt.zvm +packages = nova/virt/zvm [build_sphinx] source-dir = doc/source @@ -39,5 +41,3 @@ input_file = nova_zvm/locale/nova-zvm.pot keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg output_file = nova_zvm/locale/nova-zvm.pot - - diff --git a/setup.py b/setup.py index 5fa42f1..de77493 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,29 @@ -#!/usr/bin/env python +# Copyright 2015 IBM Corp. +# +# 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 +# +# 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. import setuptools +# In python < 2.7.4, a lazy loading of package `pbr` will break +# setuptools if some other modules registered functions in `atexit`. +# solution from: http://bugs.python.org/issue15881#msg170215 +try: + import multiprocessing # noqa +except ImportError: + pass + setuptools.setup( setup_requires=['pbr'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 611b9ac..b134ab8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,11 +1,15 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + hacking<0.11,>=0.10.0 coverage>=3.6 discover fixtures>=1.3.1 python-subunit>=0.0.18 -sphinx>=1.1.2 -oslosphinx -oslotest>=1.10.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 +oslotest>=1.10.0 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4,<0.5 testtools>=1.4.0