From cb73c87d9c592f5d8602ebc86926320dab44337c Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Thu, 5 Sep 2019 16:30:42 -0500
Subject: [PATCH] Respond to comments on #1330

---
 docs/source/publications.rst          | 4 ++--
 docs/source/releasenotes/0.11.0.rst   | 2 +-
 tests/unit_tests/__init__.py          | 7 +++++++
 tests/unit_tests/test_data_neutron.py | 6 +-----
 tests/unit_tests/test_data_thermal.py | 7 ++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/source/publications.rst b/docs/source/publications.rst
index b6b747f45..32b911e5b 100644
--- a/docs/source/publications.rst
+++ b/docs/source/publications.rst
@@ -501,7 +501,7 @@ Depletion
 
 - Jose L. Salcedo-Perez, Benoit Forget, Kord Smith, and Paul Romano, "Hybrid
   tallies to improve performance in depletion Monte Carlo simulations," *Proc.
-  M&C*, 927-936, Portland, Oregn, Aug. 25-29 (2019).
+  M&C*, 927-936, Portland, Oregon, Aug. 25-29 (2019).
 
 - Zhao-Qing Liu, Ze-Long Zhao, Yong-Wei Yang, Yu-Cui Gao, Hai-Yan Meng, and
   Qing-Yu Gao, "`Development and validation of depletion code system IMPC-Burnup
@@ -533,7 +533,7 @@ Sensitivity Analysis
 
 - Abdulla Alhajri and Benoit Forget, "Eigenvalue Sensitivity in Monte Carlo
   Simulations to Nuclear Data Parameters using the Multipole Formalism," *Proc.
-  M&C*, 1895-1906, Portland, Oregn, Aug. 25-29 (2019).
+  M&C*, 1895-1906, Portland, Oregon, Aug. 25-29 (2019).
 
 - Xingjie Peng, Jingang Liang, Benoit Forget, and Kord Smith, "`Calculation of
   adjoint-weighted reactor kinetics parameters in OpenMC
diff --git a/docs/source/releasenotes/0.11.0.rst b/docs/source/releasenotes/0.11.0.rst
index 52656a33c..bf4719374 100644
--- a/docs/source/releasenotes/0.11.0.rst
+++ b/docs/source/releasenotes/0.11.0.rst
@@ -62,7 +62,7 @@ New Features
   - The :meth:`openmc.Plane.from_points` function creates a plane given three
     points that pass through it.
   - The :func:`openmc.model.pin` function creates a pin cell universe given a
-    sequence of radii and materials.
+    sequence of concentric cylinders and materials.
 
 ------------------
 Python API Changes
diff --git a/tests/unit_tests/__init__.py b/tests/unit_tests/__init__.py
index 59a520c12..e97ab13e2 100644
--- a/tests/unit_tests/__init__.py
+++ b/tests/unit_tests/__init__.py
@@ -1,7 +1,14 @@
+import shutil
+
 import numpy as np
 import pytest
 
 
+# Check if NJOY is available
+needs_njoy = pytest.mark.skipif(shutil.which('njoy') is None,
+                                reason="NJOY not installed")
+
+
 def assert_unbounded(obj):
     """Assert that a region/cell is unbounded."""
     ll, ur = obj.bounding_box
diff --git a/tests/unit_tests/test_data_neutron.py b/tests/unit_tests/test_data_neutron.py
index 5313199a7..c4eb6a908 100644
--- a/tests/unit_tests/test_data_neutron.py
+++ b/tests/unit_tests/test_data_neutron.py
@@ -1,20 +1,16 @@
 from collections.abc import Mapping, Callable
 import os
-import shutil
 
 import numpy as np
 import pandas as pd
 import pytest
 import openmc.data
 
+from . import needs_njoy
 
 _TEMPERATURES = [300., 600., 900.]
 _ENDF_DATA = os.environ['OPENMC_ENDF_DATA']
 
-# Check if NJOY is available
-needs_njoy = pytest.mark.skipif(shutil.which('njoy') is None,
-                                reason="NJOY not installed")
-
 
 @pytest.fixture(scope='module')
 def pu239():
diff --git a/tests/unit_tests/test_data_thermal.py b/tests/unit_tests/test_data_thermal.py
index ef6fb704c..2d8d7de2c 100644
--- a/tests/unit_tests/test_data_thermal.py
+++ b/tests/unit_tests/test_data_thermal.py
@@ -2,19 +2,16 @@ from collections.abc import Callable
 from math import exp
 import os
 import random
-import shutil
 
 import numpy as np
 import pytest
 import openmc.data
 
+from . import needs_njoy
+
 
 _ENDF_DATA = os.environ['OPENMC_ENDF_DATA']
 
-# Check if NJOY is available
-needs_njoy = pytest.mark.skipif(shutil.which('njoy') is None,
-                                reason="NJOY not installed")
-
 
 @pytest.fixture(scope='module')
 def h2o():