Import python-powervm into ceilometer-powervm
This change set supports bringing in the python powervm REST API library for initial use within ceilometer-powervm. This change also fixes pep8 issues, mainly around the copyright rules that are needed (do not copyright empty files). Also updates the tox file such that we run the new oslo concurrency as ceilometer removed the integrated package. Change-Id: I12739ca702e004cd048067ad25e9e07d1ef106e6
This commit is contained in:
parent
3682214b7d
commit
badf05a969
@ -1,14 +0,0 @@
|
||||
# Copyright 2011 OpenStack Foundation
|
||||
# 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
|
||||
#
|
||||
# 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.
|
@ -1,16 +0,0 @@
|
||||
# Copyright 2014 IBM Corp.
|
||||
#
|
||||
# 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
|
||||
#
|
||||
# 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.
|
||||
|
@ -15,3 +15,6 @@
|
||||
# under the License.
|
||||
#
|
||||
# @author: Adam Reznechek, IBM Corp.
|
||||
|
||||
# Simple pass till we add content
|
||||
pass
|
||||
|
@ -1,16 +0,0 @@
|
||||
# Copyright 2014 IBM Corp.
|
||||
#
|
||||
# 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
|
||||
#
|
||||
# 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.
|
||||
|
@ -1,6 +1,4 @@
|
||||
oslosphinx
|
||||
pbr>=0.6,!=0.7,<1.0
|
||||
sphinx>=1.1.2,<1.2
|
||||
testrepository>=0.0.18
|
||||
testtools>=0.9.34
|
||||
yasfb>=0.5.1
|
||||
|
3
tox.ini
3
tox.ini
@ -11,7 +11,8 @@ setenv = VIRTUAL_ENV={envdir}
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
-egit+https://github.com/openstack/ceilometer#egg=ceilometer
|
||||
commands = python -m ceilometer.openstack.common.lockutils python setup.py testr --slowest --testr-args="{posargs}"
|
||||
-egit+ssh://***REMOVED***:29418/python-powervm.git#egg=python-powervm
|
||||
commands = python -m oslo.concurrency.lockutils python setup.py testr --slowest --testr-args="{posargs}"
|
||||
downloadcache = {toxworkdir}/_download
|
||||
|
||||
[testenv:pep8]
|
||||
|
Loading…
x
Reference in New Issue
Block a user