From 250edfbe858a5adf7a9966e4538612dcb10b424e Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Nov 02 2017 06:35:32 +0000 Subject: [PATCH 1/3] Initialized to use tito. --- diff --git a/.tito/packages/.readme b/.tito/packages/.readme new file mode 100644 index 0000000..b9411e2 --- /dev/null +++ b/.tito/packages/.readme @@ -0,0 +1,3 @@ +the .tito/packages directory contains metadata files +named after their packages. Each file has the latest tagged +version and the project's relative directory. diff --git a/.tito/tito.props b/.tito/tito.props new file mode 100644 index 0000000..eab3f19 --- /dev/null +++ b/.tito/tito.props @@ -0,0 +1,5 @@ +[buildconfig] +builder = tito.builder.Builder +tagger = tito.tagger.VersionTagger +changelog_do_not_remove_cherrypick = 0 +changelog_format = %s (%ae) From 5a86a3aa3e045f7e65e8be36464a9cb933a1820d Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Nov 02 2017 07:51:08 +0000 Subject: [PATCH 2/3] Set up for tito based releases --- diff --git a/fedmod.spec b/fedmod.spec new file mode 100644 index 0000000..759af52 --- /dev/null +++ b/fedmod.spec @@ -0,0 +1,51 @@ +# Based on initial spec generated by pyp2rpm-3.2.3 + +Name: fedmod +Version: 0.0.2 +Release: 1%{?dist} +Summary: Utilities for generating & maintaining modulemd files + +License: MIT +URL: https://pagure.io/modularity/fedmod +Source0: %{name}-%{version}.tar.gz +BuildArch: noarch + +BuildRequires: python3-devel +BuildRequires: python3-setuptools + +%description +fedmod provides tools for converting existing RPMs (most notably metapackages) +into module definitions in Fedora's modulemd format. + +Requires: python3-attrs +Requires: python3-click +Requires: python3-lxml +Requires: python3-modulemd +Requires: python3-requests +Requires: python3-requests-toolbelt +Requires: python3-setuptools + + +%prep +%autosetup -n %{name}-%{version} +# Remove bundled egg-info +rm -rf %{name}.egg-info + +%build +cd src +%py3_build + +%install +cd src +%py3_install + + +%files +%doc +%{_bindir}/fedmod +%{python3_sitelib}/_fedmod +%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info + +%changelog +* Wed Nov 01 2017 mockbuilder - 0.0.2-1 +- Initial package. \ No newline at end of file diff --git a/tag-release.sh b/tag-release.sh new file mode 100755 index 0000000..bfc5e39 --- /dev/null +++ b/tag-release.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# Based on https://git.beaker-project.org/cgit/beaker/plain/Misc/tag-release.sh +# Ensures Python project version, RPM version & git tag are all consistent + +set -e + +version="$1" +prerelease="$2" + +if [ -z "$version" ] ; then + echo "Usage: $0 " >&2 + echo "Example: $0 4.2" >&2 + exit 1 +fi + +if git status --porcelain | grep -qE '^.(M|[?])' ; then + echo "Work tree has modifications, stash or add before tagging" >&2 + exit 1 +fi + +sed -i -e "/^Version:/c\Version: $version" fedmod.spec +sed -i -e "/version=/c\ version='$version'," */setup.py +git add fedmod.spec */setup.py +git commit -m "Update version metadata for release $version" +tito tag --keep-version --accept-auto-changelog From f8e344a01a32a281606e5a521ce0905014a20633 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Nov 02 2017 07:52:00 +0000 Subject: [PATCH 3/3] Update version metadata for release 0.0.3 --- diff --git a/fedmod.spec b/fedmod.spec index 759af52..14530c2 100644 --- a/fedmod.spec +++ b/fedmod.spec @@ -1,7 +1,7 @@ # Based on initial spec generated by pyp2rpm-3.2.3 Name: fedmod -Version: 0.0.2 +Version: 0.0.3 Release: 1%{?dist} Summary: Utilities for generating & maintaining modulemd files diff --git a/src/setup.py b/src/setup.py index 5f75e3a..ba7c56b 100644 --- a/src/setup.py +++ b/src/setup.py @@ -5,7 +5,7 @@ from setuptools import setup, find_packages setup( name='fedmod', - version='0.0.2', + version='0.0.3', author='Dominika Hodovska', author_email='dhodovsk@redhat.com', maintainer='Nick Coghlan',