Commit 3ab92644 authored by Xavier Thompson's avatar Xavier Thompson

component/{numpy,scipy}: Drop Python<3.8 compatibility

parent 9b6049fb
...@@ -9,21 +9,15 @@ BLAS=None ...@@ -9,21 +9,15 @@ BLAS=None
LAPACK=None LAPACK=None
ATLAS=None ATLAS=None
[numpy]
recipe = zc.recipe.egg:custom
egg = numpy
environment = numpy-env
[versions]
numpy = 1.16.4
[numpy:sys.version_info >= (3,8)]
depends = ${numpy-pythonpath:recipe}
[numpy-pythonpath] [numpy-pythonpath]
<= macro.pythonpath.eggs <= macro.pythonpath.eggs
environment = numpy-env environment = numpy-env
eggs = ${cython:egg} eggs = ${cython:egg}
[versions:sys.version_info >= (3,8)] [numpy]
recipe = zc.recipe.egg:custom
egg = numpy
environment = ${numpy-pythonpath:environment}
[versions]
numpy = 1.22.0 numpy = 1.22.0
...@@ -10,5 +10,4 @@ LAPACK = ${openblas:location}/lib/libopenblas.so ...@@ -10,5 +10,4 @@ LAPACK = ${openblas:location}/lib/libopenblas.so
ATLAS = ${openblas:location}/lib/libopenblas.so ATLAS = ${openblas:location}/lib/libopenblas.so
[numpy] [numpy]
environment = numpy-env
rpath = ${openblas:location}/lib rpath = ${openblas:location}/lib
...@@ -7,24 +7,6 @@ parts = scipy ...@@ -7,24 +7,6 @@ parts = scipy
[scipy-env] [scipy-env]
<= numpy-env <= numpy-env
[scipy]
recipe = zc.recipe.egg:custom
egg = scipy
environment = scipy-env
setup-eggs = ${numpy:egg}
rpath = ${numpy:rpath}
[versions]
scipy = 1.0.1
[scipy:sys.version_info >= (3,8)]
depends = ${scipy-pythonpath:recipe}
[scipy-pythonpath]
<= macro.pythonpath.eggs
environment = scipy-env
eggs = ${scipy-setup-eggs:eggs}
[scipy-setup-eggs] [scipy-setup-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
...@@ -34,7 +16,18 @@ eggs = ...@@ -34,7 +16,18 @@ eggs =
pythran pythran
pybind11 pybind11
[versions:sys.version_info >= (3,8)] [scipy-pythonpath]
<= macro.pythonpath.eggs
environment = scipy-env
eggs = ${scipy-setup-eggs:eggs}
[scipy]
recipe = zc.recipe.egg:custom
egg = scipy
environment = ${scipy-pythonpath:environment}
rpath = ${numpy:rpath}
[versions]
pybind11 = 2.9.2 pybind11 = 2.9.2
scipy = 1.8.1 scipy = 1.8.1
beniget = 0.4.1 beniget = 0.4.1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment