diff --git a/CHANGELOG.md b/CHANGELOG.md index fafd931c0..366a6890b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,11 @@ Changed Fixed Removed +## [0.0.4] - 2018-04-18 + +Changed + * Adapted click wrapper in decorators to v1.0.0 of OCR-D/spec + ## [0.0.2] - 2018-04-17 Fixed @@ -21,5 +26,6 @@ Fixed Initial Release +[0.0.4]: ../../compare/v0.0.2...v0.0.4 [0.0.2]: ../../compare/v0.0.1...v0.0.2 [0.0.1]: ../../compare/HEAD...v0.0.1 diff --git a/ocrd/decorators.py b/ocrd/decorators.py index e2d3663cd..162232d12 100644 --- a/ocrd/decorators.py +++ b/ocrd/decorators.py @@ -28,13 +28,14 @@ def cli(mets_url): print(mets_url) """ params = [ - click.option('-m', '--mets-url', help="METS URL to validate", required=True), - click.option('-o', '--output-mets', help="METS URL to write resulting METS to"), - click.option('-p', '--parameter', type=click.Path()), + click.option('-m', '--mets', help="METS URL to validate", required=True), click.option('-w', '--working-dir', help="Working Directory"), + click.option('-I', '--input-file-grp', help='File group(s) used as input.', default='INPUT'), + click.option('-O', '--output-file-grp', help='File group(s) used as output.', default='OUTPUT'), click.option('-g', '--group-id', help="mets:file GROUPID"), - click.option('-I', '--input-filegrp', help='File group(s) used as input.', default='INPUT'), - click.option('-O', '--output-filegrp', help='File group(s) used as output.', default='OUTPUT'), + click.option('-o', '--output-mets', help="METS URL to write resulting METS to"), + click.option('-p', '--parameter', type=click.Path()), + click.option('-l', '--log-level', help="Log level", type=click.Choice(['OFF', 'ERROR', 'WARN', 'INFO', 'DEBUG', 'TRACE']), default='INFO'), ] for param in params: param(f) diff --git a/setup.py b/setup.py index 03020b0e7..0231f6504 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name='ocrd', - version='0.0.2', + version='0.0.4', description='OCR-D framework', long_description=README, author='Kay-Michael Würzner, Konstantin Baierer',