Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Thomas Gambier
slapos
Commits
225b80c5
Commit
225b80c5
authored
Dec 14, 2022
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Plain Diff
Feat/upgrade numpy
See merge request
!1280
parents
e752779e
aaa92f00
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
100 additions
and
9 deletions
+100
-9
component/cython/buildout.cfg
component/cython/buildout.cfg
+1
-1
component/macros/macro.pythonpath.eggs.cfg
component/macros/macro.pythonpath.eggs.cfg
+24
-0
component/matplotlib/buildout.cfg
component/matplotlib/buildout.cfg
+7
-0
component/numpy/buildout.cfg
component/numpy/buildout.cfg
+20
-0
component/numpy/openblas.cfg
component/numpy/openblas.cfg
+2
-2
component/pandas/buildout.cfg
component/pandas/buildout.cfg
+13
-1
component/scipy/buildout.cfg
component/scipy/buildout.cfg
+31
-3
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+0
-1
stack/slapos.cfg
stack/slapos.cfg
+2
-1
No files found.
component/cython/buildout.cfg
View file @
225b80c5
...
@@ -6,4 +6,4 @@ recipe = zc.recipe.egg:custom
...
@@ -6,4 +6,4 @@ recipe = zc.recipe.egg:custom
egg = cython
egg = cython
[versions]
[versions]
Cython = 0.29.21
cython = 0.29.24
component/macros/macro.pythonpath.eggs.cfg
0 → 100644
View file @
225b80c5
[buildout]
parts =
[macro.pythonpath.eggs]
recipe = slapos.recipe.build
_name_ = ${:_buildout_section_name_}
init =
prerequisite = """
[.%(_name_)s.prerequisite]
recipe = slapos.recipe.build
init =
section = self.buildout['%(_name_)s']
self.eggs = [e.strip() for e in section['eggs'].splitlines() if e.strip()]
update =
from zc.buildout.easy_install import working_set
buildout = self.buildout['buildout']
eggs_directory = buildout['eggs-directory']
develop_eggs_directory = buildout['develop-eggs-directory']
dists = working_set(self.eggs, [develop_eggs_directory, eggs_directory])
paths = ':'.join(dist.location for dist in dists)
self.buildout['%(environment)s']['PYTHONPATH'] = paths
print("PYTHONPATH=" + paths)
""" % options
self.buildout.parse(prerequisite)
component/matplotlib/buildout.cfg
View file @
225b80c5
...
@@ -36,3 +36,10 @@ rpath =
...
@@ -36,3 +36,10 @@ rpath =
${libpng:location}/lib
${libpng:location}/lib
${freetype:location}/lib
${freetype:location}/lib
need-matplotlibrc = ${matplotlibrc:location}
need-matplotlibrc = ${matplotlibrc:location}
[versions]
matplotlib = 2.1.2
cycler = 0.11.0
[versions:sys.version_info < (3,8)]
cycler = 0.10.0
component/numpy/buildout.cfg
View file @
225b80c5
[buildout]
[buildout]
extends =
../cython/buildout.cfg
../macros/macro.pythonpath.eggs.cfg
parts = numpy
parts = numpy
[numpy-env]
BLAS=None
LAPACK=None
ATLAS=None
[numpy]
[numpy]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
egg = numpy
egg = numpy
environment = numpy-env
depends = ${numpy-pythonpath:recipe}
[numpy-pythonpath]
<= macro.pythonpath.eggs
environment = numpy-env
eggs = ${cython:egg}
[versions]
[versions]
numpy = 1.22.0
[numpy:sys.version_info < (3,8)]
depends =
[versions:sys.version_info < (3,8)]
numpy = 1.16.4
numpy = 1.16.4
component/numpy/openblas.cfg
View file @
225b80c5
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
extends =
extends =
buildout.cfg
buildout.cfg
../openblas/buildout.cfg
../openblas/buildout.cfg
parts = numpy
[numpy-env]
[numpy-env]
OPENBLAS = ${openblas:location}/lib/libopenblas.so
OPENBLAS = ${openblas:location}/lib/libopenblas.so
...
@@ -10,5 +11,4 @@ ATLAS = ${openblas:location}/lib/libopenblas.so
...
@@ -10,5 +11,4 @@ ATLAS = ${openblas:location}/lib/libopenblas.so
[numpy]
[numpy]
environment = numpy-env
environment = numpy-env
rpath =
rpath = ${openblas:location}/lib
${openblas:location}/lib
component/pandas/buildout.cfg
View file @
225b80c5
[buildout]
[buildout]
extends =
extends =
../cython/buildout.cfg
../numpy/buildout.cfg
../numpy/buildout.cfg
parts =
parts =
...
@@ -12,4 +13,15 @@ parts =
...
@@ -12,4 +13,15 @@ parts =
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
egg = pandas
egg = pandas
environment = pandas-env
environment = pandas-env
setup-eggs = ${numpy:egg}
setup-eggs =
${numpy:egg}
[pandas:sys.version_info >= (3,8)]
setup-eggs +=
${cython:egg}
[versions]
pandas = 0.25.3
[versions:sys.version_info >= (3,8)]
pandas = 1.4.0
component/scipy/buildout.cfg
View file @
225b80c5
[buildout]
[buildout]
# Scipy requires BLAS/LAPACK libraries.
extends =
extends =
../numpy/openblas.cfg
../numpy/openblas.cfg
../pandas/buildout.cfg
parts =
parts = scipy
scipy
[scipy-env]
[scipy-env]
<= numpy-env
<= numpy-env
...
@@ -14,3 +14,31 @@ egg = scipy
...
@@ -14,3 +14,31 @@ egg = scipy
environment = scipy-env
environment = scipy-env
setup-eggs = ${numpy:egg}
setup-eggs = ${numpy:egg}
rpath = ${numpy:rpath}
rpath = ${numpy:rpath}
depends = ${scipy-pythonpath:recipe}
[scipy-pythonpath]
<= macro.pythonpath.eggs
environment = scipy-env
eggs = ${scipy-setup-eggs:eggs}
[scipy-setup-eggs]
recipe = zc.recipe.egg
eggs =
${cython:egg}
${numpy:egg}
${pandas:egg}
pythran
pybind11
[versions]
pybind11 = 2.9.2
scipy = 1.8.1
beniget = 0.4.1
gast = 0.5.3
pythran = 0.11.0:whl
[scipy:sys.version_info < (3,8)]
depends =
[versions:sys.version_info < (3,8)]
scipy = 1.0.1
stack/erp5/buildout.cfg
View file @
225b80c5
...
@@ -795,7 +795,6 @@ nt-svcutils = 2.13.0
...
@@ -795,7 +795,6 @@ nt-svcutils = 2.13.0
oauth2client = 4.0.0
oauth2client = 4.0.0
oauthlib = 3.1.0
oauthlib = 3.1.0
objgraph = 3.1.0
objgraph = 3.1.0
ply = 3.10
polib = 1.0.8
polib = 1.0.8
pprofile = 2.0.4
pprofile = 2.0.4
pyasn1-modules = 0.0.8
pyasn1-modules = 0.0.8
...
...
stack/slapos.cfg
View file @
225b80c5
...
@@ -201,6 +201,7 @@ pim-dm = 1.4.0nxd001
...
@@ -201,6 +201,7 @@ pim-dm = 1.4.0nxd001
pkgconfig = 1.5.1
pkgconfig = 1.5.1
plone.recipe.command = 1.1
plone.recipe.command = 1.1
pluggy = 0.13.1:whl
pluggy = 0.13.1:whl
ply = 3.11
prettytable = 0.7.2
prettytable = 0.7.2
psutil = 5.8.0
psutil = 5.8.0
py = 1.11.0:whl
py = 1.11.0:whl
...
@@ -215,7 +216,7 @@ pyroute2 = 0.6.9
...
@@ -215,7 +216,7 @@ pyroute2 = 0.6.9
pyrsistent = 0.18.1
pyrsistent = 0.18.1
PyRSS2Gen = 1.1
PyRSS2Gen = 1.1
pytest-runner = 5.2:whl
pytest-runner = 5.2:whl
python-dateutil = 2.
7.3
:whl
python-dateutil = 2.
8.2
:whl
pytz = 2022.2.1
pytz = 2022.2.1
PyYAML = 5.4.1
PyYAML = 5.4.1
regex = 2020.9.27
regex = 2020.9.27
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment