From 24f65c502e54cc8767d47bafa827c7434c81bd07 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Mon, 13 Jun 2016 12:31:18 -0500
Subject: Add additional Astropy dependencies

---
 .../repos/builtin/packages/py-astropy/package.py   | 12 +++---
 .../builtin/packages/py-beautifulsoup4/package.py  | 41 +++++++++++++++++++++
 .../repos/builtin/packages/py-wcsaxes/package.py   | 43 ++++++++++++++++++++++
 3 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 var/spack/repos/builtin/packages/py-beautifulsoup4/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-wcsaxes/package.py

diff --git a/var/spack/repos/builtin/packages/py-astropy/package.py b/var/spack/repos/builtin/packages/py-astropy/package.py
index e3776caf70..a9962777dc 100644
--- a/var/spack/repos/builtin/packages/py-astropy/package.py
+++ b/var/spack/repos/builtin/packages/py-astropy/package.py
@@ -41,21 +41,19 @@ class PyAstropy(Package):
     depends_on('py-numpy')
 
     # Optional dependencies
-    depends_on('cfitsio')
-    depends_on('expat')
     depends_on('py-h5py')
+    depends_on('py-beautifulsoup4')
     depends_on('py-pyyaml')
     depends_on('py-scipy')
+    depends_on('libxml2')
     depends_on('py-matplotlib')
     depends_on('py-pytz')
     depends_on('py-scikit-image')
     depends_on('py-pandas')
 
-    # TODO: Add packages
-    # depends_on('py-beautiful-soup')
-    # depends_on('py-xmllint')
-    # depends_on('py-wcsaxes')
-    # depends_on('py-objgraph')
+    # System dependencies
+    depends_on('cfitsio')
+    depends_on('expat')
 
     def install(self, spec, prefix):
         python('setup.py', 'build', '--use-system-cfitsio',
diff --git a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py
new file mode 100644
index 0000000000..64368fe70d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyBeautifulsoup4(Package):
+    """Beautiful Soup is a Python library for pulling data out of HTML and
+    XML files. It works with your favorite parser to provide idiomatic ways
+    of navigating, searching, and modifying the parse tree."""
+
+    homepage = "https://www.crummy.com/software/BeautifulSoup"
+    url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.4.1.tar.gz"
+
+    version('4.4.1', '8fbd9a7cac0704645fa20d1419036815')
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-wcsaxes/package.py b/var/spack/repos/builtin/packages/py-wcsaxes/package.py
new file mode 100644
index 0000000000..b0adbe3658
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-wcsaxes/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyWcsaxes(Package):
+    """WCSAxes is a framework for making plots of Astronomical data
+    in Matplotlib."""
+
+    homepage = "http://wcsaxes.readthedocs.io/en/latest/index.html"
+    url      = "https://github.com/astrofrog/wcsaxes/archive/v0.8.tar.gz"
+
+    version('0.8', 'de1c60fdae4c330bf5ddb9f1ab5ab920')
+
+    extends('python', ignore=r'bin/pbr')
+    depends_on('py-numpy')
+    depends_on('py-matplotlib')
+    depends_on('py-astropy')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix={0}'.format(prefix))
-- 
cgit v1.2.3-70-g09d2