Synced with global requirements

Manual first sync with the global openstack/requirements repo. Moving
forward, these will be auto-proposed by a bot on commit to requirements.

Change-Id: I22d2d6c7fb991556ebc156fa94273a37c3e6d3c6
This commit is contained in:
Monty Taylor
2013-08-03 15:07:35 -04:00
parent cd6d69eae7
commit 4215d540cb
5 changed files with 9 additions and 13 deletions

View File

@@ -31,7 +31,7 @@ import sys
import tokenize import tokenize
import traceback import traceback
import d2to1.util import pbr.util
import pep8 import pep8
from hacking import config from hacking import config
@@ -905,12 +905,12 @@ class ProxyChecks(GlobalCheck):
local_check = CONF.get_multiple('local-check', default=[]) local_check = CONF.get_multiple('local-check', default=[])
for check_path in set(local_check): for check_path in set(local_check):
if check_path.strip(): if check_path.strip():
checker = d2to1.util.resolve_name(check_path) checker = pbr.util.resolve_name(check_path)
pep8.register_check(checker) pep8.register_check(checker)
local_check_fact = CONF.get('local-check-factory') local_check_fact = CONF.get('local-check-factory')
if local_check_fact: if local_check_fact:
factory = d2to1.util.resolve_name(local_check_fact) factory = pbr.util.resolve_name(local_check_fact)
factory(pep8.register_check) factory(pep8.register_check)
sys.path.pop() sys.path.pop()

View File

@@ -1,5 +1,4 @@
d2to1>=0.2.10,<0.3 pbr>=0.5.21,<1.0
pbr>=0.5.10,<0.6
pep8==1.4.5 pep8==1.4.5
pyflakes==0.7.2 pyflakes==0.7.2

View File

@@ -20,10 +20,6 @@ classifier =
packages = packages =
hacking hacking
[global]
setup-hooks =
pbr.hooks.setup_hook
[entry_points] [entry_points]
flake8.extension = flake8.extension =
H000 = hacking.core:ProxyChecks H000 = hacking.core:ProxyChecks

View File

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

View File

@@ -4,5 +4,5 @@ fixtures>=0.3.12
python-subunit python-subunit
sphinx>=1.1.2 sphinx>=1.1.2
testrepository>=0.0.17 testrepository>=0.0.17
testscenarios testscenarios>=0.4,<0.5
testtools>=0.9.27 testtools>=0.9.32