Commit 211a727c authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

Update Release Candidate

parents 8971cdfa 9311f4f6
......@@ -6,4 +6,4 @@ recipe = zc.recipe.egg:custom
egg = cython
[versions]
cython = 0.29.24
cython = 0.29.36
......@@ -14,5 +14,6 @@ md5sum = 2882e3179748cc9f9c23ec593d6adc8d
environment =
M4=${m4:location}/bin/m4
PATH=${bison:location}/bin:${xz-utils:location}/bin:%(PATH)s
# CFLAGS to workaround https://github.com/westes/flex/issues/442
CFLAGS=-g -O2 -D_GNU_SOURCE
# CFLAGS to workaround https://github.com/westes/flex/issues/442
# -fpic is needed to fix compilation on Fedora for slapos-node package
CFLAGS=-g -O2 -D_GNU_SOURCE -fpic
......@@ -8,8 +8,8 @@ parts =
[openblas]
recipe = slapos.recipe.cmmi
shared = true
url = https://github.com/xianyi/OpenBLAS/archive/v0.3.10.tar.gz
md5sum = 4727a1333a380b67c8d7c7787a3d9c9a
url = https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.24/OpenBLAS-0.3.24.tar.gz
md5sum = 23599a30e4ce887590957d94896789c8
build-common-options = NO_STATIC=1 USE_OPENMP=1 USE_THREAD=1 DYNAMIC_ARCH=1
......
......@@ -9,7 +9,6 @@ extends =
../openssl/buildout.cfg
../patch/buildout.cfg
../readline/buildout.cfg
../sed/buildout.cfg
../sqlite3/buildout.cfg
../zlib/buildout.cfg
../file/buildout.cfg
......@@ -51,7 +50,7 @@ patches = ${python2.7-lib-patches:patches}
url =
http://www.python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.xz
pre-configure =
${sed:location}/bin/sed -i -e "s/if 'curses' in ln:/if 'curses' in ln.split(os.sep)[-1]:/" setup.py
sed -i -e "s/if 'curses' in ln:/if 'curses' in ln.split()[0]:/" setup.py
configure-options =
--enable-ipv6
--enable-unicode=ucs4
......
......@@ -10,7 +10,6 @@ extends =
../ncurses/buildout.cfg
../openssl/buildout.cfg
../readline/buildout.cfg
../sed/buildout.cfg
../sqlite3/buildout.cfg
../util-linux/buildout.cfg
../xz-utils/buildout.cfg
......@@ -32,7 +31,7 @@ executable = @@LOCATION@@/bin/${:_buildout_section_name_}
url =
https://www.python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.xz
pre-configure =
${sed:location}/bin/sed -i -e "s/if 'curses' in ln:/if 'curses' in ln.split(os.sep)[-1]:/" setup.py
sed -i -e "s/if 'curses' in ln:/if 'curses' in ln.split()[0]:/" setup.py
configure-options =
--enable-ipv6
--without-ensurepip
......
......@@ -23,6 +23,7 @@ eggs = ${scipy-setup-eggs:eggs}
[scipy-setup-eggs]
recipe = zc.recipe.egg
scripts =
eggs =
${cython:egg}
${numpy:egg}
......
[buildout]
extends =
../cython/buildout.cfg
../pandas/buildout.cfg
../scipy/buildout.cfg
......@@ -14,5 +15,18 @@ recipe = zc.recipe.egg:custom
egg = statsmodels
environment = statsmodels-env
setup-eggs =
${numpy:egg}
${pandas: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 =
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,
......@@ -47,7 +47,9 @@ pre-configure =
# To regenerate yarn.lock, comment the line below
cp yarn.lock %(location)s
# Workaround https://github.com/microsoft/vscode/issues/154048
# Once upstream is fixed:
# This bug is now fixed, but theia pins an old version of
# vscode-uri. Once theia is updated to use a more recent version
# of vscode-uri:
# - remove [vscode-uri] section
# - remove the commands below
# - remove component/tar/buildout.cfg
......
......@@ -19,7 +19,7 @@ md5sum = a27e2cb34e4efe2ed0d4698f505554f0
[yarn.lock]
_update_hash_filename_ = yarn.lock
md5sum = ae0f135e9c32967cc7cbc0a708225b60
md5sum = 09c1f7476afe3ecbf1c38891025336df
[ms-python-disable-jedi-buildout.patch]
_update_hash_filename_ = ms-python-disable-jedi-buildout.patch
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -6,6 +6,9 @@ extends =
../pkgconfig/buildout.cfg
../xz-utils/buildout.cfg
[gcc]
min_version = 8
[util-linux]
recipe = slapos.recipe.cmmi
shared = true
......
[buildout]
extends =
software.cfg
[python3]
<= python3.11
......@@ -18,4 +18,4 @@ md5sum = 06b0acece285ecbc0e746fa267a374b6
[template-default]
filename = instance-default.cfg.jinja.in
md5sum = 3959e9e5e7c9f05cb341520a34ba06c9
md5sum = 164c4610ab20a081b3db26f23566bb7c
......@@ -291,15 +291,13 @@ name = $${:_buildout_section_name_}.py
config-host = $${shellinabox-frontend:hostname}
config-port = $${shellinabox-frontend:port}
## This promise fails in a test suite
## due to ports conflict with the testnode of the test suite
# [shellinabox-frontend-available-promise]
# <= monitor-promise-base
# module = check_url_available
# name = $${:_buildout_section_name_}.py
# config-url = https://$${shellinabox-frontend-config:hostname}:$${shellinabox-frontend-config:port}
# config-username = $${shellinabox-frontend-config:username}
# config-password = $${shellinabox-frontend-config:passwd}
[shellinabox-frontend-available-promise]
<= monitor-promise-base
module = check_url_available
name = $${:_buildout_section_name_}.py
config-url = https://$${shellinabox-frontend-config:hostname}:$${shellinabox-frontend-config:port}
config-username = $${shellinabox-frontend-config:username}
config-password = $${shellinabox-frontend-config:passwd}
[testnode-log-frontend-promise]
<= monitor-promise-base
......
......@@ -8,3 +8,6 @@ part = python2.7
[extra-eggs]
eggs +=
${re6stnet-setup:egg}
[versions]
pathlib = 1.0.1
[buildout]
extends =
software.cfg
[python3]
<= python3.11
......@@ -276,7 +276,6 @@ httmock = 1.2.6
testfixtures = 6.11.0
pyflakes = 2.0.0
zope.testing = 4.6.2
pathlib = 1.0.1
psycopg2 = 2.8.6
iniparse = 0.5
miniupnpc = 1.9
......
......@@ -15,7 +15,7 @@
[instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum = bf611d4551e6c2d4ea5fd22c3ae8ecfd
md5sum = 43b3435b3bc08db42335c03b5b8fe465
[instance]
_update_hash_filename_ = instance.cfg.in
......
......@@ -14,6 +14,7 @@ theia-environment-parts =
theia-parts =
frontend-instance
slapos-standalone-bin-wrapper
promises
parts =
......@@ -629,6 +630,11 @@ hash-files =
hostname = $${slapos-standalone-config:ipv4}
port = $${slapos-standalone-config:port}
[slapos-standalone-bin-wrapper]
recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:bin}/slapos
command-line = $${slapos-standalone-config:base-directory}/bin/slapos
# Slapos Standalone Autoprocessing
# --------------------------------
......
......@@ -67,7 +67,7 @@ class TheiaTestCase(SlapOSInstanceTestCase):
try:
return cls._theia_slapos
except AttributeError:
cls._theia_slapos = slapos = cls.getPath('srv', 'runner', 'bin', 'slapos')
cls._theia_slapos = slapos = cls.getPath('bin', 'slapos')
return slapos
@classmethod
......
......@@ -30,7 +30,7 @@ md5sum = 1b8645835f04081861266436505fd28f
[template-replicated]
filename = template-replicated.cfg.in
md5sum = 52762882e0d631f51d2c9e5f8b31c0b6
md5sum = 67c863b15dbfa937babdbd620f95c1ff
[template-parts]
filename = template-parts.cfg.in
......
......@@ -48,9 +48,6 @@ config-{{ parameter_name }} = {{ dumps(parameter_value) }}
{% for key, value in six.iteritems(monitor_dict) -%}
config-{{ key }} = {{ value }}
{% endfor -%}
{% if sla_parameter_dict == {} -%}
sla-mode = unique_by_network
{% else %}
{% set sla_key_main = "-sla-%s%s-" % (namebase, 0) -%}
{% set sla_key_secondary = "-sla-%s-" % (0) -%}
{% set sla_key_main_length = sla_key_main | length -%}
......@@ -63,10 +60,13 @@ sla-mode = unique_by_network
{% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%}
{% endif -%}
{% endfor -%}
{% if sla_dict == {} %}
sla-mode = unique_by_network
{% else %}
{% for key, value in six.iteritems(sla_dict) -%}
sla-{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}
{% endfor %}
{% endif %}
{% if 'monitor-base-url' in monitor_return and not monitor_parameter_dict.get('set-monitor-url', False) -%}
{% do monitor_url_list.append('${request-' ~ namebase ~ ':connection-monitor-base-url}') -%}
......@@ -100,9 +100,6 @@ config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}
{% for key, value in six.iteritems(monitor_dict) -%}
config-{{ key }} = {{ value }}
{% endfor -%}
{% if sla_parameter_dict == {} -%}
sla-mode = unique_by_network
{% else %}
{% set sla_key_main = "-sla-%s%s-" % (namebase, id) -%}
{% set sla_key_secondary = "-sla-%s-" % (id) -%}
{% set sla_key_main_length = sla_key_main | length -%}
......@@ -115,9 +112,12 @@ sla-mode = unique_by_network
{% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%}
{% endif -%}
{% endfor -%}
{% if sla_dict == {} %}
sla-mode = unique_by_network
{% else %}
{% for key, value in six.iteritems(sla_dict) -%}
sla-{{ key }} = {{ value }}
{% endfor -%}
{% endfor %}
{% endif %}
[publish-connection-information]
......@@ -202,9 +202,6 @@ config-{{ key }} = {{ value }}
{% endfor -%}
return = ssh-key notification-url feeds-url {{ monitor_return }}
shared = false
{% if sla_parameter_dict == {} -%}
sla-mode = unique_by_network
{% else %}
{% set sla_key_main = "-sla-%s%s-" % ("pbs", id) -%}
{% set sla_key_secondary = "-sla-%s-" % (id) -%}
{% set sla_key_main_length = sla_key_main | length -%}
......@@ -217,6 +214,9 @@ sla-mode = unique_by_network
{% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%}
{% endif -%}
{% endfor -%}
{% if sla_dict == {} %}
sla-mode = unique_by_network
{% else %}
{% for key, value in six.iteritems(sla_dict) -%}
sla-{{ key }} = {{ value }}
{% endfor %}
......
......@@ -189,11 +189,11 @@ Flask = 3.0.0:whl
frozenlist = 1.4.0:whl
funcsigs = 1.0.2
functools32 = 3.2.3.post2
gevent = 20.9.0
gevent = 23.9.1
geventmp = 0.0.1
gitdb = 4.0.10
GitPython = 3.1.30
greenlet = 0.4.17
greenlet = 3.0.1
h11 = 0.14.0
h5py = 2.7.1
idna = 3.4:whl
......@@ -231,7 +231,7 @@ mistune = 0.8.4
mock = 3.0.5
more-itertools = 5.0.0
mpmath = 1.0.0
msgpack = 0.6.2
msgpack = 1.0.5
multidict = 6.0.4
nbclient = 0.5.1
nbconvert = 6.5.4
......@@ -248,7 +248,7 @@ paramiko = 2.11.0
parso = 0.7.1
passlib = 1.7.4
pathlib2 = 2.3.5
patsy = 0.5.1
patsy = 0.5.3
pbr = 5.9.0
pexpect = 4.8.0
pickleshare = 0.7.4
......@@ -267,7 +267,7 @@ py = 1.11.0:whl
py-mld = 1.0.3
pyasn1 = 0.4.5
pycparser = 2.20
pycurl = 7.43.0
pycurl = 7.45.0
pydantic = 1.9.1
pygls = 1.1.0:whl
Pygments = 2.9.0
......@@ -294,25 +294,25 @@ scikit-learn = 0.20.4
seaborn = 0.7.1
Send2Trash = 1.5.0
setproctitle = 1.1.10
setuptools-dso = 1.7
setuptools-dso = 2.9
sgmllib3k = 1.0.0
simplegeneric = 0.8.1
singledispatch = 3.4.0.3
six = 1.16.0
slapos.cookbook = 1.0.329
slapos.core = 1.10.6
slapos.core = 1.10.7
slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.25
slapos.rebootstrap = 4.5
slapos.recipe.build = 0.56
slapos.recipe.cmmi = 0.19
slapos.recipe.template = 5.1
slapos.toolbox = 0.139
slapos.toolbox = 0.140
smmap = 5.0.0
sniffio = 1.3.0
sortedcontainers = 2.4.0
soupsieve = 1.9.5
statsmodels = 0.11.1
statsmodels = 0.13.5+SlapOSPatched001
stevedore = 1.21.0:whl
subprocess32 = 3.5.4
supervisor = 4.1.0
......@@ -328,7 +328,7 @@ typeguard = 3.0.2:whl
typing-extensions = 4.8.0:whl
tzlocal = 1.5.1
unicodecsv = 0.14.1
uritemplate = 3.0.0
uritemplate = 4.1.1
urllib3 = 1.26.12
wcwidth = 0.2.5
webencodings = 0.5.1
......@@ -353,10 +353,16 @@ zope.interface = 5.4.0
zope.testing = 4.7
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
# it can be removed when slapos-node uses current python3
[versions:sys.version_info < (3,8)]
Flask = 1.1.2
itsdangerous = 0.24
Jinja2 = 2.11.3
MarkupSafe = 2.0.1
typing-extensions = 4.7.1:whl
Werkzeug = 2.0.2
......@@ -369,15 +375,19 @@ click = 6.7
distro = 1.6.0
feedparser = 5.2.1
Flask = 1.1.2
gevent = 20.9.0
gitdb2 = 2.0.5
GitPython = 2.1.11
greenlet = 0.4.17
idna = 2.9
importlib-metadata = 1.7.0:whl
itsdangerous = 0.24
Jinja2 = 2.11.3
jsonschema = 3.0.2:whl
MarkupSafe = 1.0
msgpack = 0.6.2
packaging = 16.8
pycurl = 7.43.0
pyparsing = 2.2.0
pyrsistent = 0.16.1
requests = 2.27.1
......@@ -385,7 +395,9 @@ selectors34 = 1.2
slapos.toolbox = 0.128.1
smmap = 0.9.0
smmap2 = 2.0.5
statsmodels = 0.11.1
traitlets = 4.3.3
uritemplate = 3.0.0
Werkzeug = 1.0.1
wheel = 0.35.1:whl
zipp = 1.2.0:whl
......
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