aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommy Carpenter <tommy@research.att.com>2019-08-16 13:33:39 -0400
committerTommy Carpenter <tommy@research.att.com>2019-08-16 15:07:32 -0400
commit8e877dcb6836b8dabf493b2a5c6d42227fa49cf0 (patch)
tree7d4ea651ec59ebc00b448a68e4542ef53ed01268
parent373a87753cfa0d46ff6689a323b8c9cd0f5783e5 (diff)
Transition to py37 now that python jjb in use
Issue-ID: DCAEGEN2-1729 Change-Id: I4a0cabdc0e51b330da708b4341e1097e575e2d90 Signed-off-by: Tommy Carpenter <tommy@research.att.com>
-rw-r--r--Changelog.md3
-rw-r--r--Dockerfile2
-rw-r--r--pom.xml2
-rw-r--r--setup.py2
-rw-r--r--tox.ini4
-rw-r--r--version.properties2
6 files changed, 9 insertions, 6 deletions
diff --git a/Changelog.md b/Changelog.md
index 2f29e66..12c2a71 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.5.2] - 8/16/2019
+* Switch to py37 for unit testing and docker now that LF supports it under the python jjb
+
## [2.5.1] - 6/17/2019
* Switch to alpine base
* use a non root user
diff --git a/Dockerfile b/Dockerfile
index abfbad5..df26a59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.6-alpine
+FROM python:3.7-alpine
MAINTAINER tommy@research.att.com
COPY . /tmp
diff --git a/pom.xml b/pom.xml
index 904c3c7..bf516f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,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.5.1-SNAPSHOT</version>
+ <version>2.5.2-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/setup.py b/setup.py
index b276e94..8ee9816 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ from setuptools import setup, find_packages
setup(
name="config_binding_service",
- version="2.5.1",
+ version="2.5.2",
packages=find_packages(exclude=["tests.*", "tests"]),
author="Tommy Carpenter",
author_email="tommy@research.att.com",
diff --git a/tox.ini b/tox.ini
index a5342ca..614642b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
[tox]
-envlist = py36,flake8
+envlist = py37,flake8
[testenv]
deps=
@@ -33,7 +33,7 @@ commands=
coverage xml -i
[testenv:flake8]
-basepython = python3.6
+basepython = python3.7
skip_install = true
deps = flake8
commands = flake8 setup.py config_binding_service tests
diff --git a/version.properties b/version.properties
index 23c0525..d193a56 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=2
minor=5
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT