From adf0ac19023ce89f92ec36a4f214f267578940a2 Mon Sep 17 00:00:00 2001 From: perrymil <61604258+perrymil@users.noreply.github.com> Date: Thu, 8 Oct 2020 13:13:03 -0700 Subject: Pymol 2.4 package update (#18618) * Update Package, Pymol 2.4 * Fixed flake8 stuff * more style fixes * missing ( at EOF * added py-pymol 2.3 back this * extra line removal * white space in empty line removal * added libpng and py-pyqt5 to prefix_path --- .../repos/builtin/packages/py-pymol/package.py | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pymol/package.py b/var/spack/repos/builtin/packages/py-pymol/package.py index 158985aaeb..ba0d0e9275 100644 --- a/var/spack/repos/builtin/packages/py-pymol/package.py +++ b/var/spack/repos/builtin/packages/py-pymol/package.py @@ -13,19 +13,31 @@ class PyPymol(PythonPackage): movies. Open Source PyMOL is free to everyone!""" homepage = "https://pymol.org" - url = "https://github.com/schrodinger/pymol-open-source/archive/v2.3.0.tar.gz" + url = "https://github.com/schrodinger/pymol-open-source/archive/v2.4.0.tar.gz" + version('2.4.0', sha256='5ede4ce2e8f53713c5ee64f5905b2d29bf01e4391da7e536ce8909d6b9116581') version('2.3.0', sha256='62aa21fafd1db805c876f89466e47513809f8198395e1f00a5f5cc40d6f40ed0') depends_on('python+tkinter', type=('build', 'run')) depends_on('freetype', type=('build', 'run')) - depends_on('glew') - depends_on('glm') - depends_on('freeglut', type=('build', 'run')) + depends_on('glew', type=('build')) + depends_on('glm', type=('build')) depends_on('py-numpy', type=('build', 'run')) depends_on('tcsh', type=('build', 'run')) depends_on('py-pyqt5', type=('build', 'run')) depends_on('py-pmw', type=('build', 'run')) + depends_on('libmmtf-cpp', type=('build', 'run', 'link')) + depends_on('msgpack-c', type=('build', 'run')) + depends_on('libpng@1.5.13', type=('build', 'run')) - depends_on('libmmtf-cpp', type=('build')) - depends_on('msgpack-c', type=('build')) + def setup_build_environment(self, env): + include = [] + library = [] + for dep in self.spec.dependencies(deptype='link'): + query = self.spec[dep.name] + include.extend(query.headers.directories) + + env.set('CPATH', ':'.join(include)) + env.set('LIBRARY_PATH', ':'.join(library)) + env.set('PREFIX_PATH', self.spec['libpng'].prefix) + env.prepend_path('PREFIX_PATH', self.spec['py-pyqt5'].prefix) -- cgit v1.2.3-60-g2f50