From fda3b434b73d5df3c9453dbd772b182b09a0f7e5 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Mon, 6 Mar 2017 12:39:20 -0500
Subject: Consolidate root/utils tests

- Consolidate tests between the root of the repo and utils
---
 utils/.coveragerc           | 18 ------------------
 utils/.pylintrc             |  1 -
 utils/setup.cfg             | 27 ---------------------------
 utils/setup.py              | 11 -----------
 utils/test-requirements.txt | 15 ---------------
 utils/tox.ini               | 19 -------------------
 6 files changed, 91 deletions(-)
 delete mode 100644 utils/.coveragerc
 delete mode 120000 utils/.pylintrc
 delete mode 100644 utils/test-requirements.txt
 delete mode 100644 utils/tox.ini

(limited to 'utils')

diff --git a/utils/.coveragerc b/utils/.coveragerc
deleted file mode 100644
index 551e13192..000000000
--- a/utils/.coveragerc
+++ /dev/null
@@ -1,18 +0,0 @@
-[run]
-branch = True
-omit =
-    */lib/python*/site-packages/*
-    */lib/python*/*
-    /usr/*
-    setup.py
-    # TODO(rhcarvalho): this is used to ignore test files from coverage report.
-    # We can make this less generic when we stick with a single test pattern in
-    # the repo.
-    test_*.py
-    *_tests.py
-
-[report]
-fail_under = 73
-
-[html]
-directory = cover
diff --git a/utils/.pylintrc b/utils/.pylintrc
deleted file mode 120000
index 30b33b524..000000000
--- a/utils/.pylintrc
+++ /dev/null
@@ -1 +0,0 @@
-../.pylintrc
\ No newline at end of file
diff --git a/utils/setup.cfg b/utils/setup.cfg
index d730cd3b4..79bc67848 100644
--- a/utils/setup.cfg
+++ b/utils/setup.cfg
@@ -3,30 +3,3 @@
 # 3. If at all possible, it is good practice to do this. If you cannot, you
 # will need to generate wheels for each Python version that you support.
 universal=1
-
-[aliases]
-test=pytest
-
-[flake8]
-max-line-length=120
-exclude=test/*,setup.py,oo-installenv
-ignore=E501
-
-[lint]
-lint_disable=fixme,locally-disabled,file-ignored,duplicate-code
-
-[tool:pytest]
-testpaths = test
-norecursedirs =
-    .*
-    __pycache__
-python_files =
-    # TODO(rhcarvalho): rename test files to follow a single pattern. "test*.py"
-    # is Python unittest's default, while pytest discovers both "test_*.py" and
-    # "*_test.py" by default.
-    test_*.py
-    *_tests.py
-addopts =
-    --cov=.
-    --cov-report=term
-    --cov-report=html
diff --git a/utils/setup.py b/utils/setup.py
index 629d39206..6fec7b173 100644
--- a/utils/setup.py
+++ b/utils/setup.py
@@ -38,26 +38,15 @@ setup(
 
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().
-    #packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
     packages=['ooinstall'],
     package_dir={'': 'src'},
 
-
     # List run-time dependencies here.  These will be installed by pip when
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=['click', 'PyYAML', 'ansible'],
 
-    # List additional groups of dependencies here (e.g. development
-    # dependencies). You can install these using the following syntax,
-    # for example:
-    # $ pip install -e .[dev,test]
-    #extras_require={
-    #    'dev': ['check-manifest'],
-    #    'test': ['coverage'],
-    #},
-
     # If there are data files included in your packages that need to be
     # installed, specify them here.  If using Python 2.6 or less, then these
     # have to be included in MANIFEST.in as well.
diff --git a/utils/test-requirements.txt b/utils/test-requirements.txt
deleted file mode 100644
index b26e22a7e..000000000
--- a/utils/test-requirements.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ansible
-# flake8 moved to before setuptools-lint to satisfy mccabe dependency issue
-flake8
-setuptools-lint
-coverage
-mock
-PyYAML
-click
-backports.functools_lru_cache
-pyOpenSSL
-yamllint
-tox
-detox
-pytest
-pytest-cov
diff --git a/utils/tox.ini b/utils/tox.ini
deleted file mode 100644
index 2524923cb..000000000
--- a/utils/tox.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[tox]
-minversion=2.3.1
-envlist =
-    py{27,35}-{flake8,unit,pylint}
-skipsdist=True
-skip_missing_interpreters=True
-
-[testenv]
-usedevelop=True
-deps =
-    -rtest-requirements.txt
-    py35-flake8: flake8-bugbear
-commands =
-    # Needed to make detox work, since it ignores usedevelop
-    # https://github.com/tox-dev/tox/issues/180
-    unit: pip install -e .
-    unit: pytest {posargs}
-    flake8: python setup.py flake8
-    pylint: python setup.py lint
-- 
cgit v1.2.3