summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGlenn Johnson <glenn-johnson@uiowa.edu>2020-02-24 07:54:08 -0600
committerGitHub <noreply@github.com>2020-02-24 07:54:08 -0600
commitc2e1319f2dc968e2f78302e3ddc4693335440369 (patch)
tree16fe6576c023b567a440760425859a90d8ed9bf9 /var
parent6615fbccbc60a1d1acb2e4e8f126336c5e068cec (diff)
downloadspack-c2e1319f2dc968e2f78302e3ddc4693335440369.tar.gz
spack-c2e1319f2dc968e2f78302e3ddc4693335440369.tar.bz2
spack-c2e1319f2dc968e2f78302e3ddc4693335440369.tar.xz
spack-c2e1319f2dc968e2f78302e3ddc4693335440369.zip
Update py-bx-python package (#15175)
* Update py-bx-python package - add update to py-bx-python - switch to pypi downloads - set dependencies * Update var/spack/repos/builtin/packages/py-bx-python/package.py I had initially pulled version 0.8.6 and then updated that to 0.8.8 but missed the change in the python specs between those two versions. Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com> * Fix version 0.7.4 - set dependency on python2 - add dependency on py-python-lzo - add py-python-lzo package - set py-numpy dependency to correspond to latest version that works with python2 * Add constraint for py-six dependency * Update var/spack/repos/builtin/packages/py-bx-python/package.py Ah, I had that `when` clause in and then took it out as it did not seem to be needed. I guess it is always better to be more explicit. Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com> * Remove py-numpy constraint Let the concretizer catch the conflict with python2 and py-numpy versions. Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-bx-python/package.py15
-rw-r--r--var/spack/repos/builtin/packages/py-python-lzo/package.py18
2 files changed, 29 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-bx-python/package.py b/var/spack/repos/builtin/packages/py-bx-python/package.py
index ee4dfff7fc..3d73b21d18 100644
--- a/var/spack/repos/builtin/packages/py-bx-python/package.py
+++ b/var/spack/repos/builtin/packages/py-bx-python/package.py
@@ -11,10 +11,17 @@ class PyBxPython(PythonPackage):
to allow for rapid implementation of genome scale analyses."""
homepage = "https://github.com/bxlab/bx-python"
- url = "https://github.com/bxlab/bx-python/archive/v0.7.4.tar.gz"
+ url = "https://pypi.io/packages/source/b/bx-python/bx-python-0.8.8.tar.gz"
- version('0.7.4', sha256='1066d1e56d062d0661f23c19942eb757bd7ab7cb8bc7d89a72fdc3931c995cb4')
+ version('0.8.8', sha256='ad0808ab19c007e8beebadc31827e0d7560ac0e935f1100fb8cc93607400bb47')
+ version('0.7.4',
+ sha256='1066d1e56d062d0661f23c19942eb757bd7ab7cb8bc7d89a72fdc3931c995cb4',
+ url="https://github.com/bxlab/bx-python/archive/v0.7.4.tar.gz")
+ depends_on('python@2.4:2.7', type=('build', 'run'), when='@:0.7')
+ depends_on('python@2.7:2.8,3.5:', type=('build', 'run'), when='@0.8:')
depends_on('py-setuptools', type='build')
- depends_on('py-numpy', type=('build', 'run'))
- depends_on('py-six', type=('build', 'run'))
+ depends_on('py-python-lzo', type=('build', 'run'), when='@:0.7')
+ depends_on('py-cython', type='build', when='@0.8:')
+ depends_on('py-numpy', type=('build', 'run'))
+ depends_on('py-six', type=('build', 'run'), when='@0.8:')
diff --git a/var/spack/repos/builtin/packages/py-python-lzo/package.py b/var/spack/repos/builtin/packages/py-python-lzo/package.py
new file mode 100644
index 0000000000..acf60351b7
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-python-lzo/package.py
@@ -0,0 +1,18 @@
+# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+
+class PyPythonLzo(PythonPackage):
+ """This module provides Python bindings for the LZO data compression
+ library."""
+
+ homepage = "https://github.com/jd-boyd/python-lzo"
+ url = "https://pypi.io/packages/source/p/python-lzo/python-lzo-1.12.tar.gz"
+
+ version('1.12', sha256='97a8e46825e8f1abd84c2a3372bc09adae9745a5be5d3af2692cd850dac35345')
+
+ depends_on('lzo')