diff options
| author | healther <healther@users.noreply.github.com> | 2017-12-17 19:00:58 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-12-17 12:00:58 -0600 |
| commit | 0cff0fba73b944ecf2c19fbe89eed237fd8b7621 (patch) | |
| tree | a5a6b968d855f0f22728b00d01a907a9af783879 | |
| parent | 576ef5e2b34b5524bcfd2cf86a695632bb7b8e5a (diff) | |
| download | spack-0cff0fba73b944ecf2c19fbe89eed237fd8b7621.tar.gz spack-0cff0fba73b944ecf2c19fbe89eed237fd8b7621.tar.bz2 spack-0cff0fba73b944ecf2c19fbe89eed237fd8b7621.tar.xz spack-0cff0fba73b944ecf2c19fbe89eed237fd8b7621.zip | |
fix post install method for py3 in mercurial (#6497)
* fix post install method for py3 in mercurial
* Update package.py
* Update package.py
* use print_str instead of manual print detection
* Update package.py
* use only depends_on
* Update package.py
* Update package.py
State py3 compatibility for @4.3: according to setup.py from the 4.3.tar.gz from pypi
| -rw-r--r-- | var/spack/repos/builtin/packages/mercurial/package.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index 4ecd3332a9..198a8005be 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -39,6 +39,7 @@ class Mercurial(PythonPackage): 'mercurial.httpclient', 'mercurial.pure' ] + version('4.4.1', '37974a416d1d9525e1375c92025b16d9') version('4.1.2', '934c99808bdc8385e074b902d59b0d93') version('3.9.1', '3759dd10edb8c1a6dfb8ff0ce82658ce') version('3.9', 'e2b355da744e94747daae3a5339d28a0') @@ -47,7 +48,8 @@ class Mercurial(PythonPackage): version('3.8.2', 'c38daa0cbe264fc621dc3bb05933b0b3') version('3.8.1', '172a8c588adca12308c2aca16608d7f4') - depends_on('python@2.6:2.8') + 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('py-docutils', type='build') depends_on('py-pygments', type=('build', 'run')) depends_on('py-certifi', type=('build', 'run')) @@ -84,8 +86,8 @@ class Mercurial(PythonPackage): hgrc_filename = join_path(etc_dir, 'hgrc') # Use certifi to find the location of the CA certificate - certificate = python('-c', 'import certifi; print certifi.where()', - output=str) + print_str = self.spec['python'].package.print_string('certifi.where()') + certificate = python('-c', 'import certifi; ' + print_str) if not certificate: tty.warn('CA certificate not found. You may not be able to ' |