From c2e1319f2dc968e2f78302e3ddc4693335440369 Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Mon, 24 Feb 2020 07:54:08 -0600 Subject: 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 * 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 * Remove py-numpy constraint Let the concretizer catch the conflict with python2 and py-numpy versions. Co-authored-by: Adam J. Stewart --- .../repos/builtin/packages/py-bx-python/package.py | 15 +++++++++++---- .../repos/builtin/packages/py-python-lzo/package.py | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-python-lzo/package.py (limited to 'var') 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') -- cgit v1.2.3-70-g09d2