From 896a896d1bc29ffb84b7b24677b5ff01eb6e1f80 Mon Sep 17 00:00:00 2001 From: Steve Engledow Date: Thu, 8 Nov 2018 08:58:21 -0500 Subject: [PATCH 1/2] Pin dependencies --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0cb0b8a..8b36fbd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Click -PyYAML -six -tox +Click==7.0 +PyYAML==3.13 +six==1.11.0 +tox==3.5.3 From 455f3a210fb82f88f706ec7649e9a46c876c8c35 Mon Sep 17 00:00:00 2001 From: Steve Engledow Date: Thu, 8 Nov 2018 09:16:49 -0500 Subject: [PATCH 2/2] Pin versions of pytest and dependencies. Minor wording tweaks. --- cfn_flip/main.py | 4 +--- snapcraft.yaml | 1 + tox.ini | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cfn_flip/main.py b/cfn_flip/main.py index ff7bde6..785cb8c 100644 --- a/cfn_flip/main.py +++ b/cfn_flip/main.py @@ -21,9 +21,7 @@ @click.option("--yaml", "-y", "out_format", flag_value="yaml", help="Convert to YAML. Assume the input is JSON.") @click.option("--clean", "-c", is_flag=True, help="Performs some opinionated cleanup on your template.") @click.option("--long", "-l", is_flag=True, help="Use long-form syntax for functions when converting to YAML.") -@click.option("--no-flip", "-n", is_flag=True, help="Don't convert. If you use -n in conjunction with -j or -y, " + - "the input format is assumed to be the same as the output format" + - " you specify.") +@click.option("--no-flip", "-n", is_flag=True, help="Perform other operations but do not flip the output format.") @click.argument("input", type=click.File("r"), default=sys.stdin) @click.argument("output", type=click.File("w"), default=sys.stdout) @click.version_option(message='AWS Cloudformation Template Flip, Version %(version)s') diff --git a/snapcraft.yaml b/snapcraft.yaml index 691804d..d1e9b7b 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,6 +3,7 @@ version: git summary: Converts AWS CloudFormation templates between JSON and YAML formats. description: | AWS CloudFormation Template Flip is a tool that converts AWS CloudFormation templates between JSON and YAML formats, making use of the YAML format’s short function syntax where possible. + The term "Flip" is inspired by the well-known Unix command-line tool flip which converts text files between Unix, Mac, and MS-DOS formats. parts: diff --git a/tox.ini b/tox.ini index 5006fb2..efef09e 100644 --- a/tox.ini +++ b/tox.ini @@ -4,13 +4,13 @@ # and then run "tox" from this directory. [tox] -envlist = py27, py36, flake8 +envlist = py27, py37, flake8 [testenv] deps = - pytest - pytest-cov - pytest-sugar + pytest==3.3.2 + pytest-cov==2.6.0 + pytest-sugar==0.9.1 commands = py.test \