The perl-uri-escape package duplicates perl-uri (#12971)

* The perl-uri-escape package duplicates perl-uri

The Perl URI::Escape module is in the Perl URI package so the Spack
perl-uri-escape package is a duplicate of the perl-uri package. This PR
does the following:

- replace `depends_on('perl-uri-escape')` with `depends_on('perl-uri')`
  in packages that dependend on perl-uri-escape
- add the version from perl-uri-escape to perl-uri
- remove the unneeded dependency from perl-uri
- remove the perl-uri-escape package

* Reinstated perl-test-needs dependency

Put the perl-test-needs dependency for perl-uri back in but set it to
type='test'.

* For tests to succeed the type must be ('build', 'test')
This commit is contained in:
Glenn Johnson 2019-09-29 09:27:42 -05:00 committed by Adam J. Stewart
parent 9117dfd118
commit c56f03a3ba
6 changed files with 6 additions and 25 deletions

View File

@ -26,7 +26,7 @@ class PerlStarFusion(Package):
depends_on('perl-intervaltree', type=('build', 'run'))
depends_on('perl-dbi', type=('build', 'run'))
depends_on('perl-dbfile', type=('build', 'run'))
depends_on('perl-uri-escape', type=('build', 'run'))
depends_on('perl-uri', type=('build', 'run'))
def install(self, spec, prefix):
mkdirp(prefix.bin)

View File

@ -1,20 +0,0 @@
# Copyright 2013-2019 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 PerlUriEscape(PerlPackage):
"""This module provides functions to percent-encode and percent-decode URI
strings as defined by RFC 3986. Percent-encoding URI's is informally called
"URI escaping". This is the terminology used by this module, which predates
the formalization of the terms by the RFC by several years."""
homepage = "https://metacpan.org/pod/URI::Escape"
url = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/URI-1.71.tar.gz"
version('1.71', '247c3da29a794f72730e01aa5a715daf')
depends_on('perl-extutils-makemaker', type='build')

View File

@ -13,5 +13,6 @@ class PerlUri(PerlPackage):
url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/URI-1.72.tar.gz"
version('1.72', 'cd56d81ed429efaa97e7f3ff08851b48')
version('1.71', '247c3da29a794f72730e01aa5a715daf')
depends_on('perl-test-needs', type=('build', 'run'))
depends_on('perl-test-needs', type=('build', 'test'))

View File

@ -20,7 +20,7 @@ class Transdecoder(MakefilePackage):
url='https://github.com/TransDecoder/TransDecoder/archive/v3.0.1.tar.gz')
depends_on('perl', type=('build', 'run'))
depends_on('perl-uri-escape', type='run')
depends_on('perl-uri', type='run')
def install(self, spec, prefix):
mkdirp(prefix.util)

View File

@ -53,7 +53,7 @@ class Trinity(MakefilePackage):
depends_on("py-numpy", type="run")
depends_on("express", type="run")
depends_on("perl-dbfile", type="run")
depends_on("perl-uri-escape", type="run")
depends_on("perl-uri", type="run")
depends_on("r-fastcluster", type="run")
depends_on("r-ctc", type="run")
depends_on("r-goseq", type="run")

View File

@ -37,7 +37,7 @@ class Xios(Package):
depends_on('boost')
depends_on('blitz')
depends_on('perl', type='build')
depends_on('perl-uri-escape', type='build')
depends_on('perl-uri', type='build')
depends_on('gmake', type='build')
@when('%clang')