From 293143d8f1863cc497783d082b64c9c31c23033b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 31 Oct 2013 20:22:35 -0500 Subject: [PATCH] revert to the old way of doing versioning as the change in 3.01 did not work --- pungi.spec | 5 ++++- setup.py | 2 +- src/bin/pungi.py | 2 +- src/pypungi/__init__.py | 3 --- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pungi.spec b/pungi.spec index 747d540a..0e3d1a12 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi -Version: 3.02 +Version: 3.03 Release: 1%{?dist} Summary: Distribution compose tool @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT /var/cache/pungi %changelog +* Thu Oct 31 2013 Dennis Gilmore - 3.03-1 +- revert to the old way of doing versioning as the change in 3.01 did not work + * Thu Oct 31 2013 Dennis Gilmore - 3.02-1 - fix typo in call to __version__ (Dennis Gilmore) diff --git a/setup.py b/setup.py index 2bc656c1..fb17530c 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup import glob setup(name='pungi', - version='3.02', # make sure it matches pypungi.__version__ + version='3.03', # make sure src/bin/pungi.py is updated to match description='Distribution compose tool', author='Dennis Gilmore', author_email='dgilmore@fedoraproject.org', diff --git a/src/bin/pungi.py b/src/bin/pungi.py index 86b87123..261939a7 100755 --- a/src/bin/pungi.py +++ b/src/bin/pungi.py @@ -178,7 +178,7 @@ if __name__ == '__main__': today = time.strftime('%Y%m%d', time.localtime()) def get_arguments(config): - parser = OptionParser("%prog [--help] [options]", version="%prog %s" % pypungi.__version__) + parser = OptionParser("%prog [--help] [options]", version="%prog 3.03") def set_config(option, opt_str, value, parser, config): config.set('pungi', option.dest, value) diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py index c5d31955..e719f1a4 100644 --- a/src/pypungi/__init__.py +++ b/src/pypungi/__init__.py @@ -15,9 +15,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -__version__ = "3.02" - - import yum import os import re