summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.coveragerc2
-rw-r--r--osdf/optimizers/__init__.py17
-rw-r--r--osdf/optimizers/licenseopt/__init__.py17
-rw-r--r--osdf/optimizers/pciopt/__init__.py0
-rw-r--r--osdf/optimizers/placementopt/__init__.py17
-rw-r--r--osdf/optimizers/routeopt/__init__.py17
-rw-r--r--tox.ini4
7 files changed, 3 insertions, 71 deletions
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
--- a/osdf/optimizers/pciopt/__init__.py
+++ /dev/null
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