Manual sync with requirements

Sync manually with requirements. The automatic sync will not work yet
since gunicorn is not in global-requirements file and then the sync
stops.

So, let's sync what can be synced...

Remove flake8, let hacking install it as dependency in the corresponding
version.

Disable E126 flake8 test since it now fails due to newer flake8
version.

Change-Id: I9547e654de0c618386d56dd98c053118ec0100cf

requirements.txt

@@ -1,14 +1,19 @@
-paste
-falcon>=0.1.6
+# 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 # Apache-2.0
+Paste # MIT
+falcon>=0.1.6 # Apache-2.0
+keystonemiddleware!=4.1.0,!=4.5.0,>=4.0.0 # Apache-2.0
+oslo.config>=3.14.0 # Apache-2.0
+oslo.middleware>=3.0.0 # Apache-2.0
+oslo.log>=1.14.0 # Apache-2.0
+oslo.serialization>=1.10.0 # Apache-2.0
+oslo.utils>=3.16.0 # Apache-2.0
+PasteDeploy>=1.5.0 # MIT
+monasca-common>=1.0.0 # Apache-2.0
+eventlet!=0.18.3,>=0.18.2 # MIT
+monasca-statsd>=1.1.0 # Apache-2.0
+
 gunicorn>=19.5.0
-keystonemiddleware>=4.0.0,!=4.1.0
-oslo.config>=3.2.0
-oslo.middleware>=3.0.0
-oslo.log>=1.14.0
-oslo.serialization>=1.10.0
-oslo.utils>=3.4.0
-pastedeploy>=1.5.0
-pbr>=1.6.0
-monasca-common>=0.0.6
-eventlet>=0.17.4,!=0.18.0
-monasca-statsd

setup.py

@@ -1,8 +1,29 @@
-from setuptools import setup
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# 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.
 
-__author__ = 'kornicameister@gmail.com'
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
+import setuptools
 
-setup(
-    setup_requires=['pbr'],
-    pbr=True,
-)
+# 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>=1.8'],
+    pbr=True)

test-requirements.txt

@@ -1,7 +1,12 @@
-fixtures>=1.3.1
-flake8>=2.2.4,<=2.4.1
-coverage>=3.6
-hacking>=0.10.2,<0.11
-mock>=1.2
-nose
-simplejson
+# 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.
+
+# Install bounded pep8/pyflakes first, then let flake8 install
+hacking<0.11,>=0.10.2
+
+fixtures>=3.0.0 # Apache-2.0/BSD
+coverage>=3.6 # Apache-2.0
+mock>=2.0 # BSD
+nose # LGPL
+simplejson>=2.2.0 # MIT

tox.ini

@@ -30,5 +30,6 @@ commands = {posargs}
 [flake8]
 exclude = .git,.tox,dist,docs,*.egg,build
 show-source = True
+ignore = E126
 
 [hacking]