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
Boxiang Sun
slapos
Commits
698a49d7
Commit
698a49d7
authored
Dec 12, 2024
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/pandas,numpy,scipy,statsmodel: version up
Co-authored-by:
Boxiang Sun
<
boxiang.sun@nexedi.com
>
parent
ab1a5a25
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
45 additions
and
18 deletions
+45
-18
component/cython/buildout.cfg
component/cython/buildout.cfg
+2
-1
component/numpy/buildout.cfg
component/numpy/buildout.cfg
+18
-2
component/pandas/buildout.cfg
component/pandas/buildout.cfg
+5
-1
component/scipy/buildout.cfg
component/scipy/buildout.cfg
+1
-5
component/statsmodels/buildout.cfg
component/statsmodels/buildout.cfg
+2
-1
component/statsmodels/statsmodels-add-setup-version.patch
component/statsmodels/statsmodels-add-setup-version.patch
+6
-6
stack/slapos.cfg
stack/slapos.cfg
+11
-2
No files found.
component/cython/buildout.cfg
View file @
698a49d7
...
...
@@ -2,5 +2,6 @@
parts = cython
[cython]
recipe = zc.recipe.egg
:custom
recipe = zc.recipe.egg
egg = cython
scripts = cython cythonize
component/numpy/buildout.cfg
View file @
698a49d7
[buildout]
extends =
../cython/buildout.cfg
../meson/buildout.cfg
../ninja/buildout.cfg
../macros/macro.pythonpath.eggs.cfg
../openblas/buildout.cfg
../pkgconfig/buildout.cfg
parts = numpy
[numpy-env]
BLAS=None
LAPACK=None
ATLAS=None
PATH=${ninja:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:${meson:location}/bin:%(PATH)s
PKG_CONFIG_PATH = ${openblas:location}/lib/pkgconfig
[numpy]
recipe = zc.recipe.egg:custom
...
...
@@ -15,13 +21,23 @@ egg = numpy
environment = numpy-env
depends = ${numpy-pythonpath:recipe}
[numpy-eggs]
recipe = zc.recipe.egg
eggs =
packaging
pyproject_metadata
meson-python
[numpy-pythonpath]
<= macro.pythonpath.eggs
environment = numpy-env
eggs = ${cython:egg}
eggs =
${cython:egg}
setuptools
${numpy-eggs:eggs}
[versions]
numpy = 1.2
4
.4
numpy = 1.2
6
.4
[numpy:sys.version_info < (3,8)]
depends =
...
...
component/pandas/buildout.cfg
View file @
698a49d7
...
...
@@ -16,9 +16,13 @@ environment = pandas-env
setup-eggs =
${numpy:egg}
${cython:egg}
meson-python
pythran
pybind11
versioneer
[versions]
pandas =
1.4.0
pandas =
2.2.3
[pandas:sys.version_info < (3,8)]
setup-eggs =
...
...
component/scipy/buildout.cfg
View file @
698a49d7
...
...
@@ -40,7 +40,6 @@ depends = ${scipy-setup-eggs:recipe}
[scipy-setup-eggs]
recipe = zc.recipe.egg
scripts =
cython
pythran
eggs =
${cython:egg}
...
...
@@ -53,12 +52,9 @@ eggs =
[versions]
pybind11 = 2.11.1
scipy = 1.12.0
meson-python = 0.13.2:whl
pyproject-metadata = 0.8.0:whl
meson = 1.4.1
beniget = 0.4.1
gast = 0.5.3
pythran = 0.16.0:whl
[versions:sys.version_info < (3,11)]
tomli = 2.0.1:whl
...
...
component/statsmodels/buildout.cfg
View file @
698a49d7
...
...
@@ -20,7 +20,8 @@ setup-eggs =
${scipy:egg}
${cython:egg}
setuptools-dso
statsmodels-patches = ${:_profile_base_location_}/statsmodels-add-setup-version.patch#8bb8eac7375e13fa8104a6aa905ef35c
packaging
statsmodels-patches = ${:_profile_base_location_}/statsmodels-add-setup-version.patch#226a03ae31d060583fa21d425e6a81b6
statsmodels-patch-options = -p1
[statsmodels:sys.version_info < (3,10)]
...
...
component/statsmodels/statsmodels-add-setup-version.patch
View file @
698a49d7
...
...
@@ -2,20 +2,20 @@ add a version to make this package compatible with buildout's easy_install
Fixes this issue:
Installing statsmodels 0.1
3.5
Installing statsmodels 0.1
4.4
Caused installation of a distribution:
statsmodels 0.0.0
with a different version.
diff
'--color=auto' -ru statsmodels-0.13.5.orig/setup.py statsmodels-0.13.5
/setup.py
--- statsmodels-0.1
3.5.orig/setup.py 2022-11-02 01:54:20.000000000 +09
00
+++ statsmodels-0.1
3.5/setup.py 2023-10-26 14:12:35.157708043 +09
00
@@ -3
87,6 +387
,7 @@
diff
-ruN statsmodels-0.14.4.orig/setup.py statsmodels-0.14.4
/setup.py
--- statsmodels-0.1
4.4.orig/setup.py 2025-01-24 09:27:54.995143777 +01
00
+++ statsmodels-0.1
4.4/setup.py 2025-01-24 09:29:14.175103580 +01
00
@@ -3
49,6 +349
,7 @@
setup(
name=DISTNAME,
+ version='0.1
3.5
',
+ version='0.1
4.4
',
maintainer=MAINTAINER,
ext_modules=extensions,
maintainer_email=MAINTAINER_EMAIL,
stack/slapos.cfg
View file @
698a49d7
...
...
@@ -276,6 +276,8 @@ MarkupSafe = 2.1.3
matplotlib = 2.1.2
matplotlib-inline = 0.1.6:whl
meld3 = 1.0.2
meson = 1.7.0
meson-python = 0.17.1:whl
miniupnpc = 2.2.8
mistune = 0.8.4
mock = 3.0.5
...
...
@@ -301,7 +303,7 @@ parso = 0.7.1
passlib = 1.7.4
pathlib2 = 2.3.5
pathspec = 0.12.1:whl
patsy = 0.5.
3
patsy = 0.5.
6
pbr = 5.9.0
pexpect = 4.8.0
pickleshare = 0.7.4
...
...
@@ -332,6 +334,7 @@ Pygments = 2.9.0
PyNaCl = 1.3.0
pyOpenSSL = 19.1.0
pyparsing = 3.1.1:whl
pyproject-metadata = 0.8.0:whl
pyroute2 = 0.6.9
pyrsistent = 0.18.1
PyRSS2Gen = 1.1
...
...
@@ -339,6 +342,7 @@ PySocks = 1.7.1
pytest-runner = 5.2:whl
python-dateutil = 2.8.2:whl
python-json-logger = 2.0.7
pythran = 0.16.0:whl
pytz = 2022.2.1
PyYAML = 6.0.2
pyzmq = 24.0.1
...
...
@@ -375,7 +379,7 @@ sniffio = 1.3.0
sortedcontainers = 2.4.0
soupsieve = 1.9.5
stack-data = 0.6.3:whl
statsmodels = 0.1
3.5
+SlapOSPatched001
statsmodels = 0.1
4.4
+SlapOSPatched001
stevedore = 1.21.0:whl
subprocess32 = 3.5.4
supervisor = 4.1.0
...
...
@@ -394,12 +398,14 @@ Twisted = 22.4.0:whl
txaio = 23.1.1
typeguard = 3.0.2:whl
typing-extensions = 4.8.0:whl
tzdata = 2025.1
tzlocal = 1.5.1
unicodecsv = 0.14.1
unshare = 0.22
uri-template = 1.2.0
uritemplate = 4.1.1
urllib3 = 1.26.12
versioneer = 0.29
wcwidth = 0.2.5
webcolors = 1.12
webencodings = 0.5.1
...
...
@@ -425,6 +431,9 @@ zope.interface = 7.1.1
zope.testing = 5.0.1
zope.testrunner = 6.6
[versions:sys.version_info < (3,11)]
versioneer = 0.24
[versions:sys.version_info < (3,10)]
# keep old statsmodels by default until slapos.toolbox is updated
# this statsmodels need an old cython
...
...
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