From b4113179d57477bd06b6b8b2878c20a841249204 Mon Sep 17 00:00:00 2001 From: Sebastian Kalinowski Date: Fri, 27 Feb 2015 12:26:51 +0100 Subject: [PATCH] Fix package version when using pbr PBR adds a git revision to package version. We don't need it. Additionally it breaks ISO build since script is looking for version x.y.z and package has version x.y.z.dev0.qwerty123 Change-Id: I32eb6ca221c62f35de4318b424526a7282595fcf Related: blueprint granular-deployment-based-on-tasks --- setup.cfg | 1 + tasks_validator/setup_hooks.py | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 tasks_validator/setup_hooks.py diff --git a/setup.cfg b/setup.cfg index 46aa408..e092588 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,6 +23,7 @@ packages = [global] setup-hooks = pbr.hooks.setup_hook + tasks_validator.setup_hooks.fix_version [wheel] universal = 1 diff --git a/tasks_validator/setup_hooks.py b/tasks_validator/setup_hooks.py new file mode 100644 index 0000000..20bcb84 --- /dev/null +++ b/tasks_validator/setup_hooks.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- + +# Copyright 2015 Mirantis, Inc. +# +# 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. + + +def fix_version(config): + """Monkeypatch for PBR to do not add commit id to package version.""" + import pbr + import pbr.packaging + + pbr.packaging._get_version_from_git = lambda pre_version: pre_version