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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos
Commits
66e5ac0b
Commit
66e5ac0b
authored
Dec 04, 2023
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
software/slapos-testing: be able to test with more recent python3
See merge request
nexedi/slapos!1457
parents
422b2773
849fb185
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
66 additions
and
12 deletions
+66
-12
component/cython/buildout.cfg
component/cython/buildout.cfg
+1
-1
component/openblas/buildout.cfg
component/openblas/buildout.cfg
+2
-2
component/scipy/buildout.cfg
component/scipy/buildout.cfg
+1
-0
component/statsmodels/buildout.cfg
component/statsmodels/buildout.cfg
+14
-0
component/statsmodels/statsmodels-add-setup-version.patch
component/statsmodels/statsmodels-add-setup-version.patch
+21
-0
software/slapos-testing/software-py2.cfg
software/slapos-testing/software-py2.cfg
+3
-0
software/slapos-testing/software-py3next.cfg
software/slapos-testing/software-py3next.cfg
+6
-0
software/slapos-testing/software.cfg
software/slapos-testing/software.cfg
+0
-1
stack/slapos.cfg
stack/slapos.cfg
+18
-8
No files found.
component/cython/buildout.cfg
View file @
66e5ac0b
...
@@ -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.
24
cython = 0.29.
36
component/openblas/buildout.cfg
View file @
66e5ac0b
...
@@ -8,8 +8,8 @@ parts =
...
@@ -8,8 +8,8 @@ parts =
[openblas]
[openblas]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
shared = true
shared = true
url = https://github.com/
xianyi/OpenBLAS/archive/v0.3.10
.tar.gz
url = https://github.com/
OpenMathLib/OpenBLAS/releases/download/v0.3.24/OpenBLAS-0.3.24
.tar.gz
md5sum =
4727a1333a380b67c8d7c7787a3d9c9a
md5sum =
23599a30e4ce887590957d94896789c8
build-common-options = NO_STATIC=1 USE_OPENMP=1 USE_THREAD=1 DYNAMIC_ARCH=1
build-common-options = NO_STATIC=1 USE_OPENMP=1 USE_THREAD=1 DYNAMIC_ARCH=1
...
...
component/scipy/buildout.cfg
View file @
66e5ac0b
...
@@ -23,6 +23,7 @@ eggs = ${scipy-setup-eggs:eggs}
...
@@ -23,6 +23,7 @@ eggs = ${scipy-setup-eggs:eggs}
[scipy-setup-eggs]
[scipy-setup-eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
scripts =
eggs =
eggs =
${cython:egg}
${cython:egg}
${numpy:egg}
${numpy:egg}
...
...
component/statsmodels/buildout.cfg
View file @
66e5ac0b
[buildout]
[buildout]
extends =
extends =
../cython/buildout.cfg
../pandas/buildout.cfg
../pandas/buildout.cfg
../scipy/buildout.cfg
../scipy/buildout.cfg
...
@@ -14,5 +15,18 @@ recipe = zc.recipe.egg:custom
...
@@ -14,5 +15,18 @@ recipe = zc.recipe.egg:custom
egg = statsmodels
egg = statsmodels
environment = statsmodels-env
environment = statsmodels-env
setup-eggs =
setup-eggs =
${numpy:egg}
${pandas:egg}
${pandas:egg}
${scipy:egg}
${scipy:egg}
${cython:egg}
setuptools-dso
statsmodels-patches = ${:_profile_base_location_}/statsmodels-add-setup-version.patch#8bb8eac7375e13fa8104a6aa905ef35c
statsmodels-patch-options = -p1
[statsmodels:sys.version_info < (3,10)]
statsmodels-patches =
statsmodels-patch-options =
[statsmodels:python2]
statsmodels-patches =
statsmodels-patch-options =
component/statsmodels/statsmodels-add-setup-version.patch
0 → 100644
View file @
66e5ac0b
add a version to make this package compatible with buildout's easy_install
Fixes this issue:
Installing statsmodels 0.13.5
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.13.5.orig/setup.py 2022-11-02 01:54:20.000000000 +0900
+++ statsmodels-0.13.5/setup.py 2023-10-26 14:12:35.157708043 +0900
@@ -387,6 +387,7 @@
setup(
name=DISTNAME,
+ version='0.13.5',
maintainer=MAINTAINER,
ext_modules=extensions,
maintainer_email=MAINTAINER_EMAIL,
software/slapos-testing/software-py2.cfg
View file @
66e5ac0b
...
@@ -8,3 +8,6 @@ part = python2.7
...
@@ -8,3 +8,6 @@ part = python2.7
[extra-eggs]
[extra-eggs]
eggs +=
eggs +=
${re6stnet-setup:egg}
${re6stnet-setup:egg}
[versions]
pathlib = 1.0.1
software/slapos-testing/software-py3next.cfg
0 → 100644
View file @
66e5ac0b
[buildout]
extends =
software.cfg
[python3]
<= python3.11
software/slapos-testing/software.cfg
View file @
66e5ac0b
...
@@ -276,7 +276,6 @@ httmock = 1.2.6
...
@@ -276,7 +276,6 @@ httmock = 1.2.6
testfixtures = 6.11.0
testfixtures = 6.11.0
pyflakes = 2.0.0
pyflakes = 2.0.0
zope.testing = 4.6.2
zope.testing = 4.6.2
pathlib = 1.0.1
psycopg2 = 2.8.6
psycopg2 = 2.8.6
iniparse = 0.5
iniparse = 0.5
miniupnpc = 1.9
miniupnpc = 1.9
...
...
stack/slapos.cfg
View file @
66e5ac0b
...
@@ -189,11 +189,11 @@ Flask = 3.0.0:whl
...
@@ -189,11 +189,11 @@ Flask = 3.0.0:whl
frozenlist = 1.4.0:whl
frozenlist = 1.4.0:whl
funcsigs = 1.0.2
funcsigs = 1.0.2
functools32 = 3.2.3.post2
functools32 = 3.2.3.post2
gevent = 2
0.9.0
gevent = 2
3.9.1
geventmp = 0.0.1
geventmp = 0.0.1
gitdb = 4.0.10
gitdb = 4.0.10
GitPython = 3.1.30
GitPython = 3.1.30
greenlet =
0.4.17
greenlet =
3.0.1
h11 = 0.14.0
h11 = 0.14.0
h5py = 2.7.1
h5py = 2.7.1
idna = 3.4:whl
idna = 3.4:whl
...
@@ -231,7 +231,7 @@ mistune = 0.8.4
...
@@ -231,7 +231,7 @@ mistune = 0.8.4
mock = 3.0.5
mock = 3.0.5
more-itertools = 5.0.0
more-itertools = 5.0.0
mpmath = 1.0.0
mpmath = 1.0.0
msgpack =
0.6.2
msgpack =
1.0.5
multidict = 6.0.4
multidict = 6.0.4
nbclient = 0.5.1
nbclient = 0.5.1
nbconvert = 6.5.4
nbconvert = 6.5.4
...
@@ -248,7 +248,7 @@ paramiko = 2.11.0
...
@@ -248,7 +248,7 @@ paramiko = 2.11.0
parso = 0.7.1
parso = 0.7.1
passlib = 1.7.4
passlib = 1.7.4
pathlib2 = 2.3.5
pathlib2 = 2.3.5
patsy = 0.5.
1
patsy = 0.5.
3
pbr = 5.9.0
pbr = 5.9.0
pexpect = 4.8.0
pexpect = 4.8.0
pickleshare = 0.7.4
pickleshare = 0.7.4
...
@@ -267,7 +267,7 @@ py = 1.11.0:whl
...
@@ -267,7 +267,7 @@ py = 1.11.0:whl
py-mld = 1.0.3
py-mld = 1.0.3
pyasn1 = 0.4.5
pyasn1 = 0.4.5
pycparser = 2.20
pycparser = 2.20
pycurl = 7.4
3
.0
pycurl = 7.4
5
.0
pydantic = 1.9.1
pydantic = 1.9.1
pygls = 1.1.0:whl
pygls = 1.1.0:whl
Pygments = 2.9.0
Pygments = 2.9.0
...
@@ -294,7 +294,7 @@ scikit-learn = 0.20.4
...
@@ -294,7 +294,7 @@ scikit-learn = 0.20.4
seaborn = 0.7.1
seaborn = 0.7.1
Send2Trash = 1.5.0
Send2Trash = 1.5.0
setproctitle = 1.1.10
setproctitle = 1.1.10
setuptools-dso =
1.7
setuptools-dso =
2.9
sgmllib3k = 1.0.0
sgmllib3k = 1.0.0
simplegeneric = 0.8.1
simplegeneric = 0.8.1
singledispatch = 3.4.0.3
singledispatch = 3.4.0.3
...
@@ -312,7 +312,7 @@ smmap = 5.0.0
...
@@ -312,7 +312,7 @@ smmap = 5.0.0
sniffio = 1.3.0
sniffio = 1.3.0
sortedcontainers = 2.4.0
sortedcontainers = 2.4.0
soupsieve = 1.9.5
soupsieve = 1.9.5
statsmodels = 0.1
1.
1
statsmodels = 0.1
3.5+SlapOSPatched00
1
stevedore = 1.21.0:whl
stevedore = 1.21.0:whl
subprocess32 = 3.5.4
subprocess32 = 3.5.4
supervisor = 4.1.0
supervisor = 4.1.0
...
@@ -328,7 +328,7 @@ typeguard = 3.0.2:whl
...
@@ -328,7 +328,7 @@ typeguard = 3.0.2:whl
typing-extensions = 4.8.0:whl
typing-extensions = 4.8.0:whl
tzlocal = 1.5.1
tzlocal = 1.5.1
unicodecsv = 0.14.1
unicodecsv = 0.14.1
uritemplate =
3.0.0
uritemplate =
4.1.1
urllib3 = 1.26.12
urllib3 = 1.26.12
wcwidth = 0.2.5
wcwidth = 0.2.5
webencodings = 0.5.1
webencodings = 0.5.1
...
@@ -353,6 +353,10 @@ zope.interface = 5.4.0
...
@@ -353,6 +353,10 @@ zope.interface = 5.4.0
zope.testing = 4.7
zope.testing = 4.7
zope.testrunner = 5.2
zope.testrunner = 5.2
[versions:sys.version_info < (3,10)]
# keep old statsmodels by default until slapos.toolbox is updated
statsmodels = 0.11.1
# this is mostly needed for slapos-node
# this is mostly needed for slapos-node
# it can be removed when slapos-node uses current python3
# it can be removed when slapos-node uses current python3
[versions:sys.version_info < (3,8)]
[versions:sys.version_info < (3,8)]
...
@@ -369,15 +373,19 @@ click = 6.7
...
@@ -369,15 +373,19 @@ click = 6.7
distro = 1.6.0
distro = 1.6.0
feedparser = 5.2.1
feedparser = 5.2.1
Flask = 1.1.2
Flask = 1.1.2
gevent = 20.9.0
gitdb2 = 2.0.5
gitdb2 = 2.0.5
GitPython = 2.1.11
GitPython = 2.1.11
greenlet = 0.4.17
idna = 2.9
idna = 2.9
importlib-metadata = 1.7.0:whl
importlib-metadata = 1.7.0:whl
itsdangerous = 0.24
itsdangerous = 0.24
Jinja2 = 2.11.3
Jinja2 = 2.11.3
jsonschema = 3.0.2:whl
jsonschema = 3.0.2:whl
MarkupSafe = 1.0
MarkupSafe = 1.0
msgpack = 0.6.2
packaging = 16.8
packaging = 16.8
pycurl = 7.43.0
pyparsing = 2.2.0
pyparsing = 2.2.0
pyrsistent = 0.16.1
pyrsistent = 0.16.1
requests = 2.27.1
requests = 2.27.1
...
@@ -385,7 +393,9 @@ selectors34 = 1.2
...
@@ -385,7 +393,9 @@ selectors34 = 1.2
slapos.toolbox = 0.128.1
slapos.toolbox = 0.128.1
smmap = 0.9.0
smmap = 0.9.0
smmap2 = 2.0.5
smmap2 = 2.0.5
statsmodels = 0.11.1
traitlets = 4.3.3
traitlets = 4.3.3
uritemplate = 3.0.0
Werkzeug = 1.0.1
Werkzeug = 1.0.1
wheel = 0.35.1:whl
wheel = 0.35.1:whl
zipp = 1.2.0:whl
zipp = 1.2.0:whl
...
...
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