Update from requirements

Trying to remove usage of d2to1 - it can cause breakages.
Also, had to fix hacking 102. Turns out it expects copyright headers in
comments, not docstrings.

Change-Id: I3494349ffe2d4cba9c8bcb73408d60bbc12eff5e

Author: emonty

ipmictl.py

@@ -1,21 +1,21 @@
 #!/usr/bin/env python
+# Copyright 2013 IBM Corporation
+#
+# 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: Jarrod Johnson <[email protected]>
-
-Copyright 2013 IBM Corporation
-
-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.
 """
+
 """This is an example of using the library in a synchronous fashion. For now,
 it isn't conceived as a general utility to actually use, just help developers
 understand how the ipmi_command class workes.

requirements.txt

@@ -1,4 +1 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5.16,<0.6
-
-pycrypto>=2
+pycrypto>=2.6

setup.py

@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.16,<0.6'],
-    d2to1=True)
+    setup_requires=['pbr'],
+    pbr=True)

solconnect.py

@@ -1,21 +1,22 @@
 #!/usr/bin/env python
+# Copyright 2013 IBM Corporation
+#
+# 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: Jarrod Johnson <[email protected]>
-
-Copyright 2013 IBM Corporation
-
-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.
 """
+
 """A simple little script to exemplify/test ipmi.console module
 """
 import os

test-requirements.txt

@@ -1,14 +1,10 @@
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
-hacking>=0.5.3,<0.6
+hacking>=0.5.6,<0.8
 
 coverage>=3.6
 discover
-fixtures>=0.3.12
+fixtures>=0.3.14
 python-subunit
 sphinx>=1.1.2
-testrepository>=0.0.13
-testscenarios
-testtools>=0.9.27
+testrepository>=0.0.17
+testscenarios>=0.4
+testtools>=0.9.32