From 45daf164707684e759dfc65a39a68e46a31948b5 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Fri, 13 May 2016 05:15:10 +0800 Subject: [PATCH] Update to hacking 0.11.0 Change-Id: Ifbfa756f368d2a957918d7c5b09cc3d370efa75d --- ceilometer/agent/manager.py | 4 ---- ceilometer/hardware/inspector/base.py | 3 --- ceilometer/hardware/inspector/snmp.py | 4 ---- ceilometer/hardware/pollsters/util.py | 4 ---- ceilometer/pipeline.py | 3 --- ceilometer/sample.py | 3 --- ceilometer/storage/impl_mongodb.py | 4 ---- ceilometer/storage/mongo/utils.py | 3 --- ceilometer/storage/pymongo_base.py | 3 --- ceilometer/tests/functional/api/v2/test_capabilities.py | 2 -- .../tests/functional/api/v2/test_complex_query_scenarios.py | 3 --- ceilometer/tests/pipeline_base.py | 3 --- ceilometer/tests/unit/agent/agentbase.py | 5 ----- ceilometer/tests/unit/api/v2/test_complex_query.py | 3 --- ceilometer/tests/unit/dispatcher/test_gnocchi.py | 2 -- ceilometer/tests/unit/hardware/inspector/test_inspector.py | 2 -- ceilometer/tests/unit/hardware/inspector/test_snmp.py | 2 -- ceilometer/tests/unit/hardware/pollsters/test_util.py | 2 -- tox.ini | 2 +- 19 files changed, 1 insertion(+), 56 deletions(-) diff --git a/ceilometer/agent/manager.py b/ceilometer/agent/manager.py index e266ef912f..935e648729 100644 --- a/ceilometer/agent/manager.py +++ b/ceilometer/agent/manager.py @@ -2,10 +2,6 @@ # Copyright 2013 Julien Danjou # Copyright 2014 Red Hat, Inc # -# Authors: Julien Danjou -# Eoghan Glynn -# Nejc Saje -# # 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 diff --git a/ceilometer/hardware/inspector/base.py b/ceilometer/hardware/inspector/base.py index 9963085ac8..1dc3ce0684 100644 --- a/ceilometer/hardware/inspector/base.py +++ b/ceilometer/hardware/inspector/base.py @@ -1,9 +1,6 @@ # # Copyright 2014 ZHAW SoE # -# Authors: Lucas Graf -# Toni Zehnder -# # 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 diff --git a/ceilometer/hardware/inspector/snmp.py b/ceilometer/hardware/inspector/snmp.py index 8822065858..87adbc0a2b 100644 --- a/ceilometer/hardware/inspector/snmp.py +++ b/ceilometer/hardware/inspector/snmp.py @@ -2,10 +2,6 @@ # Copyright 2014 ZHAW SoE # Copyright 2014 Intel Corp # -# Authors: Lucas Graf -# Toni Zehnder -# Lianhao Lu -# # 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 diff --git a/ceilometer/hardware/pollsters/util.py b/ceilometer/hardware/pollsters/util.py index ac598aa29c..3d21539136 100644 --- a/ceilometer/hardware/pollsters/util.py +++ b/ceilometer/hardware/pollsters/util.py @@ -2,10 +2,6 @@ # Copyright 2013 ZHAW SoE # Copyright 2014 Intel Corp. # -# Authors: Lucas Graf -# Toni Zehnder -# Lianhao Lu -# # 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 diff --git a/ceilometer/pipeline.py b/ceilometer/pipeline.py index 13bc6c5aea..c471dc8863 100644 --- a/ceilometer/pipeline.py +++ b/ceilometer/pipeline.py @@ -2,9 +2,6 @@ # Copyright 2013 Intel Corp. # Copyright 2014 Red Hat, Inc # -# Authors: Yunhong Jiang -# Eoghan Glynn -# # 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 diff --git a/ceilometer/sample.py b/ceilometer/sample.py index 99622a0144..8513ef2d76 100644 --- a/ceilometer/sample.py +++ b/ceilometer/sample.py @@ -2,9 +2,6 @@ # Copyright 2012 New Dream Network, LLC (DreamHost) # Copyright 2013 eNovance # -# Authors: Doug Hellmann -# Julien Danjou -# # 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 diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py index 80792c1fc2..b6bc7a2018 100644 --- a/ceilometer/storage/impl_mongodb.py +++ b/ceilometer/storage/impl_mongodb.py @@ -3,10 +3,6 @@ # Copyright 2013 eNovance # Copyright 2014 Red Hat, Inc # -# Authors: Doug Hellmann -# Julien Danjou -# Eoghan Glynn -# # 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 diff --git a/ceilometer/storage/mongo/utils.py b/ceilometer/storage/mongo/utils.py index 3c1195a2a1..24a9683cdc 100644 --- a/ceilometer/storage/mongo/utils.py +++ b/ceilometer/storage/mongo/utils.py @@ -1,9 +1,6 @@ # # Copyright Ericsson AB 2013. All rights reserved # -# Authors: Ildiko Vancsa -# Balazs Gibizer -# # 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 diff --git a/ceilometer/storage/pymongo_base.py b/ceilometer/storage/pymongo_base.py index bbb49ac51e..8b4b2407f5 100644 --- a/ceilometer/storage/pymongo_base.py +++ b/ceilometer/storage/pymongo_base.py @@ -1,9 +1,6 @@ # # Copyright Ericsson AB 2013. All rights reserved # -# Authors: Ildiko Vancsa -# Balazs Gibizer -# # 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 diff --git a/ceilometer/tests/functional/api/v2/test_capabilities.py b/ceilometer/tests/functional/api/v2/test_capabilities.py index f3c880efe9..67b76f480d 100644 --- a/ceilometer/tests/functional/api/v2/test_capabilities.py +++ b/ceilometer/tests/functional/api/v2/test_capabilities.py @@ -1,8 +1,6 @@ # # Copyright Ericsson AB 2014. All rights reserved # -# Authors: Ildiko Vancsa -# # 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 diff --git a/ceilometer/tests/functional/api/v2/test_complex_query_scenarios.py b/ceilometer/tests/functional/api/v2/test_complex_query_scenarios.py index b9646ab56e..ea04aa1f98 100644 --- a/ceilometer/tests/functional/api/v2/test_complex_query_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_complex_query_scenarios.py @@ -1,9 +1,6 @@ # # Copyright Ericsson AB 2013. All rights reserved # -# Authors: Ildiko Vancsa -# Balazs Gibizer -# # 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 diff --git a/ceilometer/tests/pipeline_base.py b/ceilometer/tests/pipeline_base.py index 6731cb7bd0..41842f6dde 100644 --- a/ceilometer/tests/pipeline_base.py +++ b/ceilometer/tests/pipeline_base.py @@ -2,9 +2,6 @@ # # Copyright 2013 Intel Corp. # -# Authors: Yunhong Jiang -# Julien Danjou -# # 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 diff --git a/ceilometer/tests/unit/agent/agentbase.py b/ceilometer/tests/unit/agent/agentbase.py index d264db1c54..845e028f58 100644 --- a/ceilometer/tests/unit/agent/agentbase.py +++ b/ceilometer/tests/unit/agent/agentbase.py @@ -4,11 +4,6 @@ # Copyright 2013 eNovance # Copyright 2014 Red Hat, Inc # -# Authors: Yunhong Jiang -# Julien Danjou -# Eoghan Glynn -# Nejc Saje -# # 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 diff --git a/ceilometer/tests/unit/api/v2/test_complex_query.py b/ceilometer/tests/unit/api/v2/test_complex_query.py index 363e211294..40aa1361fd 100644 --- a/ceilometer/tests/unit/api/v2/test_complex_query.py +++ b/ceilometer/tests/unit/api/v2/test_complex_query.py @@ -1,9 +1,6 @@ # # Copyright Ericsson AB 2013. All rights reserved # -# Authors: Ildiko Vancsa -# Balazs Gibizer -# # 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 diff --git a/ceilometer/tests/unit/dispatcher/test_gnocchi.py b/ceilometer/tests/unit/dispatcher/test_gnocchi.py index da25fda282..287ee9ef31 100644 --- a/ceilometer/tests/unit/dispatcher/test_gnocchi.py +++ b/ceilometer/tests/unit/dispatcher/test_gnocchi.py @@ -1,8 +1,6 @@ # # Copyright 2014 eNovance # -# Authors: Mehdi Abaakouk -# # 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 diff --git a/ceilometer/tests/unit/hardware/inspector/test_inspector.py b/ceilometer/tests/unit/hardware/inspector/test_inspector.py index 22a245c42e..931154b956 100644 --- a/ceilometer/tests/unit/hardware/inspector/test_inspector.py +++ b/ceilometer/tests/unit/hardware/inspector/test_inspector.py @@ -1,8 +1,6 @@ # # Copyright 2014 Intel Corp # -# Authors: Lianhao Lu -# # 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 diff --git a/ceilometer/tests/unit/hardware/inspector/test_snmp.py b/ceilometer/tests/unit/hardware/inspector/test_snmp.py index 71b94c0202..c6524fa589 100644 --- a/ceilometer/tests/unit/hardware/inspector/test_snmp.py +++ b/ceilometer/tests/unit/hardware/inspector/test_snmp.py @@ -1,8 +1,6 @@ # # Copyright 2013 Intel Corp # -# Authors: Lianhao Lu -# # 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 diff --git a/ceilometer/tests/unit/hardware/pollsters/test_util.py b/ceilometer/tests/unit/hardware/pollsters/test_util.py index a31cdbb30a..5a3f9694ac 100644 --- a/ceilometer/tests/unit/hardware/pollsters/test_util.py +++ b/ceilometer/tests/unit/hardware/pollsters/test_util.py @@ -1,8 +1,6 @@ # # Copyright 2013 Intel Corp # -# Authors: Lianhao Lu -# # 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 diff --git a/tox.ini b/tox.ini index f53fdc06f4..acbf4289a6 100644 --- a/tox.ini +++ b/tox.ini @@ -75,7 +75,7 @@ commands = python setup.py testr --slowest --coverage --testr-args="{posargs}" [testenv:pep8] -deps = hacking<0.11,>=0.10.0 +deps = hacking<0.12,>=0.11.0 commands = flake8 # Check that .po and .pot files are valid: