summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2019-10-13 19:50:19 -0500
committerGitHub <noreply@github.com>2019-10-13 19:50:19 -0500
commit48cd455cc1ef2aa808e94aa9c2e31c864c859432 (patch)
tree9b6d339c917bf2258c8530fb53286708fbc16585
parente5d1810bec36f4f6995775529c87897eadbdaac8 (diff)
downloadspack-48cd455cc1ef2aa808e94aa9c2e31c864c859432.tar.gz
spack-48cd455cc1ef2aa808e94aa9c2e31c864c859432.tar.bz2
spack-48cd455cc1ef2aa808e94aa9c2e31c864c859432.tar.xz
spack-48cd455cc1ef2aa808e94aa9c2e31c864c859432.zip
Add mercurial 5.1.2 (#13156)
-rw-r--r--var/spack/repos/builtin/packages/mercurial/package.py19
1 files changed, 14 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py
index 5b7ec7bdd3..f099bb1774 100644
--- a/var/spack/repos/builtin/packages/mercurial/package.py
+++ b/var/spack/repos/builtin/packages/mercurial/package.py
@@ -11,7 +11,7 @@ class Mercurial(PythonPackage):
"""Mercurial is a free, distributed source control management tool."""
homepage = "https://www.mercurial-scm.org"
- url = "https://www.mercurial-scm.org/release/mercurial-5.1.1.tar.gz"
+ url = "https://www.mercurial-scm.org/release/mercurial-5.1.2.tar.gz"
import_modules = [
'hgext', 'hgext3rd', 'mercurial', 'hgext.convert', 'hgext.fsmonitor',
@@ -20,8 +20,9 @@ class Mercurial(PythonPackage):
'mercurial.httpclient', 'mercurial.pure'
]
- version('5.1.1', sha256='35fc8ba5e0379c1b3affa2757e83fb0509e8ac314cbd9f1fd133cf265d16e49f')
- version('4.9.1', sha256='1bdd21bb87d1e05fb5cd395d488d0e0cc2f2f90ce0fd248e31a03595da5ccb47')
+ version('5.1.2', sha256='15af0b090b23649e0e53621a88dde97b55a734d7cb08b77d3df284db70d44e2e')
+ version('5.1.1', sha256='35fc8ba5e0379c1b3affa2757e83fb0509e8ac314cbd9f1fd133cf265d16e49f')
+ version('4.9.1', sha256='1bdd21bb87d1e05fb5cd395d488d0e0cc2f2f90ce0fd248e31a03595da5ccb47')
version('4.4.1', sha256='8f2a5512d6cc2ffb08988aef639330a2f0378e4ac3ee0e1fbbdb64d9fff56246')
version('4.1.2', sha256='09415253fb409a77e19b9951532a3c22c4e07e74bab80652527064617daab194')
version('3.9.1', sha256='625e4fc7e85ec2278c2828bdc547fce74091b3bbe4d9eeeba2d61af51195df74')
@@ -31,12 +32,20 @@ class Mercurial(PythonPackage):
version('3.8.2', sha256='cb78b16956140625266a8a6d1fadc7c868969d994086e1ec60279a66bf20bffd')
version('3.8.1', sha256='face1f058de5530b56b0dfd3b4d0b23d89590c588605c06f3d18b79e8c30d594')
- depends_on('python@2.6:2.8', when='@:4.2.99')
- depends_on('python@2.7:2.8,3.5:3.5.999,3.6.2:', when='@4.3:')
+ depends_on('python@2.6:2.8', when='@:4.2.99', type=('build', 'run'))
+ depends_on('python@2.7:2.8,3.5.3:3.5.999,3.6.2:', when='@4.3:', type=('build', 'run'))
+ depends_on('py-setuptools', when='@3.6:', type='build')
depends_on('py-docutils', type='build')
depends_on('py-pygments', type=('build', 'run'))
depends_on('py-certifi', type=('build', 'run'))
+ def setup_environment(self, spack_env, run_env):
+ # Python 3 support is still experimental, explicitly allow
+ spack_env.set('HGALLOWPYTHON3', True)
+ spack_env.set('HGPYTHON3', True)
+ # Setuptools is still opt-in, explicitly enable
+ spack_env.set('FORCE_SETUPTOOLS', True)
+
@run_after('install')
def post_install(self):
prefix = self.prefix