From 21b530c2565cad932bc8724d8cdad8b43a0d4d97 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Tue, 11 May 2021 19:04:31 -0700 Subject: [PATCH] Update to support Click 8 --- CHANGELOG.md | 7 +++++++ setup.cfg | 2 +- yaclog/cli/__main__.py | 21 ++++++++++++++------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f3ffb4..01be6b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file +## Unreleased + +### Changed + +- Updated to support Click version 8 + + ## 1.0.1 - 2021-05-10 ### Fixed diff --git a/setup.cfg b/setup.cfg index 2d57301..9653d61 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,7 +29,7 @@ project_urls = [options] install_requires = - Click ~= 7.0 + Click >= 7.0, < 9.0 GitPython >= 3 packaging >= 20 python_requires = >= 3.8 diff --git a/yaclog/cli/__main__.py b/yaclog/cli/__main__.py index 6133af3..22a3e56 100644 --- a/yaclog/cli/__main__.py +++ b/yaclog/cli/__main__.py @@ -172,13 +172,20 @@ def entry(obj: Changelog, bullets, paragraphs, section_name, version_name): @cli.command(short_help='Release versions.') -@click.option('-M', '--major', 'rel_seg', flag_value=0, default=None, help='Increment major version number.') -@click.option('-m', '--minor', 'rel_seg', flag_value=1, help='Increment minor version number.') -@click.option('-p', '--patch', 'rel_seg', flag_value=2, help='Increment patch number.') -@click.option('-a', '--alpha', 'pre_seg', flag_value='a', default=None, help='Increment alpha version number.') -@click.option('-b', '--beta', 'pre_seg', flag_value='b', help='Increment beta version number.') -@click.option('-r', '--rc', 'pre_seg', flag_value='rc', help='Increment release candidate version number.') -@click.option('-f', '--full', 'pre_seg', flag_value='', help='Clear the prerelease value creating a full release.') +@click.option('-M', '--major', 'rel_seg', flag_value=0, type=int, default=None, + help='Increment major version number.') +@click.option('-m', '--minor', 'rel_seg', flag_value=1, type=int, + help='Increment minor version number.') +@click.option('-p', '--patch', 'rel_seg', flag_value=2, type=int, + help='Increment patch number.') +@click.option('-a', '--alpha', 'pre_seg', flag_value='a', type=str, default=None, + help='Increment alpha version number.') +@click.option('-b', '--beta', 'pre_seg', flag_value='b', type=str, + help='Increment beta version number.') +@click.option('-r', '--rc', 'pre_seg', flag_value='rc', type=str, + help='Increment release candidate version number.') +@click.option('-f', '--full', 'pre_seg', flag_value='', + help='Clear the prerelease value creating a full release.') @click.option('-c', '--commit', is_flag=True, help='Create a git commit tagged with the new version number. ' 'If there are no changes to commit, the current commit will be tagged instead.')