From a9406879f68eca3237534656978f9129c67a7fc9 Mon Sep 17 00:00:00 2001 From: Tommy Carpenter Date: Thu, 25 Oct 2018 13:44:19 -0400 Subject: Fix issue caused by flake8 upgrade Issue-ID: DCAEGEN2-919 Change-Id: Id18b31751576cddbadcfd1d845c8e0e90dd3a49a Signed-off-by: Tommy Carpenter --- Changelog.md | 3 +++ README.md | 1 + app/app/config_binding_service/controller.py | 2 +- app/app/pom.xml | 4 ++-- app/app/setup.py | 2 +- app/app/tox.ini | 2 +- app/pom.xml | 4 ++-- pom.xml | 2 +- tox-local.ini | 25 ------------------------- version.properties | 2 +- 10 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 tox-local.ini diff --git a/Changelog.md b/Changelog.md index d1c2fac..34913b5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [2.2.4] - 10/25/2018 +* Fix issues caused by a flake8 update + ## [2.2.3] - 7/25/2018 * By request, include a self signed cert so the image always comes up. diff --git a/README.md b/README.md index 6cc17c4..71feca6 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ An unforunate consequence of the nested poms is that development changes require 3. pom in /app/app 4. setup.py in /app/app 5. Changelod.md +6. version.properties Additionally, if the development leads to an API change, 6. swagger.yaml in /app/app diff --git a/app/app/config_binding_service/controller.py b/app/app/config_binding_service/controller.py index 943837c..c2eb21c 100644 --- a/app/app/config_binding_service/controller.py +++ b/app/app/config_binding_service/controller.py @@ -36,7 +36,7 @@ def _get_helper(json_expecting_func, **kwargs): response, status_code, mimetype = exc.response, exc.code, "text/plain" except client.CantGetConfig as exc: response, status_code, mimetype = exc.response, exc.code, "text/plain" - except Exception as exc: + except Exception: response, status_code, mimetype = "Unknown error", 500, "text/plain" return response, status_code, mimetype diff --git a/app/app/pom.xml b/app/app/pom.xml index 806098d..a066a99 100644 --- a/app/app/pom.xml +++ b/app/app/pom.xml @@ -24,13 +24,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. org.onap.dcaegen2.platform.configbinding app - 2.2.3-SNAPSHOT + 2.2.4-SNAPSHOT org.onap.dcaegen2.platform.configbinding app-app dcaegen2-platform-configbinding-app-app - 2.2.3-SNAPSHOT + 2.2.4-SNAPSHOT http://maven.apache.org UTF-8 diff --git a/app/app/setup.py b/app/app/setup.py index 237f7c4..31c8805 100644 --- a/app/app/setup.py +++ b/app/app/setup.py @@ -20,7 +20,7 @@ from setuptools import setup, find_packages setup( name='config_binding_service', - version='2.2.3', + version='2.2.4', packages=find_packages(exclude=["tests.*", "tests"]), author="Tommy Carpenter", author_email="tommy@research.att.com", diff --git a/app/app/tox.ini b/app/app/tox.ini index c58161e..34fb22d 100644 --- a/app/app/tox.ini +++ b/app/app/tox.ini @@ -22,5 +22,5 @@ deps = flake8 commands = flake8 setup.py config_binding_service tests [flake8] -ignore = E501 +ignore = E501,W605 diff --git a/app/pom.xml b/app/pom.xml index 52387e6..988add6 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -23,14 +23,14 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. org.onap.dcaegen2.platform configbinding - 2.2.3-SNAPSHOT + 2.2.4-SNAPSHOT org.onap.dcaegen2.platform.configbinding app dcaegen2-platform-configbinding-app - 2.2.3-SNAPSHOT + 2.2.4-SNAPSHOT http://maven.apache.org pom diff --git a/pom.xml b/pom.xml index 2eef1f0..39e1a1a 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. org.onap.dcaegen2.platform configbinding dcaegen2-platform-configbinding - 2.2.3-SNAPSHOT + 2.2.4-SNAPSHOT http://maven.apache.org pom diff --git a/tox-local.ini b/tox-local.ini deleted file mode 100644 index be6fb90..0000000 --- a/tox-local.ini +++ /dev/null @@ -1,25 +0,0 @@ -# content of: tox.ini , put in same dir as setup.py -[tox] -envlist = py36,flake8 -setupdir=app/app - -[testenv] -deps= - pytest - coverage - pytest-cov -setenv = - CONSUL_HOST = 8.8.8.8 - HOSTNAME = config_binding_service -commands= - pytest --verbose --cov config_binding_service --cov-report=html - -[testenv:flake8] -basepython = python3.7 -skip_install = true -deps = flake8 -commands = flake8 setup.py config_binding_service tests - -[flake8] -ignore = E501,E265,E262,E261 - diff --git a/version.properties b/version.properties index cf8d147..88c806c 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=2 minor=2 -patch=3 +patch=4 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg