Replace git=git with explicit branch names

29 files changed, 32 insertions, 33 deletions

diff --git a/var/spack/repos/builtin/packages/bash-completion/package.py b/var/spack/repos/builtin/packages/bash-completion/package.py
index 71de10bc22..1c8126b0fd 100644
--- a/var/spack/repos/builtin/packages/bash-completion/package.py
+++ b/var/spack/repos/builtin/packages/bash-completion/package.py
@@ -32,7 +32,7 @@ class BashCompletion(AutotoolsPackage):
     url      = "https://github.com/scop/bash-completion/archive/2.3.tar.gz"
     git      = "https://github.com/scop/bash-completion.git"
 
-    version('develop',  git=git)
+    version('develop', branch='master')
     version('2.7', 'f72c9e2e877d188c3159956a3496a450e7279b76')
     version('2.3', '67e50f5f3c804350b43f2b664c33dde811d24292')
 
diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py
index fcd81db8de..4135fc8ca7 100644
--- a/var/spack/repos/builtin/packages/charm/package.py
+++ b/var/spack/repos/builtin/packages/charm/package.py
@@ -38,9 +38,9 @@ class Charm(Package):
 
     homepage = "http://charmplusplus.org"
     url      = "http://charm.cs.illinois.edu/distrib/charm-6.8.2.tar.gz"
-    git      = "https://github.com/UIUC-PPL/charm"
+    git      = "https://github.com/UIUC-PPL/charm.git"
 
-    version("develop", git=git)
+    version("develop", branch="charm")
     version("6.8.2", "a887a34b638a5b2f7fcf7ff3c262496d")
     version("6.8.1", "3e95ffa760909154ef16b643c9bb8193")
     version("6.8.0", "54df066a5aefb0bbc1a263c2383c2bba")
diff --git a/var/spack/repos/builtin/packages/cppad/package.py b/var/spack/repos/builtin/packages/cppad/package.py
index 40ed6a0de4..4130c1d253 100644
--- a/var/spack/repos/builtin/packages/cppad/package.py
+++ b/var/spack/repos/builtin/packages/cppad/package.py
@@ -32,7 +32,7 @@ class Cppad(CMakePackage):
     url      = "http://www.coin-or.org/download/source/CppAD/cppad-20170114.gpl.tgz"
     git      = "https://github.com/coin-or/CppAD.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('20170114', '565a534dc813fa1289764222cd8c11ea')
 
     def cmake_args(self):
diff --git a/var/spack/repos/builtin/packages/flint/package.py b/var/spack/repos/builtin/packages/flint/package.py
index 134dffa587..47134b5e74 100644
--- a/var/spack/repos/builtin/packages/flint/package.py
+++ b/var/spack/repos/builtin/packages/flint/package.py
@@ -32,7 +32,7 @@ class Flint(Package):
     url      = "http://mirrors.mit.edu/sage/spkg/upstream/flint/flint-2.5.2.tar.gz"
     git      = "https://github.com/wbhart/flint2.git"
 
-    version('develop', git=git)
+    version('develop', branch='trunk')
     version('2.5.2', 'cda885309362150196aed66a5e0f0383')
     version('2.4.5', '6504b9deabeafb9313e57153a1730b33')
 
diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py
index 5b74cf82f3..a0093a30cb 100644
--- a/var/spack/repos/builtin/packages/hoomd-blue/package.py
+++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py
@@ -39,7 +39,7 @@ class HoomdBlue(CMakePackage):
     homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/"
     git      = "https://bitbucket.org/glotzer/hoomd-blue"
 
-    version('develop', git=git, submodules=True)
+    version('develop', submodules=True)
 
     # Bitbucket has tarballs for each release, but they cannot be built.
     # The tarball doesn't come with the git submodules, nor does it come
diff --git a/var/spack/repos/builtin/packages/hub/package.py b/var/spack/repos/builtin/packages/hub/package.py
index d14d6b87fd..1aa13f270d 100644
--- a/var/spack/repos/builtin/packages/hub/package.py
+++ b/var/spack/repos/builtin/packages/hub/package.py
@@ -31,9 +31,9 @@ class Hub(Package):
 
     homepage = "https://github.com/github/hub"
     url      = "https://github.com/github/hub/archive/v2.2.3.tar.gz"
-    git      = "https://github.com/github/hub"
+    git      = "https://github.com/github/hub.git"
 
-    version('head', git=git)
+    version('head', branch='master')
     version('2.2.3', '6675992ddd16d186eac7ba4484d57f5b')
     version('2.2.2', '7edc8f5b5d3c7c392ee191dd999596fc')
     version('2.2.1', '889a31ee9d10ae9cb333480d8dbe881f')
diff --git a/var/spack/repos/builtin/packages/kahip/package.py b/var/spack/repos/builtin/packages/kahip/package.py
index a7d8d836dd..6b3d8c4441 100644
--- a/var/spack/repos/builtin/packages/kahip/package.py
+++ b/var/spack/repos/builtin/packages/kahip/package.py
@@ -46,7 +46,7 @@ class Kahip(SConsPackage):
     url       = 'http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.00.tar.gz'
     git       = 'https://github.com/schulzchristian/KaHIP.git'
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('2.00', '0a66b0a604ad72cfb7e3dce00e2c9fdfac82b855')
 
     depends_on('argtable')
diff --git a/var/spack/repos/builtin/packages/libev/package.py b/var/spack/repos/builtin/packages/libev/package.py
index 19fd42f700..d824719780 100644
--- a/var/spack/repos/builtin/packages/libev/package.py
+++ b/var/spack/repos/builtin/packages/libev/package.py
@@ -34,7 +34,7 @@ class Libev(AutotoolsPackage):
     git      = "https://github.com/enki/libev.git"
     list_url = "http://dist.schmorp.de/libev/Attic/"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('4.24', '94459a5a22db041dec6f98424d6efe54')
 
     depends_on('autoconf', type='build', when='@develop')
diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py
index e88ce2c8ad..724718cd37 100644
--- a/var/spack/repos/builtin/packages/libxsmm/package.py
+++ b/var/spack/repos/builtin/packages/libxsmm/package.py
@@ -35,7 +35,7 @@ class Libxsmm(MakefilePackage):
     url      = 'https://github.com/hfp/libxsmm/archive/1.9.tar.gz'
     git      = 'https://github.com/hfp/libxsmm.git'
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('1.9',   'a001a491d9b98239bc2bfd906bd09d90')
     version('1.8.3', '3415928340929c3a29773934de05c978')
     version('1.8.2', '8f11ece699244c28dcb6742969a2ccd4')
diff --git a/var/spack/repos/builtin/packages/lrzip/package.py b/var/spack/repos/builtin/packages/lrzip/package.py
index 268f0ed817..30aa0c40cc 100644
--- a/var/spack/repos/builtin/packages/lrzip/package.py
+++ b/var/spack/repos/builtin/packages/lrzip/package.py
@@ -37,7 +37,7 @@ class Lrzip(Package):
     url      = 'https://github.com/ckolivas/lrzip/archive/v0.630.tar.gz'
     git      = 'https://github.com/ckolivas/lrzip.git'
 
-    version('master', git=git)
+    version('master', branch='master')
     version('0.630', '3ca7f1d1365aa105089d1fbfc6b0924a')
     version('0.621', '1f07227b39ae81a98934411e8611e341')
     version('0.616', 'd40bdb046d0807ef602e36b1e9782cc0')
diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py
index 832ad61191..6f83a45a7f 100644
--- a/var/spack/repos/builtin/packages/mfem/package.py
+++ b/var/spack/repos/builtin/packages/mfem/package.py
@@ -73,8 +73,7 @@ class Mfem(Package):
             'b70fa3c5080b9ec514fc05f4a04ff74322b99ac4ecd6d99c229f0ed5188fc0ce',
             url='https://goo.gl/Kd7Jk8', extension='.tar.gz')
 
-    version('laghos-v1.0', git='https://github.com/mfem/mfem',
-            tag='laghos-v1.0')
+    version('laghos-v1.0', tag='laghos-v1.0')
 
     version('3.3',
             'b17bd452593aada93dc0fee748fcfbbf4f04ce3e7d77fdd0341cc9103bcacd0b',
diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py
index 32ec11a0ed..61a2a2d11d 100644
--- a/var/spack/repos/builtin/packages/mpifileutils/package.py
+++ b/var/spack/repos/builtin/packages/mpifileutils/package.py
@@ -39,7 +39,7 @@ class Mpifileutils(AutotoolsPackage):
     url      = "https://github.com/hpc/mpifileutils/releases/download/v0.6/mpifileutils-0.6.tar.gz"
     git      = "https://github.com/hpc/mpifileutils.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('0.7', 'c081f7f72c4521dddccdcf9e087c5a2b')
     version('0.6', '620bcc4966907481f1b1a965b28fc9bf')
 
diff --git a/var/spack/repos/builtin/packages/mpir/package.py b/var/spack/repos/builtin/packages/mpir/package.py
index 4f26bfe45b..c7fd5aff54 100644
--- a/var/spack/repos/builtin/packages/mpir/package.py
+++ b/var/spack/repos/builtin/packages/mpir/package.py
@@ -32,7 +32,7 @@ class Mpir(Package):
     url      = "https://github.com/wbhart/mpir/archive/mpir-2.7.0.tar.gz"
     git      = "https://github.com/wbhart/mpir.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('2.7.0', '985b5d57bd0e74c74125ee885b9c8f71')
     version('2.6.0', 'ec17d6a7e026114ceb734b2466aa0a91')
 
diff --git a/var/spack/repos/builtin/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py
index dc7ca9acf9..5e68f7b847 100644
--- a/var/spack/repos/builtin/packages/mrnet/package.py
+++ b/var/spack/repos/builtin/packages/mrnet/package.py
@@ -33,7 +33,7 @@ class Mrnet(AutotoolsPackage):
     git      = "https://github.com/dyninst/mrnet.git"
     list_url = "http://ftp.cs.wisc.edu/paradyn/mrnet"
 
-    version('5.0.1-3', git=git)
+    version('5.0.1-3', branch='master')
     version('5.0.1-2', commit='20b1eacfc6d680d9f6472146d2dfaa0f900cc2e9')
     version('5.0.1', '17f65738cf1b9f9b95647ff85f69ecdd')
     version('4.1.0', '5a248298b395b329e2371bf25366115c')
diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py
index f610c9e416..7dbef6df0e 100644
--- a/var/spack/repos/builtin/packages/nekbone/package.py
+++ b/var/spack/repos/builtin/packages/nekbone/package.py
@@ -37,7 +37,7 @@ class Nekbone(Package):
 
     tags = ['proxy-app', 'ecp-proxy-app']
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('17.0', sha256='ae361cc61368a924398a28a296f675b7f0c4a9516788a7f8fa3c09d787cdf69b')
 
     # Variants
diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py
index b84ec2db34..cec0f027d7 100644
--- a/var/spack/repos/builtin/packages/neuron/package.py
+++ b/var/spack/repos/builtin/packages/neuron/package.py
@@ -40,7 +40,7 @@ class Neuron(Package):
     url      = "http://www.neuron.yale.edu/ftp/neuron/versions/v7.5/nrn-7.5.tar.gz"
     git      = "https://github.com/nrnhines/nrn.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('7.5', 'fb72c841374dfacbb6c2168ff57bfae9')
     version('7.4', '2c0bbee8a9e55d60fa26336f4ab7acbf')
     version('7.3', '993e539cb8bf102ca52e9fefd644ab61')
diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py
index 74c7cac236..dfb3af51f6 100644
--- a/var/spack/repos/builtin/packages/openfoam-org/package.py
+++ b/var/spack/repos/builtin/packages/openfoam-org/package.py
@@ -82,7 +82,7 @@ class OpenfoamOrg(Package):
     url      = "https://github.com/OpenFOAM/OpenFOAM-4.x/archive/version-4.1.tar.gz"
     git      = "https://github.com/OpenFOAM/OpenFOAM-dev.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('5.0', 'cd8c5bdd3ff39c34f61747c8e55f59d1',
             url=baseurl + '/OpenFOAM-5.x/archive/version-5.0.tar.gz')
     version('4.1', 'afd7d8e66e7db0ffaf519b14f1a8e1d4',
diff --git a/var/spack/repos/builtin/packages/piranha/package.py b/var/spack/repos/builtin/packages/piranha/package.py
index 21a6324d7b..aaf4102dbb 100644
--- a/var/spack/repos/builtin/packages/piranha/package.py
+++ b/var/spack/repos/builtin/packages/piranha/package.py
@@ -34,7 +34,7 @@ class Piranha(CMakePackage):
     url      = "https://github.com/bluescarni/piranha/archive/v0.5.tar.gz"
     git      = "https://github.com/bluescarni/piranha.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('0.5', '99546bae2be115737b6316751eb0b84d')
 
     variant('python',   default=True,
diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py
index 17288b1080..538e1cfc66 100644
--- a/var/spack/repos/builtin/packages/pocl/package.py
+++ b/var/spack/repos/builtin/packages/pocl/package.py
@@ -38,7 +38,7 @@ class Pocl(CMakePackage):
     url      = "http://portablecl.org/downloads/pocl-0.13.tar.gz"
     git      = "https://github.com/pocl/pocl.git"
 
-    version("master", git=git)
+    version("master", branch="master")
     version('0.14', '1d35f09299e76b9e3918c42826555194')
     version("0.13", "344480864d4269f2f63f1509395898bd")
     version("0.12", "e197ba3aa01a35f40581c48e053330dd")
diff --git a/var/spack/repos/builtin/packages/pxz/package.py b/var/spack/repos/builtin/packages/pxz/package.py
index f6acaee49f..38ebffa629 100644
--- a/var/spack/repos/builtin/packages/pxz/package.py
+++ b/var/spack/repos/builtin/packages/pxz/package.py
@@ -32,7 +32,7 @@ class Pxz(MakefilePackage):
     url      = "http://jnovy.fedorapeople.org/pxz/pxz-4.999.9beta.20091201git.tar.xz"
     git      = "https://github.com/jnovy/pxz.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('4.999.9beta.20091201git', '4ae3926185978f5c95c9414dc4634451')
 
     depends_on('lzma')
diff --git a/var/spack/repos/builtin/packages/py-symengine/package.py b/var/spack/repos/builtin/packages/py-symengine/package.py
index 8b3187ef37..b3efc57390 100644
--- a/var/spack/repos/builtin/packages/py-symengine/package.py
+++ b/var/spack/repos/builtin/packages/py-symengine/package.py
@@ -32,7 +32,7 @@ class PySymengine(PythonPackage):
     url      = "https://github.com/symengine/symengine.py/archive/v0.2.0.tar.gz"
     git      = "https://github.com/symengine/symengine.py.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('0.2.0', 'e1d114fa12be4c8c7e9f24007e07718c')
 
     # Build dependencies
diff --git a/var/spack/repos/builtin/packages/r-rhtslib/package.py b/var/spack/repos/builtin/packages/r-rhtslib/package.py
index 4a43685abf..c6568fca67 100644
--- a/var/spack/repos/builtin/packages/r-rhtslib/package.py
+++ b/var/spack/repos/builtin/packages/r-rhtslib/package.py
@@ -33,9 +33,9 @@ class RRhtslib(RPackage):
     are in the vignette, vignette(package="Rhtslib", "Rhtslib")."""
 
     homepage = "https://www.bioconductor.org/packages/Rhtslib/"
-    url      = "https://git.bioconductor.org/packages/Rhtslib"
+    git      = "https://git.bioconductor.org/packages/Rhtslib.git"
 
-    version('1.8.0', git='https://git.bioconductor.org/packages/Rhtslib', commit='3b5493473bed42958614091c58c739932ffcfa79')
+    version('1.8.0', commit='3b5493473bed42958614091c58c739932ffcfa79')
 
     depends_on('r@3.4.0:3.4.9', when='@1.8.0')
     depends_on('r-zlibbioc', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/raft/package.py b/var/spack/repos/builtin/packages/raft/package.py
index 48d8cd12f6..37a49e69c5 100644
--- a/var/spack/repos/builtin/packages/raft/package.py
+++ b/var/spack/repos/builtin/packages/raft/package.py
@@ -34,7 +34,7 @@ class Raft(CMakePackage):
     url      = "https://bitbucket.org/gill_martinez/raft_aps/get/1.2.3.tar.gz"
     git      = "https://bitbucket.org/gill_martinez/raft_aps.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('1.2.3', '4d1b106d9b3493e63dde96f7dd44b834')
 
     depends_on('mpi')
diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py
index 9bdb4436e3..1030f04849 100644
--- a/var/spack/repos/builtin/packages/slepc/package.py
+++ b/var/spack/repos/builtin/packages/slepc/package.py
@@ -33,7 +33,7 @@ class Slepc(Package):
     url      = "http://slepc.upv.es/download/distrib/slepc-3.6.2.tar.gz"
     git      = "https://bitbucket.org/slepc/slepc.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('3.9.1', 'e174ea7c127d9161eef976b0288f0c56d443a58d6ab2dc8af1e8bd66f156ce17')
     version('3.9.0', '1f3930db56b4065aaf214ea758ddff1a70bf19d45544cbdfd19d2787db4bfe0b')
     version('3.8.2', '1e7d20d20eb26da307d36017461fe4a55f40e947e232739179dbe6412e22ed13')
diff --git a/var/spack/repos/builtin/packages/symengine/package.py b/var/spack/repos/builtin/packages/symengine/package.py
index 6a8837f6a0..8518ac66bf 100644
--- a/var/spack/repos/builtin/packages/symengine/package.py
+++ b/var/spack/repos/builtin/packages/symengine/package.py
@@ -33,7 +33,7 @@ class Symengine(CMakePackage):
     url      = "https://github.com/symengine/symengine/archive/v0.2.0.tar.gz"
     git      = "https://github.com/symengine/symengine.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('0.3.0', 'e61d7513cca4963cd062616891de54c6')
     version('0.2.0', '45401561add36a13c1f0b0c5f8d7422d')
     version('0.1.0', '41ad7daed61fc5a77c285eb6c7303425')
diff --git a/var/spack/repos/builtin/packages/tethex/package.py b/var/spack/repos/builtin/packages/tethex/package.py
index dc1f834920..d3e6f4ae93 100644
--- a/var/spack/repos/builtin/packages/tethex/package.py
+++ b/var/spack/repos/builtin/packages/tethex/package.py
@@ -38,7 +38,7 @@ class Tethex(CMakePackage):
 
     maintainers = ['davydden']
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('0.0.7', '6c9e4a18a6637deb4400c6d77ec03184')
 
     variant('build_type', default='Release',
diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py
index baa22f157d..095dd98232 100644
--- a/var/spack/repos/builtin/packages/valgrind/package.py
+++ b/var/spack/repos/builtin/packages/valgrind/package.py
@@ -40,7 +40,7 @@ class Valgrind(AutotoolsPackage):
     url      = "https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2"
     git      = "git://sourceware.org/git/valgrind.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('3.13.0', '817dd08f1e8a66336b9ff206400a5369')
     version('3.12.0', '6eb03c0c10ea917013a7622e483d61bb')
     version('3.11.0', '4ea62074da73ae82e0162d6550d3f129')
diff --git a/var/spack/repos/builtin/packages/veclibfort/package.py b/var/spack/repos/builtin/packages/veclibfort/package.py
index 21512e4d8e..5297d2d7d9 100644
--- a/var/spack/repos/builtin/packages/veclibfort/package.py
+++ b/var/spack/repos/builtin/packages/veclibfort/package.py
@@ -35,7 +35,7 @@ class Veclibfort(Package):
     url      = "https://github.com/mcg1969/vecLibFort/archive/0.4.2.tar.gz"
     git      = "https://github.com/mcg1969/vecLibFort.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('0.4.2', '83395ffcbe8a2122c3f726a5c3a7cf93')
 
     variant('shared', default=True,
diff --git a/var/spack/repos/builtin/packages/yasm/package.py b/var/spack/repos/builtin/packages/yasm/package.py
index 9bcc2ee8ab..0581bf6b45 100644
--- a/var/spack/repos/builtin/packages/yasm/package.py
+++ b/var/spack/repos/builtin/packages/yasm/package.py
@@ -35,7 +35,7 @@ class Yasm(AutotoolsPackage):
     url      = "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz"
     git      = "https://github.com/yasm/yasm.git"
 
-    version('develop', git=git)
+    version('develop', branch='master')
     version('1.3.0', 'fc9e586751ff789b34b1f21d572d96af')
 
     depends_on('autoconf', when='@develop')