From 1249d73630c0a7f49014022c3183e66a9d9ead9f Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 5 Apr 2020 17:31:09 -0500 Subject: [PATCH 1/2] py-spatialist: add maintainer and new version, fix url and deps (#15878) --- .../builtin/packages/py-spatialist/package.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-spatialist/package.py b/var/spack/repos/builtin/packages/py-spatialist/package.py index e1beee57e5f..ff7386fd00f 100644 --- a/var/spack/repos/builtin/packages/py-spatialist/package.py +++ b/var/spack/repos/builtin/packages/py-spatialist/package.py @@ -12,16 +12,24 @@ class PySpatialist(PythonPackage): processing using GDAL and OGR.""" homepage = "https://github.com/johntruckenbrodt/spatialist" - url = "https://files.pythonhosted.org/packages/source/s/spatialist/spatialist-0.2.8.tar.gz" + url = "https://pypi.io/packages/source/s/spatialist/spatialist-0.4.tar.gz" + maintainers = ['adamjstewart'] + + version('0.4', sha256='153b118022c06ad2d1d51fb6cd9ecbfc8020bc1995b643ec7fa689a8c5dde7e9') version('0.2.8', sha256='97de7f9c0fbf28497ef28970bdf8093a152e691a783e7edad22998cb235154c6') + depends_on('python@2.7.9:', type=('build', 'run')) depends_on('py-setuptools', type='build') + depends_on('py-setuptools-scm', type='build') depends_on('py-progressbar2', type=('build', 'run')) - depends_on('py-pathos@0.2.0:', type=('build', 'run')) - depends_on('py-numpy', type=('build', 'run')) - depends_on('py-matplotlib', type=('build', 'run')) - depends_on('py-jupyter-core', type=('build', 'run')) + depends_on('py-jupyter', type=('build', 'run')) depends_on('py-ipython', type=('build', 'run')) depends_on('py-ipywidgets', type=('build', 'run')) + depends_on('py-matplotlib', type=('build', 'run')) + depends_on('py-prompt-toolkit@2.0.10:2.0.999', type=('build', 'run')) + depends_on('py-pathos@0.2:', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-scoop', type=('build', 'run')) depends_on('py-tblib', type=('build', 'run')) + depends_on('py-pyyaml', type=('build', 'run')) From 268c2a19da2085083ad3a61d0ce0a27ecd1e2343 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sun, 5 Apr 2020 17:42:27 -0600 Subject: [PATCH 2/2] boost: boost-python in 1.72.0 broken with cxxstd=98 (#15885) * boost: boost-python in 1.72.0 broken with cxxstd=98 * py-espressopp: depend on boost with cxxstd=11 --- var/spack/repos/builtin/packages/boost/package.py | 3 +++ var/spack/repos/builtin/packages/py-espressopp/package.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 41be592a528..c0998e23d0a 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -178,6 +178,9 @@ def libs(self): conflicts('+taggedlayout', when='+versionedlayout') conflicts('+numpy', when='~python') + # boost-python in 1.72.0 broken with cxxstd=98 + conflicts('cxxstd=98', when='+mpi+python @1.72.0:') + # Container's Extended Allocators were not added until 1.56.0 conflicts('+container', when='@:1.55.99') diff --git a/var/spack/repos/builtin/packages/py-espressopp/package.py b/var/spack/repos/builtin/packages/py-espressopp/package.py index 779873bc98c..f243fcb4d28 100644 --- a/var/spack/repos/builtin/packages/py-espressopp/package.py +++ b/var/spack/repos/builtin/packages/py-espressopp/package.py @@ -27,7 +27,7 @@ class PyEspressopp(CMakePackage): depends_on("cmake@2.8:", type='build') depends_on("mpi") - depends_on("boost+serialization+filesystem+system+python+mpi", when='@1.9.4:') + depends_on("boost+serialization+filesystem+system+python+mpi cxxstd=11", when='@1.9.4:') extends("python") depends_on("python@2:2.8") depends_on("py-mpi4py@2.0.0:", when='@1.9.4', type=('build', 'run'))