From 680cab955f1d746117c14ee21396ffc53a19664a Mon Sep 17 00:00:00 2001 From: vrvarma Date: Wed, 19 Feb 2020 19:53:50 -0500 Subject: Add apps folder into the coverage reports Change-Id: I1c222b6a5cc5bbdc6353ce1b06c03e44917849fd Signed-off-by: vrvarma Issue-ID: OPTFRA-698 --- .coveragerc | 2 +- osdf/optimizers/__init__.py | 17 ----------------- osdf/optimizers/licenseopt/__init__.py | 17 ----------------- osdf/optimizers/pciopt/__init__.py | 0 osdf/optimizers/placementopt/__init__.py | 17 ----------------- osdf/optimizers/routeopt/__init__.py | 17 ----------------- tox.ini | 4 ++-- 7 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 osdf/optimizers/__init__.py delete mode 100644 osdf/optimizers/licenseopt/__init__.py delete mode 100644 osdf/optimizers/pciopt/__init__.py delete mode 100644 osdf/optimizers/placementopt/__init__.py delete mode 100644 osdf/optimizers/routeopt/__init__.py diff --git a/.coveragerc b/.coveragerc index a5afd52..a4ec20c 100644 --- a/.coveragerc +++ b/.coveragerc @@ -2,7 +2,7 @@ [run] branch = True cover_pylib = False -include = osdf/**/*.py +include = osdf/**/*.py, apps/**/*.py [report] # Regexes for lines to exclude from consideration diff --git a/osdf/optimizers/__init__.py b/osdf/optimizers/__init__.py deleted file mode 100644 index 4b25e5b..0000000 --- a/osdf/optimizers/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2017-2018 AT&T Intellectual Property -# -# 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. -# -# ------------------------------------------------------------------------- -# diff --git a/osdf/optimizers/licenseopt/__init__.py b/osdf/optimizers/licenseopt/__init__.py deleted file mode 100644 index 4b25e5b..0000000 --- a/osdf/optimizers/licenseopt/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2017-2018 AT&T Intellectual Property -# -# 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. -# -# ------------------------------------------------------------------------- -# diff --git a/osdf/optimizers/pciopt/__init__.py b/osdf/optimizers/pciopt/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/osdf/optimizers/placementopt/__init__.py b/osdf/optimizers/placementopt/__init__.py deleted file mode 100644 index 4b25e5b..0000000 --- a/osdf/optimizers/placementopt/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2017-2018 AT&T Intellectual Property -# -# 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. -# -# ------------------------------------------------------------------------- -# diff --git a/osdf/optimizers/routeopt/__init__.py b/osdf/optimizers/routeopt/__init__.py deleted file mode 100644 index c235f2a..0000000 --- a/osdf/optimizers/routeopt/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2018 Huawei Intellectual Property -# -# 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. -# -# ------------------------------------------------------------------------- -# diff --git a/tox.ini b/tox.ini index c91b77f..2c30e73 100644 --- a/tox.ini +++ b/tox.ini @@ -19,11 +19,11 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test/test-requirements.txt [run] -source=./osdf/,osdfapp.py +source=./apps/,./osdf/,osdfapp.py [testenv:pylint] whitelist_externals=bash -commands = bash -c "pylint --reports=y osdf | tee pylint.out" +commands = bash -c "pylint --reports=y osdf apps| tee pylint.out" [testenv:py3] basepython=python3.6 -- cgit 1.2.3-korg