Overhaul Spack's URL parsing (#2972)
* Remove fake URLs from Spack * Ignore long lines for URLs that start with ftp: * Preliminary changes to version regexes * New redesign of version regexes * Allow letters in version-only * Fix detection of versions that end in Final * Rearrange a few regexes and add examples * Add tests for common download repositories * Add test cases for common tarball naming schemes * Finalize version regexes * spack url test -> spack url summary * Clean up comments * Rearrange suffix checks * Use query strings for name detection * Remove no longer necessary url_for_version functions * Strip off extraneous information after package name * Add one more test * Dot in square brackets does not need to be escaped * Move renaming outside of parse_name_offset * Fix versions for a couple more packages * Fix flake8 and doc tests * Correctly parse Python, Lua, and Bio++ package names * Use effective URLs for mfem * Add checksummed version to mitos * Remove url_for_version from STAR-CCM+ package * Revert changes to version numbers with underscores and dashes * Fix name detection for tbb * Correctly parse Ruby gems * Reverted mfem back to shortened URLs. * Updated instructions for better security * Remove preferred=True from newest version * Add tests for new `spack url list` flags * Add tests for strip_name_suffixes * Add unit tests for version separators * Fix bugs related to parseable name but in parseable version * Remove dead code, update docstring * Ignore 'binary' at end of version string * Remove platform from version * Flip libedit version numbers * Re-support weird NCO alpha/beta versions * Rebase and remove one new fake URL * Add / to beginning of regex to avoid picking up similarly named packages * Ignore weird tar versions * Fix bug in url parse --spider when no versions found * Less strict version matching for spack versions * Don't rename Python packages * Be a little more selective, version must begin with a digit * Re-add fake URLs * Fix up several other packages * Ignore more file endings * Add parsing support for Miniconda * Update tab completion * XFAILS are now PASSES for 2 web tests
This commit is contained in:

committed by
Todd Gamblin

parent
7e9777f294
commit
50df071ad9
@@ -44,7 +44,7 @@ class Trilinos(CMakePackage):
|
||||
A unique design feature of Trilinos is its focus on packages.
|
||||
"""
|
||||
homepage = "https://trilinos.org/"
|
||||
base_url = "https://github.com/trilinos/Trilinos/archive"
|
||||
url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-12-10-1.tar.gz"
|
||||
|
||||
version('develop',
|
||||
git='https://github.com/trilinos/Trilinos.git', tag='develop')
|
||||
@@ -63,10 +63,6 @@ class Trilinos(CMakePackage):
|
||||
version('11.14.2', 'e7c3cdbbfe3279a8a68838b873ad6d51')
|
||||
version('11.14.1', 'b7760b142eef66c79ed13de7c9560f81')
|
||||
|
||||
def url_for_version(self, version):
|
||||
return '%s/trilinos-release-%s.tar.gz' % \
|
||||
(Trilinos.base_url, version.dashed)
|
||||
|
||||
variant('xsdkflags', default=False,
|
||||
description='Compile using the default xSDK configuration')
|
||||
variant('metis', default=True,
|
||||
@@ -125,6 +121,10 @@ def url_for_version(self, version):
|
||||
|
||||
patch('umfpack_from_suitesparse.patch', when='@:12.8.1')
|
||||
|
||||
def url_for_version(self, version):
|
||||
url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-{0}.tar.gz"
|
||||
return url.format(version.dashed)
|
||||
|
||||
# check that the combination of variants makes sense
|
||||
def variants_check(self):
|
||||
if '+superlu-dist' in self.spec and self.spec.satisfies('@:11.4.3'):
|
||||
|
Reference in New Issue
Block a user