hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

matplotlib and basemap require setuptools to run properly together (#3835)

Browse source 
* matplotlib and basemap require setuptools to run properly together

* flake 8 fix
This commit is contained in:
Gregory Lee 2017-04-26 11:53:27 -07:00 committed by Adam J. Stewart
parent 1e18ace647
commit 378935916a
2 changed files with 8 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
var/spack/repos/builtin/packages/py-basemap/package.py
View file

@ -23,7 +23,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
import os
class PyBasemap(PythonPackage):
@ -35,6 +34,10 @@ class PyBasemap(PythonPackage):
version('1.0.7', '48c0557ced9e2c6e440b28b3caff2de8')
# Per Github issue #3813, setuptools is required at runtime in order
# to make mpl_toolkits a namespace package that can span multiple
# directories (i.e., matplotlib and basemap)
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-matplotlib', type=('build', 'run'))
depends_on('pil', type=('build', 'run'))
@ -42,79 +45,3 @@ class PyBasemap(PythonPackage):
def setup_environment(self, spack_env, run_env):
spack_env.set('GEOS_DIR', self.spec['geos'].prefix)
@run_after('install')
def post_install_patch(self):
spec = self.spec
# We are not sure if this fix is needed before Python 3.5.2.
# If it is needed, this test should be changed.
# See: https://github.com/LLNL/spack/pull/1964
if spec['python'].version >= Version('3.5.2'):
# Use symlinks to join the two mpl_toolkits/ directories into
# one, inside of basemap. This is because Basemap tries to
# "add to" an existing package in Matplotlib, which is only
# legal Python for "Implicit Namespace Packages":
# https://www.python.org/dev/peps/pep-0420/
# https://github.com/Homebrew/homebrew-python/issues/112
# In practice, Python will see only the basemap version of
# mpl_toolkits
path_m = find_package_dir(
spec['py-matplotlib'].prefix, 'mpl_toolkits')
path_b = find_package_dir(spec.prefix, 'mpl_toolkits')
link_dir(path_m, path_b)
def find_package_dir(spack_package_root, name):
"""Finds directory with a specific name, somewhere inside a Spack
package.
spack_package_root:
Root directory to start searching
oldname:
Original name of package (not fully qualified, just the leaf)
newname:
What to rename it to
"""
for root, dirs, files in os.walk(spack_package_root):
path = os.path.join(root, name)
# Make sure it's a directory
if not os.path.isdir(path):
continue
# Make sure it's really a package
if not os.path.exists(os.path.join(path, '__init__.py')):
continue
return path
return None
def link_dir(src_root, dest_root, link=os.symlink):
"""Link all files in src_root into directory dest_root"""
for src_path, dirnames, filenames in os.walk(src_root):
if not filenames:
continue # avoid explicitly making empty dirs
# Avoid internal Python stuff
src_leaf = os.path.split(src_path)[1]
if src_leaf.startswith('__'):
continue
# Make sure the destination directory exists
dest_path = os.path.join(dest_root, src_path[len(src_root) + 1:])
try:
os.makedirs(dest_path)
except:
pass
# Link all files from src to dest directory
for fname in filenames:
src = os.path.join(src_path, fname)
dst = os.path.join(dest_path, fname)
if not os.path.exists(dst):
link(src, dst)

5
var/spack/repos/builtin/packages/py-matplotlib/package.py
View file

@ -59,7 +59,10 @@ class PyMatplotlib(PythonPackage):
extends('python', ignore=r'bin/nosetests.*$|bin/pbr$')
# ------ Required dependencies
depends_on('py-setuptools', type='build')
# Per Github issue #3813, setuptools is required at runtime in order
# to make mpl_toolkits a namespace package that can span multiple
# directories (i.e., matplotlib and basemap)
depends_on('py-setuptools', type=('build', 'run'))
depends_on('libpng@1.2:')
depends_on('freetype@2.3:')