From 9acf207023fff8ea4f0e2414dc9479fd1111ba6e Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 14 Nov 2017 17:41:27 -0600 Subject: picard: add versions and fix url format (#6309) --- var/spack/repos/builtin/packages/picard/package.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index 744479a7f3..5f8b5b39a1 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -36,13 +36,20 @@ class Picard(Package): homepage = "http://broadinstitute.github.io/picard/" url = "https://github.com/broadinstitute/picard/releases/download/2.9.2/picard.jar" + _urlfmt = "https://github.com/broadinstitute/picard/releases/download/{0}/picard.jar" + _oldurlfmt = 'https://github.com/broadinstitute/picard/releases/download/{0}/picard-tools-{0}.zip' # They started distributing a single jar file at v2.6.0, prior to # that it was a .zip file with multiple .jar and .so files - version('2.9.2', '0449279a6a89830917e8bcef3a976ef7', expand=False, - url="https://github.com/broadinstitute/picard/releases/download/2.9.2/picard.jar") - version('1.140', '308f95516d94c1f3273a4e7e2b315ec2', - url='https://github.com/broadinstitute/picard/releases/download/1.140/picard-tools-1.140.zip') + version('2.15.0', '3f5751630b1a3449edda47a0712a64e4', expand=False) + version('2.10.0', '96f3c11b1c9be9fc8088bc1b7b9f7538', expand=False) + version('2.9.4', '5ce72af4d5efd02fba7084dcfbb3c7b3', expand=False) + version('2.9.3', '3a33c231bcf3a61870c3d44b3b183924', expand=False) + version('2.9.2', '0449279a6a89830917e8bcef3a976ef7', expand=False) + version('2.9.0', 'b711d492f16dfe0084d33e684dca2202', expand=False) + version('2.8.3', '4a181f55d378cd61d0b127a40dfd5016', expand=False) + version('2.6.0', '91f35f22977d9692ce2718270077dc50', expand=False) + version('1.140', '308f95516d94c1f3273a4e7e2b315ec2') depends_on('java@8:', type='run') @@ -73,3 +80,9 @@ class Picard(Package): """The Picard docs suggest setting this as a convenience.""" run_env.prepend_path('PICARD', join_path(self.prefix, 'bin', 'picard.jar')) + + def url_for_version(self, version): + if version < Version('2.6.0'): + return self._oldurlfmt.format(version) + else: + return self._urlfmt.format(version) -- cgit v1.2.3-70-g09d2