From ee796cd26464d78beb559730306a62bf382724d4 Mon Sep 17 00:00:00 2001 From: Matthew Watkins Date: Tue, 6 Dec 2022 13:54:10 +0000 Subject: Chore: Unpin robot/versions to match ci-management Also remove Python2.x tests from tox.ini Issue-ID: CCSDK-3820 Signed-off-by: Matthew Watkins Change-Id: Ie852cba988b962dbd0c32e27f987260aaa55e644 Signed-off-by: Matthew Watkins --- robotframework-onap/README.TXT | 1 - robotframework-onap/requirements.txt | 7 +++---- robotframework-onap/setup.cfg | 3 +-- robotframework-onap/tox.ini | 7 +------ 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/robotframework-onap/README.TXT b/robotframework-onap/README.TXT index f5b20c9..6fdb111 100644 --- a/robotframework-onap/README.TXT +++ b/robotframework-onap/README.TXT @@ -10,7 +10,6 @@ It provides 3 packages: A tox file has been created with the following targets: * py3: run unit tests using python3 + provide unit test coverage information -* py27: run unit tests using python2.7 * pep8: python linting with flake8 (python3) * pylint: python linting with pylint (python3), pylint provide a rate estimation diff --git a/robotframework-onap/requirements.txt b/robotframework-onap/requirements.txt index 325153c..9f8bb6d 100644 --- a/robotframework-onap/requirements.txt +++ b/robotframework-onap/requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr!=2.1.0 # Apache-2.0 +pbr deepdiff dnspython future @@ -9,12 +9,11 @@ jinja2 jsonpath-rw kafka-python paramiko -protobuf==3.16.0 +protobuf pyyaml requests -robotframework robotframework-requests==0.9.3 robotlibcore-temp six urllib3 -more-itertools~=5.0.0 \ No newline at end of file +more-itertools diff --git a/robotframework-onap/setup.cfg b/robotframework-onap/setup.cfg index 098b515..8ebf4a0 100644 --- a/robotframework-onap/setup.cfg +++ b/robotframework-onap/setup.cfg @@ -13,11 +13,10 @@ classifier = Intended Audience :: Information Technology License :: OSI Approved :: Apache Software License Operating System :: OS Independent - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3.7 [options] -python_requires = >=2.7,<=3.9 +python_requires = >=3.7 [files] packages = diff --git a/robotframework-onap/tox.ini b/robotframework-onap/tox.ini index 34e0b7e..b506255 100644 --- a/robotframework-onap/tox.ini +++ b/robotframework-onap/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,pep8,pylint,py3 +envlist = pep8,pylint,py3 distdir = {toxinidir}/dist modules = ONAPLibrary @@ -35,8 +35,3 @@ commands = nosetests --with-xunit \ --cover-xml \ --cover-html \ tests - -[testenv:py27] -basepython = python2.7 -commands = - nosetests --all-modules tests -- cgit 1.2.3-korg