zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #3 from spack/develop"

Browse Source 
This reverts commit 58dbbdb82b, reversing
changes made to dd7a413f48.
This commit is contained in:
Diego Magdaleno 2020-04-05 23:13:43 -05:00
parent 184fc48ec3
commit f956aa7b13
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/boost/package.py
View File

@ -178,9 +178,6 @@ def libs(self):
conflicts('+taggedlayout', when='+versionedlayout') conflicts('+taggedlayout', when='+versionedlayout')
conflicts('+numpy', when='~python') 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 # Container's Extended Allocators were not added until 1.56.0
conflicts('+container', when='@:1.55.99') conflicts('+container', when='@:1.55.99')

2
var/spack/repos/builtin/packages/py-espressopp/package.py
View File

@ -27,7 +27,7 @@ class PyEspressopp(CMakePackage):
depends_on("cmake@2.8:", type='build') depends_on("cmake@2.8:", type='build')
depends_on("mpi") depends_on("mpi")
depends_on("boost+serialization+filesystem+system+python+mpi cxxstd=11", when='@1.9.4:') depends_on("boost+serialization+filesystem+system+python+mpi", when='@1.9.4:')
extends("python") extends("python")
depends_on("python@2:2.8") depends_on("python@2:2.8")
depends_on("py-mpi4py@2.0.0:", when='@1.9.4', type=('build', 'run')) depends_on("py-mpi4py@2.0.0:", when='@1.9.4', type=('build', 'run'))

18
var/spack/repos/builtin/packages/py-spatialist/package.py
View File

@ -12,24 +12,16 @@ class PySpatialist(PythonPackage):
processing using GDAL and OGR.""" processing using GDAL and OGR."""
homepage = "https://github.com/johntruckenbrodt/spatialist" homepage = "https://github.com/johntruckenbrodt/spatialist"
url = "https://pypi.io/packages/source/s/spatialist/spatialist-0.4.tar.gz" url = "https://files.pythonhosted.org/packages/source/s/spatialist/spatialist-0.2.8.tar.gz"
maintainers = ['adamjstewart']
version('0.4', sha256='153b118022c06ad2d1d51fb6cd9ecbfc8020bc1995b643ec7fa689a8c5dde7e9')
version('0.2.8', sha256='97de7f9c0fbf28497ef28970bdf8093a152e691a783e7edad22998cb235154c6') 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', type='build')
depends_on('py-setuptools-scm', type='build')
depends_on('py-progressbar2', type=('build', 'run')) depends_on('py-progressbar2', type=('build', 'run'))
depends_on('py-jupyter', 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-ipython', type=('build', 'run')) depends_on('py-ipython', type=('build', 'run'))
depends_on('py-ipywidgets', 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-tblib', type=('build', 'run'))
depends_on('py-pyyaml', type=('build', 'run'))