Merge branch 'develop' of https://github.com/LLNL/spack into features/custom_modulefile_from_config

lib/spack/spack/__init__.py

@@ -136,9 +136,7 @@
     # don't add a second username if it's already unique by user.
     if not _tmp_user in path:
         tmp_dirs.append(join_path(path, '%u', 'spack-stage'))
-
-for path in _tmp_candidates:
-    if not path in tmp_dirs:
+    else:
         tmp_dirs.append(join_path(path, 'spack-stage'))
 
 # Whether spack should allow installation of unsafe versions of

var/spack/repos/builtin/packages/parallel-netcdf/package.py

@@ -8,6 +8,7 @@ class ParallelNetcdf(Package):
     homepage = "https://trac.mcs.anl.gov/projects/parallel-netcdf"
     url      = "http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/parallel-netcdf-1.6.1.tar.gz"
 
+    version('1.7.0', '267eab7b6f9dc78c4d0e6def2def3aea4bc7c9f0')
     version('1.6.1', '62a094eb952f9d1e15f07d56e535052604f1ac34')
 
     depends_on("m4")

var/spack/repos/builtin/packages/py-setuptools/package.py

@@ -10,6 +10,8 @@ class PySetuptools(Package):
     version('18.1', 'f72e87f34fbf07f299f6cb46256a0b06')
     version('19.2', '78353b1f80375ca5e088f4b4627ffe03')
     version('20.5', 'fadc1e1123ddbe31006e5e43e927362b')
+    version('20.6.7', '45d6110f3ec14924e44c33411db64fe6')
+    version('20.7.0', '5d12b39bf3e75e80fdce54e44b255615')
 
     extends('python')