Skip to content
Snippets Groups Projects
Commit c56f03a3 authored by Glenn Johnson's avatar Glenn Johnson Committed by Adam J. Stewart
Browse files

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')
parent 9117dfd1
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ class PerlStarFusion(Package): ...@@ -26,7 +26,7 @@ class PerlStarFusion(Package):
depends_on('perl-intervaltree', type=('build', 'run')) depends_on('perl-intervaltree', type=('build', 'run'))
depends_on('perl-dbi', type=('build', 'run')) depends_on('perl-dbi', type=('build', 'run'))
depends_on('perl-dbfile', 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): def install(self, spec, prefix):
mkdirp(prefix.bin) mkdirp(prefix.bin)
......
# 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')
...@@ -13,5 +13,6 @@ class PerlUri(PerlPackage): ...@@ -13,5 +13,6 @@ class PerlUri(PerlPackage):
url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/URI-1.72.tar.gz" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/URI-1.72.tar.gz"
version('1.72', 'cd56d81ed429efaa97e7f3ff08851b48') version('1.72', 'cd56d81ed429efaa97e7f3ff08851b48')
version('1.71', '247c3da29a794f72730e01aa5a715daf')
depends_on('perl-test-needs', type=('build', 'run')) depends_on('perl-test-needs', type=('build', 'test'))
...@@ -20,7 +20,7 @@ class Transdecoder(MakefilePackage): ...@@ -20,7 +20,7 @@ class Transdecoder(MakefilePackage):
url='https://github.com/TransDecoder/TransDecoder/archive/v3.0.1.tar.gz') url='https://github.com/TransDecoder/TransDecoder/archive/v3.0.1.tar.gz')
depends_on('perl', type=('build', 'run')) depends_on('perl', type=('build', 'run'))
depends_on('perl-uri-escape', type='run') depends_on('perl-uri', type='run')
def install(self, spec, prefix): def install(self, spec, prefix):
mkdirp(prefix.util) mkdirp(prefix.util)
......
...@@ -53,7 +53,7 @@ class Trinity(MakefilePackage): ...@@ -53,7 +53,7 @@ class Trinity(MakefilePackage):
depends_on("py-numpy", type="run") depends_on("py-numpy", type="run")
depends_on("express", type="run") depends_on("express", type="run")
depends_on("perl-dbfile", 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-fastcluster", type="run")
depends_on("r-ctc", type="run") depends_on("r-ctc", type="run")
depends_on("r-goseq", type="run") depends_on("r-goseq", type="run")
......
...@@ -37,7 +37,7 @@ class Xios(Package): ...@@ -37,7 +37,7 @@ class Xios(Package):
depends_on('boost') depends_on('boost')
depends_on('blitz') depends_on('blitz')
depends_on('perl', type='build') depends_on('perl', type='build')
depends_on('perl-uri-escape', type='build') depends_on('perl-uri', type='build')
depends_on('gmake', type='build') depends_on('gmake', type='build')
@when('%clang') @when('%clang')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment