Merge branch 'develop' into features/shared

lib/spack/spack/test/relocate.py

@@ -65,7 +65,7 @@ def test_file_is_relocatable(source_file, is_relocatable):
 )
 def test_patchelf_is_relocatable():
     patchelf = spack.relocate.get_patchelf()
-    assert spack.relocate.is_binary(patchelf)
+    assert llnl.util.filesystem.is_exe(patchelf)
     assert spack.relocate.file_is_relocatable(patchelf)
 
 

lib/spack/spack/test/url_parse.py

@@ -74,6 +74,8 @@
     ('numpy-1.12.0-cp27-cp27m-macosx_10_6_intel.macosx_10_9_intel.macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64.whl', 'numpy-1.12.0'),  # noqa
     # PyPI - exe
     ('PyYAML-3.12.win-amd64-py3.5.exe', 'PyYAML-3.12'),
+    # Combinations of multiple patterns - bin, release
+    ('rocketmq-all-4.5.2-bin-release', 'rocketmq-all-4.5.2'),
     # Combinations of multiple patterns - all
     ('p7zip_9.04_src_all', 'p7zip_9.04'),
     # Combinations of multiple patterns - run

lib/spack/spack/url.py

@@ -175,6 +175,7 @@ def strip_version_suffixes(path):
 
         # Download version
         r'release',
+        r'bin',
         r'stable',
         r'[Ff]inal',
         r'rel',