diff options
| -rw-r--r-- | Changelog.md | 3 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | app/app/config_binding_service/client.py | 2 | ||||
| -rw-r--r-- | app/app/pom.xml | 4 | ||||
| -rw-r--r-- | app/app/setup.py | 2 | ||||
| -rw-r--r-- | app/app/swagger.yaml | 2 | ||||
| -rw-r--r-- | app/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
9 files changed, 13 insertions, 11 deletions
diff --git a/Changelog.md b/Changelog.md index 6d2eb34..546a29c 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.5] - 2/7/2019 +* Fix issue caused by a flake8 update + ## [2.2.4] - 10/25/2018 * Fix issues caused by a flake8 update @@ -52,9 +52,8 @@ An unforunate consequence of the nested poms is that development changes require 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 +7. swagger.yaml in /app/app ## Testing You need `tox`. diff --git a/app/app/config_binding_service/client.py b/app/app/config_binding_service/client.py index 93f4d69..c6a6753 100644 --- a/app/app/config_binding_service/client.py +++ b/app/app/config_binding_service/client.py @@ -151,7 +151,7 @@ def _replace_rels_template(rels, template_identifier): """ returnl = [] for rel in rels: - if template_identifier in rel and template_identifier is not "": + if template_identifier in rel and template_identifier != "": returnl.append(rel) # returnl now contains a list of DNS names (possible empty), now resolve them (or not if they are not regustered) return list(filter(lambda x: x is not None, map(_get_connection_info_from_consul, returnl))) diff --git a/app/app/pom.xml b/app/app/pom.xml index a066a99..7887201 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. <parent> <groupId>org.onap.dcaegen2.platform.configbinding</groupId> <artifactId>app</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.2.5-SNAPSHOT</version> </parent> <!--- CHANGE THE FOLLOWING 3 OBJECTS for your own repo --> <groupId>org.onap.dcaegen2.platform.configbinding</groupId> <artifactId>app-app</artifactId> <name>dcaegen2-platform-configbinding-app-app</name> - <version>2.2.4-SNAPSHOT</version> + <version>2.2.5-SNAPSHOT</version> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/app/app/setup.py b/app/app/setup.py index 31c8805..65ff0b6 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.4', + version='2.2.5', packages=find_packages(exclude=["tests.*", "tests"]), author="Tommy Carpenter", author_email="tommy@research.att.com", diff --git a/app/app/swagger.yaml b/app/app/swagger.yaml index cfe0944..49627c0 100644 --- a/app/app/swagger.yaml +++ b/app/app/swagger.yaml @@ -20,7 +20,7 @@ --- swagger: "2.0" info: - version: "2.1.0" + version: "2.2.5" title: "Config Binding Service" paths: /service_component/{service_component_name}: diff --git a/app/pom.xml b/app/pom.xml index 988add6..e37430e 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. <parent> <groupId>org.onap.dcaegen2.platform</groupId> <artifactId>configbinding</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.2.5-SNAPSHOT</version> </parent> <!--- CHANGE THE FOLLOWING 3 OBJECTS for your own repo --> <groupId>org.onap.dcaegen2.platform.configbinding</groupId> <artifactId>app</artifactId> <name>dcaegen2-platform-configbinding-app</name> - <version>2.2.4-SNAPSHOT</version> + <version>2.2.5-SNAPSHOT</version> <url>http://maven.apache.org</url> <packaging>pom</packaging> @@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <groupId>org.onap.dcaegen2.platform</groupId> <artifactId>configbinding</artifactId> <name>dcaegen2-platform-configbinding</name> - <version>2.2.4-SNAPSHOT</version> + <version>2.2.5-SNAPSHOT</version> <url>http://maven.apache.org</url> <packaging>pom</packaging> diff --git a/version.properties b/version.properties index 88c806c..2540253 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=2 minor=2 -patch=4 +patch=5 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |