diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-01-17 12:54:36 -0600 |
|---|---|---|
| committer | becker33 <becker33@llnl.gov> | 2017-01-17 10:54:36 -0800 |
| commit | 061076aea92a1d29058f17505b820e27bda7d846 (patch) | |
| tree | e1334b48754520ca0319910d78c641e46c87bf73 /lib | |
| parent | 18563177775509286e5b53744ea5924bc450d9c2 (diff) | |
| download | spack-061076aea92a1d29058f17505b820e27bda7d846.tar.gz spack-061076aea92a1d29058f17505b820e27bda7d846.tar.bz2 spack-061076aea92a1d29058f17505b820e27bda7d846.tar.xz spack-061076aea92a1d29058f17505b820e27bda7d846.zip | |
Support scionlib version detection (#2818)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/test/url_parse.py | 5 | ||||
| -rw-r--r-- | lib/spack/spack/url.py | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index c4718d56b8..8913de94d0 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -364,3 +364,8 @@ class UrlParseTest(unittest.TestCase): self.check( 'luaposix', '33.4.0', 'https://github.com/luaposix/luaposix/archive/release-v33.4.0.tar.gz') + + def test_sionlib_version(self): + self.check( + 'sionlib', '1.7.1', + 'http://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.1') diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index a1eec6067e..93c443fde8 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -213,7 +213,9 @@ def parse_version_offset(path, debug=False): # Search dotted versions: # e.g., https://gitlab.kitware.com/vtk/vtk/repository/archive.tar.bz2?ref=v7.0.0 # e.g., https://example.com/org/repo/repository/archive.tar.bz2?ref=SomePrefix-2.1.1 + # e.g., http://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.1 (r'\?ref=(?:.*-|v)*((\d+\.)+\d+).*$', suffix), + (r'\?version=((\d+\.)+\d+)', suffix), # e.g. boost_1_39_0 (r'((\d+_)+\d+)$', stem), @@ -304,6 +306,7 @@ def parse_name_offset(path, v=None, debug=False): (r'/([^/]+)[_.-](bin|dist|stable|src|sources)[_.-]%s' % v, path), (r'github.com/[^/]+/([^/]+)/archive', path), (r'[^/]+/([^/]+)/repository/archive', path), # gitlab + (r'([^/]+)/download.php', path), (r'([^/]+)[_.-]v?%s' % v, stem), # prefer the stem (r'([^/]+)%s' % v, stem), |