From c3c057f2b3a15aad87adc8389c83c6faf1929ecb Mon Sep 17 00:00:00 2001 From: Michael Bentley Date: Wed, 1 Apr 2020 21:05:58 -0600 Subject: package: update flit and py-pyelftools versions (#15817) * Update flit package to v2.1.0 and add dependencies * flit: comment out bash dependency The host system should have bash available and compiling bash through spack failed for me. I'm not sure if binutils and coreutils should be listed as dependencies as well. * Add new version of py-pyelftools * py-pyelftools: add py-setuptools as a build dependency * Address review comments --- var/spack/repos/builtin/packages/flit/package.py | 22 ++++++++++++---------- .../builtin/packages/py-pyelftools/package.py | 5 ++++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/var/spack/repos/builtin/packages/flit/package.py b/var/spack/repos/builtin/packages/flit/package.py index 66f4c43452..fbe1d2f342 100644 --- a/var/spack/repos/builtin/packages/flit/package.py +++ b/var/spack/repos/builtin/packages/flit/package.py @@ -14,16 +14,18 @@ class Flit(MakefilePackage): homepage = "https://pruners.github.io/flit" url = "https://github.com/PRUNERS/FLiT" - url = "https://github.com/PRUNERS/FLiT/archive/v2.0-alpha.1.tar.gz" + url = "https://github.com/PRUNERS/FLiT/archive/v2.1.0.tar.gz" - version('2.0-alpha.1', sha256='8de2bd400acf0f513d69f3dbf588e8984dfb18b8ccaaf684391811a0582f694b') + version('2.1.0', sha256='b31ffa02fda1ab0f5555acdc6edc353d93d53ae8ef85e099f83bcf1c83e70885') + + maintainers = ['mikebentley15'] # Add dependencies - depends_on('python@3:', type='run') - depends_on('py-numpy', type='run') - depends_on('py-matplotlib tk=False', type='run') - depends_on('py-toml', type='run') - - @property - def install_targets(self): - return ['install', 'PREFIX=%s' % self.prefix] + depends_on('python@3:', type='run') + depends_on('py-toml', type='run') + depends_on('py-pyelftools', type='run') + depends_on('gmake', type=('run', 'build')) + depends_on('sqlite@3:', type='run') + + def edit(self, spec, prefix): + env['PREFIX'] = prefix diff --git a/var/spack/repos/builtin/packages/py-pyelftools/package.py b/var/spack/repos/builtin/packages/py-pyelftools/package.py index a69d0a2e7e..0607560e0b 100644 --- a/var/spack/repos/builtin/packages/py-pyelftools/package.py +++ b/var/spack/repos/builtin/packages/py-pyelftools/package.py @@ -10,6 +10,9 @@ class PyPyelftools(PythonPackage): """A pure-Python library for parsing and analyzing ELF files and DWARF debugging information""" homepage = "https://pypi.python.org/pypi/pyelftools" - url = "https://pypi.io/packages/source/p/pyelftools/pyelftools-0.23.tar.gz" + url = "https://pypi.io/packages/source/p/pyelftools/pyelftools-0.26.tar.gz" + version('0.26', sha256='86ac6cee19f6c945e8dedf78c6ee74f1112bd14da5a658d8c9d4103aed5756a2') version('0.23', sha256='fc57aadd096e8f9b9b03f1a9578f673ee645e1513a5ff0192ef439e77eab21de') + + depends_on('py-setuptools', when='@0.25:', type='build') -- cgit v1.2.3-70-g09d2