diff options
author | Ricardo Silva <ricardo.d.silva@gmail.com> | 2019-01-31 21:50:10 +0100 |
---|---|---|
committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-01-31 14:50:10 -0600 |
commit | cf754245fd0fe394bcbd609a8d05b942c4d008dd (patch) | |
tree | c636bd680a4543eb174cb0de50ecf2bfe1d5203b /var | |
parent | 21afd258a4784aa08f424647f897a64dfce466d5 (diff) | |
download | spack-cf754245fd0fe394bcbd609a8d05b942c4d008dd.tar.gz spack-cf754245fd0fe394bcbd609a8d05b942c4d008dd.tar.bz2 spack-cf754245fd0fe394bcbd609a8d05b942c4d008dd.tar.xz spack-cf754245fd0fe394bcbd609a8d05b942c4d008dd.zip |
py-pybigwig: fix build with python3, add numpy variant (#10444)
* added patch to correctly pick up non-system curl when building
with Python 3
* added numpy variant
* add version 0.3.12
* update checksums to sha256
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/py-pybigwig/package.py | 12 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/py-pybigwig/python3_curl.patch | 13 |
2 files changed, 23 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-pybigwig/package.py b/var/spack/repos/builtin/packages/py-pybigwig/package.py index 61880aac27..31ad311890 100644 --- a/var/spack/repos/builtin/packages/py-pybigwig/package.py +++ b/var/spack/repos/builtin/packages/py-pybigwig/package.py @@ -12,7 +12,15 @@ class PyPybigwig(PythonPackage): homepage = "https://pypi.python.org/pypi/pyBigWig" url = "https://pypi.io/packages/source/p/pyBigWig/pyBigWig-0.3.4.tar.gz" - version('0.3.4', '8e0a91e26e87eeaa071408a3a749bfa9') + version('0.3.12', sha256='e01991790ece496bf6d3f00778dcfb136dd9ca0fd28acc1b3fb43051ad9b8403') + version('0.3.4', sha256='8c97a19218023190041c0e426f1544f7a4944a7bb4568faca1d85f1975af9ee2') + + variant('numpy', default=True, + description='Enable support for numpy integers and vectors') + + patch('python3_curl.patch', when='@:0.3.12 ^python@3:') - depends_on('py-setuptools', type='build') depends_on('curl', type=('build', 'run')) + depends_on('py-setuptools', type='build') + + depends_on('py-numpy', type=('build', 'run'), when='+numpy') diff --git a/var/spack/repos/builtin/packages/py-pybigwig/python3_curl.patch b/var/spack/repos/builtin/packages/py-pybigwig/python3_curl.patch new file mode 100644 index 0000000000..ee88ff5f8d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pybigwig/python3_curl.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index ec31f9b..02c0320 100755 +--- a/setup.py ++++ b/setup.py +@@ -40,7 +40,7 @@ except: + defines.append(('NOCURL', None)) + sys.stderr.write("Either libcurl isn't installed, it didn't come with curl-config, or curl-config isn't in your $PATH. pyBigWig will be installed without support for remote files.\n") + +-foo = foo.strip().split() ++foo = foo.decode().strip().split() + for v in foo: + if(v[0:2] == "-L") : + additional_libs.append(v[2:]) |