Merge pull request #323 from drewejohnson/yaml-5.1.1

DEV/API Use yaml 5.1.1
CORE-GATECH-GROUP · Jul 18, 2019 · 7d9899c · 7d9899c
2 parents 38c61d8 + f98c697
commit 7d9899c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -16,6 +16,7 @@ Next
   :meth:`~serpentTools.objects.CartesianDetector.meshPlot`, where
   only data greater than ``thresh`` is plotted.
 * Mitigate pending deprecated imports from ``collections`` - :issue:`313`
+* Increase required version of :term:`yaml` to ``5.1.1``
 
 Bug fixes
 ---------

diff --git a/docs/glossary.rst b/docs/glossary.rst
@@ -82,3 +82,8 @@ Glossary
         that can be parsed by this project. More information, including
         distribution and licensing of ``SERPENT`` can be found at
         `<http://montecarlo.vtt.fi>`_. 
+
+    yaml
+        Human-readable format used for configuration files in this
+        project. For more information, see
+        `<https://pyyaml.org/wiki/PyYAMLDocumentation>`_
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 six==1.12.0
 numpy>=1.16.0
 matplotlib>=2.2.3
-pyyaml==3.13
+pyyaml==5.1.1