summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <mclay@redhat.com>2019-08-02 06:34:21 -0700
committerSam Doran <sdoran@redhat.com>2019-08-02 09:34:21 -0400
commitc0c17a303106eb70521fe759cc5e994b5749ec65 (patch)
tree2a65ee1422207c6063fc2ecf46023e7df68b1a20
parentb8473276455cbeb49629b502f1f163be0c7eb45a (diff)
downloadansible-c0c17a303106eb70521fe759cc5e994b5749ec65.tar.gz
Remove obsolete tox.ini. (#59963)
Update botmeta
-rw-r--r--.github/BOTMETA.yml2
-rw-r--r--MANIFEST.in1
-rw-r--r--tox.ini27
3 files changed, 0 insertions, 30 deletions
diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
index 73a8b3c729..4637059830 100644
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -1560,8 +1560,6 @@ files:
notified: mattclay
shippable.yml:
notified: mattclay
- tox.ini:
- notified: mattclay
macros:
module_utils: lib/ansible/module_utils
modules: lib/ansible/modules
diff --git a/MANIFEST.in b/MANIFEST.in
index da554f16c5..137483fa0e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,7 +4,6 @@ include SYMLINK_CACHE.json
include requirements.txt
include .coveragerc
include shippable.yml
-include tox.ini
include bin/ansible-test
include examples/hosts
include examples/ansible.cfg
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 83360faf5c..0000000000
--- a/tox.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-[tox]
-envlist = py26,py27,py35,py36
-
-[testenv]
-deps = -c{toxinidir}/test/runner/requirements/constraints.txt
- -r{toxinidir}/test/runner/requirements/ansible-test.txt
- -r{toxinidir}/test/runner/requirements/sanity.txt
- -r{toxinidir}/test/runner/requirements/units.txt
-commands =
- python --version
- # The recommended method of running tests with tox is to execute
- # ansible-test directly and use the --tox and --python options.
- # The commands below are provided as a convenience for those who
- # prefer to run tox directly instead of through ansible-test.
- {toxinidir}/test/runner/ansible-test sanity --python default -v
- {toxinidir}/test/runner/ansible-test units --python default -v
-passenv =
- # Pass HOME to the test environment to avoid the missing HOME env
- # variable error. See issue: #20424
- HOME
-
-[flake8]
-# These are things that the devs don't agree make the code more readable
-# E402 module level import not at top of file
-ignore = E402
-# not all the devs believe in 80 column line length
-max-line-length = 160