summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommy Carpenter <tommy@research.att.com>2018-02-19 20:46:13 -0500
committerTommy Carpenter <tommy@research.att.com>2018-02-19 20:47:55 -0500
commite8e4e3878deb5e93ae25f93fe047708a170893ca (patch)
treef3c7663b5ff9b1280bff5e65bc1788c67edd2209
parent8c776e128cf557490db59525b29a608e30e637be (diff)
Dont pin requests version in client lib
Note 0.0.4 was previously reused erronsouly in public pypi so I had to bump to 0.0.5 Issue-ID: DCAEGEN2-351 Change-Id: Ifd9fbd3f021d07f4ff2beac8aaf5a60ff4a1e317 Signed-off-by: Tommy Carpenter <tommy@research.att.com>
-rw-r--r--dcaeapplib/setup.py4
-rw-r--r--onap-dcae-cbs-docker-client/Changelog.md5
-rw-r--r--onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/__init__.py3
-rw-r--r--onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/client.py3
-rw-r--r--onap-dcae-cbs-docker-client/requirements.txt1
-rw-r--r--onap-dcae-cbs-docker-client/setup.py14
-rw-r--r--onap-dcae-cbs-docker-client/tox-local.ini3
-rw-r--r--onap-dcae-cbs-docker-client/tox.ini3
8 files changed, 15 insertions, 21 deletions
diff --git a/dcaeapplib/setup.py b/dcaeapplib/setup.py
index a19fa7c..5811e42 100644
--- a/dcaeapplib/setup.py
+++ b/dcaeapplib/setup.py
@@ -21,7 +21,7 @@ from setuptools import setup, find_packages
setup(
name='dcaeapplib',
- version='0.0.3',
+ version='0.0.4',
packages=find_packages(),
author = 'Andrew Gauld',
author_email = 'ag1282@att.com',
@@ -30,7 +30,7 @@ setup(
keywords = '',
url = '',
zip_safe = True,
- install_requires=[ 'onap-dcae-cbs-docker-client>=0.0.2' ],
+ install_requires=[ 'onap-dcae-cbs-docker-client>=0.0.5' ],
entry_points = {
'console_scripts': [
'reconfigure.sh=dcaeapplib:reconfigure'
diff --git a/onap-dcae-cbs-docker-client/Changelog.md b/onap-dcae-cbs-docker-client/Changelog.md
index 5027203..e9c3347 100644
--- a/onap-dcae-cbs-docker-client/Changelog.md
+++ b/onap-dcae-cbs-docker-client/Changelog.md
@@ -1,9 +1,12 @@
# Change Log
All notable changes to this project will be documented in this file.
-The format is based on [Keep a Changelog](http://keepachangelog.com/)
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [0.0.5]
+* Dont pin requests version
+
## [0.0.3]
* Changelog started
* Unit test suite created
diff --git a/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/__init__.py b/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/__init__.py
index 9e81f65..d1f044b 100644
--- a/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/__init__.py
+++ b/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/__init__.py
@@ -1,6 +1,5 @@
-# org.onap.dcae
# ================================================================================
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/client.py b/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/client.py
index ce9ac74..3abf447 100644
--- a/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/client.py
+++ b/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/client.py
@@ -1,6 +1,5 @@
-# org.onap.dcae
# ================================================================================
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/onap-dcae-cbs-docker-client/requirements.txt b/onap-dcae-cbs-docker-client/requirements.txt
deleted file mode 100644
index 856c82c..0000000
--- a/onap-dcae-cbs-docker-client/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-requests==2.18.3
diff --git a/onap-dcae-cbs-docker-client/setup.py b/onap-dcae-cbs-docker-client/setup.py
index 9f23048..fcefa91 100644
--- a/onap-dcae-cbs-docker-client/setup.py
+++ b/onap-dcae-cbs-docker-client/setup.py
@@ -1,6 +1,5 @@
-# org.onap.dcae
# ================================================================================
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,21 +18,18 @@
import os
from setuptools import setup, find_packages
-from pip.req import parse_requirements
-from pip.download import PipSession
-
-install_reqs = parse_requirements("requirements.txt", session=PipSession())
-reqs = [str(ir.req) for ir in install_reqs]
setup(
name = "onap_dcae_cbs_docker_client",
description = "very lightweight client for a DCAE dockerized component to get it's config from the CBS",
- version = "0.0.3",
+ version = "0.0.5",
packages=find_packages(),
author = "Tommy Carpenter",
author_email = "tommy@research.att.com",
license='Apache 2',
keywords = "",
url = "",
- install_requires=reqs
+ install_requires = [
+ "requests"
+ ]
)
diff --git a/onap-dcae-cbs-docker-client/tox-local.ini b/onap-dcae-cbs-docker-client/tox-local.ini
index a5991a9..244386f 100644
--- a/onap-dcae-cbs-docker-client/tox-local.ini
+++ b/onap-dcae-cbs-docker-client/tox-local.ini
@@ -3,11 +3,10 @@ envlist = py27,py36
[testenv]
deps=
- -rrequirements.txt
pytest
coverage
pytest-cov
-setenv =
+setenv =
CONSUL_HOST = consuldotcom
HOSTNAME = mybestfrienddotcom
commands=pytest --cov {envsitepackagesdir}/onap_dcae_cbs_docker_client --cov-report html
diff --git a/onap-dcae-cbs-docker-client/tox.ini b/onap-dcae-cbs-docker-client/tox.ini
index 9e57fc0..cad80d0 100644
--- a/onap-dcae-cbs-docker-client/tox.ini
+++ b/onap-dcae-cbs-docker-client/tox.ini
@@ -1,10 +1,9 @@
# content of: tox.ini , put in same dir as setup.py
[tox]
-envlist = py27,py35
+envlist = py27,py36
[testenv]
deps=
- -rrequirements.txt
pytest
coverage
pytest-cov