From 3955e901b46781503cffc636eba15c54c1e55b09 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Wed, 18 Oct 2017 10:51:45 -0500
Subject: [PATCH] Remove tox.ini for now, update install instructions

---
 MANIFEST.in                        |  1 -
 docs/source/usersguide/install.rst | 17 ++++++++++-------
 tox.ini                            |  9 ---------
 3 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 tox.ini

diff --git a/MANIFEST.in b/MANIFEST.in
index 04436bf1df..04348222fa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,6 @@
 include CMakeLists.txt
 include LICENSE
 include schemas.xml
-include tox.ini
 include openmc/data/reconstruct.pyx
 include docs/source/_templates/layout.html
 include docs/sphinxext/LICENSE
diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst
index 497e09b4d5..09fc4520c0 100644
--- a/docs/source/usersguide/install.rst
+++ b/docs/source/usersguide/install.rst
@@ -414,16 +414,19 @@ distributions.
       various HDF5 files, h5py is needed to provide access to data within these
       files from Python.
 
-.. admonition:: Optional
-   :class: note
-
    `Matplotlib <http://matplotlib.org/>`_
       Matplotlib is used to providing plotting functionality in the API like the
       :meth:`Universe.plot` method and the :func:`openmc.plot_xs` function.
 
    `uncertainties <https://pythonhosted.org/uncertainties/>`_
-      Uncertainties are optionally used for decay data in the :mod:`openmc.data`
-      module.
+      Uncertainties are used for decay data in the :mod:`openmc.data` module.
+
+   `lxml <http://lxml.de/>`_
+      lxml is used for the :ref:`scripts_validate` script and various other
+      parts of the Python API.
+
+.. admonition:: Optional
+   :class: note
 
    `Cython <http://cython.org/>`_
       Cython is used for resonance reconstruction for ENDF data converted to
@@ -437,8 +440,8 @@ distributions.
       The silomesh package is needed to convert voxel and track files to SILO
       format.
 
-   `lxml <http://lxml.de/>`_
-      lxml is used for the :ref:`scripts_validate` script.
+   `pytest <https://docs.pytest.org>`_
+      The pytest framework is used for unit testing the Python API.
 
 .. _usersguide_nxml:
 
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 951bd8cd0c..0000000000
--- a/tox.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[tox]
-envlist = py{34,36}
-[testenv]
-commands = pytest tests/unit_tests
-deps =
-     pytest
-     numpy
-     cython
-passenv = OPENMC_CROSS_SECTIONS