aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-03-19 09:33:51 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-03-20 10:31:06 +0100
commit576da4494f47260a3e3a30d4361e8ce410771d38 (patch)
tree182ce858c3d00501f3c7d8daab9ae01025ebce86
parent12c9651ae71ab27287d1fe27e625087e6008f9a0 (diff)
Create CIRV python package
It adds missing __init__py and fixes concrete and abstract dependencies. It adds pylint in tox without loading pylintrc which seems too much permissive. The missing requirements and the pylint fixes will be managed in next changes. Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: Id4e1e290012e53e275f7d64765d388118e7ac235
-rw-r--r--requirements.txt17
-rw-r--r--setup.cfg24
-rw-r--r--setup.py29
-rw-r--r--test-requirements.txt7
-rw-r--r--tools/__init__.py0
-rw-r--r--tools/hdv/__init__.py0
-rw-r--r--tools/hdv/redfish/conf/report.yaml (renamed from tools/hdv/redfish/conf/report_sample.yaml)0
-rw-r--r--tools/sdv/__init__.py0
-rw-r--r--tox.ini9
9 files changed, 76 insertions, 10 deletions
diff --git a/requirements.txt b/requirements.txt
index 5ab39ca..7d0c0ff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,6 @@
+# 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.
# Copyright (c) 2020 Spirent Communications
#
# All rights reserved. This program and the accompanying materials
@@ -5,10 +8,10 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
-pyyaml==5.3
-pylint==1.8.2
-urllib3==1.25.8
-gitpython==3.0.8
-requests==2.8.1
-netaddr==0.7.18
-openpyxl==3.0.3
+PyYAML # MIT
+urllib3 # MIT
+GitPython<2.1.12;python_version<'3.0' # BSD License (3 clause)
+GitPython;python_version>='3.0' # BSD License (3 clause)
+requests!=2.20.0 # Apache-2.0
+netaddr # BSD
+openpyxl
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..656396d
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,24 @@
+[metadata]
+name = cirv
+summary = Common Infrastructure Realization & Validation
+description-file =
+ README.md
+author = OPNFV
+author-email = opnfv-tech-discuss@lists.opnfv.org
+home-page = https://wiki.opnfv.org/display/functest
+classifier =
+ Intended Audience :: Information Technology
+ Intended Audience :: System Administrators
+ License :: OSI Approved :: Apache Software License
+ Operating System :: POSIX :: Linux
+ Programming Language :: Python
+ Programming Language :: Python :: 2
+ Programming Language :: Python :: 2.7
+ Programming Language :: Python :: 3
+ Programming Language :: Python :: 3.5
+
+[files]
+packages = tools
+
+[wheel]
+universal = 1
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..566d844
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,29 @@
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
+import setuptools
+
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+ import multiprocessing # noqa
+except ImportError:
+ pass
+
+setuptools.setup(
+ setup_requires=['pbr>=2.0.0'],
+ pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index f083866..23c3b64 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,8 @@
+# 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.
flake8 # MIT
yamllint
-bashate # Apache-2.0
+bashate<1.0.0;python_version=='2.7' # Apache-2.0
+bashate;python_version>='3.6' # Apache-2.0
+pylint
diff --git a/tools/__init__.py b/tools/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/__init__.py
diff --git a/tools/hdv/__init__.py b/tools/hdv/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/hdv/__init__.py
diff --git a/tools/hdv/redfish/conf/report_sample.yaml b/tools/hdv/redfish/conf/report.yaml
index d396360..d396360 100644
--- a/tools/hdv/redfish/conf/report_sample.yaml
+++ b/tools/hdv/redfish/conf/report.yaml
diff --git a/tools/sdv/__init__.py b/tools/sdv/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/sdv/__init__.py
diff --git a/tox.ini b/tox.ini
index 4464987..421d621 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
[tox]
-envlist = pep8,yamllint,bashate
-skipsdist = true
+envlist = pep8,yamllint,bashate,pylint
[testenv]
deps =
+ -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
@@ -24,3 +24,8 @@ basepython = python3
files =
ci/build-cirv.sh
commands = bashate -e E005,E006,E042,E043 {[testenv:bashate]files}
+
+[testenv:pylint]
+basepython = python3
+commands =
+ pylint tools