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
Labels
Merge Requests
103
Merge Requests
103
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
636f1628
Commit
636f1628
authored
Apr 09, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! ERP5 py3: WIP ( all changes squashed )
parent
238213ef
Pipeline
#33949
failed with stage
in 0 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
36 deletions
+32
-36
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+30
-35
stack/erp5/zope-versions.cfg
stack/erp5/zope-versions.cfg
+2
-1
No files found.
stack/erp5/buildout.cfg
View file @
636f1628
...
@@ -682,13 +682,6 @@ extra-paths =
...
@@ -682,13 +682,6 @@ extra-paths =
patch-binary = ${patch:location}/bin/patch
patch-binary = ${patch:location}/bin/patch
Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic-4.7.patch#85b0090e216cead0fc86c5c274450d96
Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic-4.7.patch#85b0090e216cead0fc86c5c274450d96
Acquisition-patch-options = -p1
Acquisition-patch-options = -p1
# TODO: py3 we can update and drop patches
DateTime-patches =
${:_profile_base_location_}/../../component/egg-patch/DateTime/0001-Cast-int-to-float-in-compare-methods.patch#9898a58ce90dd31c884a7183aeec4361
${:_profile_base_location_}/../../component/egg-patch/DateTime/0002-Fix-compare-methods-between-DateTime-0-and-None-fix-.patch#733903a564c8b14df65c45c4f2eec262
${:_profile_base_location_}/../../component/egg-patch/DateTime/0003-Make-it-possible-to-pickle-datetimes-returned-by-asd.patch#e94a71ef40de130720e621e296537000
${:_profile_base_location_}/../../component/egg-patch/DateTime/0004-Repair-equality-comparison-between-DateTime-instance.patch#ea146c00dfbc31c7d96af8abc6f0b301
DateTime-patch-options = -p1
Products.BTreeFolder2-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.BTreeFolder2/0001-Add-a-confirmation-prompt-on-Delete-All-Objects-butt.patch#44de3abf382e287b8766c2f29ec1cf74
Products.BTreeFolder2-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.BTreeFolder2/0001-Add-a-confirmation-prompt-on-Delete-All-Objects-butt.patch#44de3abf382e287b8766c2f29ec1cf74
Products.BTreeFolder2-patch-options = -p1
Products.BTreeFolder2-patch-options = -p1
Products.CMFCore-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.CMFCore/portal_skins_ZMI_find.patch#19ec05c0477c50927ee1df6eb75d1e7f
Products.CMFCore-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.CMFCore/portal_skins_ZMI_find.patch#19ec05c0477c50927ee1df6eb75d1e7f
...
@@ -718,6 +711,12 @@ Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-pa
...
@@ -718,6 +711,12 @@ Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-pa
Products.DCWorkflow-patch-options = -p1
Products.DCWorkflow-patch-options = -p1
[eggs:python2]
[eggs:python2]
DateTime-patches =
${:_profile_base_location_}/../../component/egg-patch/DateTime/0001-Cast-int-to-float-in-compare-methods.patch#9898a58ce90dd31c884a7183aeec4361
${:_profile_base_location_}/../../component/egg-patch/DateTime/0002-Fix-compare-methods-between-DateTime-0-and-None-fix-.patch#733903a564c8b14df65c45c4f2eec262
${:_profile_base_location_}/../../component/egg-patch/DateTime/0003-Make-it-possible-to-pickle-datetimes-returned-by-asd.patch#e94a71ef40de130720e621e296537000
${:_profile_base_location_}/../../component/egg-patch/DateTime/0004-Repair-equality-comparison-between-DateTime-instance.patch#ea146c00dfbc31c7d96af8abc6f0b301
DateTime-patch-options = -p1
Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method-2.4.1.patch#ec7bb56a9f1d37fcbf960cd1e96e6e6d
Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method-2.4.1.patch#ec7bb56a9f1d37fcbf960cd1e96e6e6d
Products.DCWorkflow-patch-options = -p1
Products.DCWorkflow-patch-options = -p1
RestrictedPython-patches = ${:_profile_base_location_}/../../component/egg-patch/RestrictedPython/0001-compile-implicitly-enable-__future__.print_function-.patch#f746dccbf3b462e67386490b898512e4
RestrictedPython-patches = ${:_profile_base_location_}/../../component/egg-patch/RestrictedPython/0001-compile-implicitly-enable-__future__.print_function-.patch#f746dccbf3b462e67386490b898512e4
...
@@ -789,7 +788,6 @@ depends =
...
@@ -789,7 +788,6 @@ depends =
AccessControl = 6.3+SlapOSPatched001
AccessControl = 6.3+SlapOSPatched001
# TODO: update Acquisition ( 5.1 on py3 4.13 on py2 )
# TODO: update Acquisition ( 5.1 on py3 4.13 on py2 )
Acquisition = 4.7+SlapOSPatched001
Acquisition = 4.7+SlapOSPatched001
DateTime = 4.9+SlapOSPatched004
PyPDF2 = 1.26.0+SlapOSPatched002
PyPDF2 = 1.26.0+SlapOSPatched002
pysvn = 1.9.15+SlapOSPatched001
pysvn = 1.9.15+SlapOSPatched001
python-magic = 0.4.12+SlapOSPatched001
python-magic = 0.4.12+SlapOSPatched001
...
@@ -800,11 +798,13 @@ Zope = 5.9+SlapOSPatched003
...
@@ -800,11 +798,13 @@ Zope = 5.9+SlapOSPatched003
alabaster = 0.7.12
alabaster = 0.7.12
APacheDEX = 2.0
APacheDEX = 2.0
arrow = 1.2.3
arrow = 1.2.3
astroid = 3.1.0:whl
Beaker = 1.11.0
Beaker = 1.11.0
cloudpickle = 0.5.3
cloudpickle = 0.5.3
cookies = 2.2.1
cookies = 2.2.1
dask = 0.18.1
dask = 0.18.1
deepdiff = 6.7.1
deepdiff = 6.7.1
dill = 0.3.8:whl
docutils = 0.17.1
docutils = 0.17.1
erp5-coverage-plugin = 0.0.1
erp5-coverage-plugin = 0.0.1
erp5diff = 0.8.1.9
erp5diff = 0.8.1.9
...
@@ -813,19 +813,27 @@ five.formlib = 1.0.4
...
@@ -813,19 +813,27 @@ five.formlib = 1.0.4
five.localsitemanager = 4.0
five.localsitemanager = 4.0
fpconst = 0.7.2
fpconst = 0.7.2
fqdn = 1.5.1
fqdn = 1.5.1
google-api-core = 2.17.1
google-api-python-client = 2.118.0
google-api-python-client = 2.118.0
google-auth = 2.28.1
google-auth-httplib2 = 0.2.0
googleapis-common-protos = 1.62.0
graphviz = 0.5.2
graphviz = 0.5.2
haufe.requestmonitoring = 0.6.0
haufe.requestmonitoring = 0.6.0
html5lib = 1.1
html5lib = 1.1
huBarcode = 1.0.0
huBarcode = 1.0.0
imageio = 2.34.0
interval = 1.0.0+SlapOSPatched001
interval = 1.0.0+SlapOSPatched001
ipdb = 0.10.2
ipdb = 0.10.2
isoduration = 20.11.0
isoduration = 20.11.0
isort = 5.13.2
jdcal = 1.3
jdcal = 1.3
jsonpickle = 0.9.6
jsonpickle = 0.9.6
jsonpointer = 2.2
jsonpointer = 2.2
lazy-object-proxy = 1.10.0
logilab-common = 1.3.0
logilab-common = 1.3.0
Mako = 1.1.4
Mako = 1.1.4
mccabe = 0.7.0:whl
mechanize = 0.4.8
mechanize = 0.4.8
Missing = 5.0.0
Missing = 5.0.0
mock = 4.0.3
mock = 4.0.3
...
@@ -840,6 +848,7 @@ oic = 1.6.1
...
@@ -840,6 +848,7 @@ oic = 1.6.1
olefile = 0.44
olefile = 0.44
ordered-set = 4.1.0
ordered-set = 4.1.0
Pillow = 10.2.0+SlapOSPatched001
Pillow = 10.2.0+SlapOSPatched001
platformdirs = 4.2.0:whl
polib = 1.2.0
polib = 1.2.0
pprofile = 2.0.4
pprofile = 2.0.4
Products.BTreeFolder2 = 4.4+SlapOSPatched001
Products.BTreeFolder2 = 4.4+SlapOSPatched001
...
@@ -858,20 +867,25 @@ Products.StandardCacheManagers = 5.0
...
@@ -858,20 +867,25 @@ Products.StandardCacheManagers = 5.0
Products.ZCatalog = 7.0
Products.ZCatalog = 7.0
Products.ZODBMountPoint = 2.0
Products.ZODBMountPoint = 2.0
Products.ZSQLMethods = 4.1
Products.ZSQLMethods = 4.1
protobuf = 4.25.3
pyasn1-modules = 0.3
pyasn1-modules = 0.3
pycountry = 17.1.8
pycountry = 17.1.8
pycryptodomex = 3.10.1
pycryptodomex = 3.10.1
pydantic-settings = 2.2.1:whl
pydot = 1.4.2
pydot = 1.4.2
pyflakes = 1.5.0
pyflakes = 1.5.0
pyjwkest = 1.4.2
pyjwkest = 1.4.2
pylint = 3.1.0:whl
Pympler = 1.0.1
Pympler = 1.0.1
pyPdf = 1.13
pyPdf = 1.13
PyStemmer = 2.2.0.1
PyStemmer = 2.2.0.1
pytesseract = 0.2.2
pytesseract = 0.2.2
python-dotenv = 1.0.1
python-gettext = 4.1
python-gettext = 4.1
python-ldap = 3.4.4
python-ldap = 3.4.4
python-libmilter = 1.0.3
python-libmilter = 1.0.3
python-memcached = 1.58
python-memcached = 1.58
pythran = 0.15.0:whl
PyWavelets = 1.4.0
PyWavelets = 1.4.0
qrcode = 5.3
qrcode = 5.3
Record = 4.1.0
Record = 4.1.0
...
@@ -880,13 +894,17 @@ rfc3339-validator = 0.1.4
...
@@ -880,13 +894,17 @@ rfc3339-validator = 0.1.4
rfc3987 = 1.3.8
rfc3987 = 1.3.8
rsa = 3.4.2
rsa = 3.4.2
scikit-image = 0.19.3
scikit-image = 0.19.3
pythran = 0.15.0:whl
SOAPpy-py3 = 0.52.26+SlapOSPatched001
SOAPpy-py3 = 0.52.26+SlapOSPatched001
spyne = 2.14.0
spyne = 2.14.0
strict-rfc3339 = 0.7
strict-rfc3339 = 0.7
StructuredText = 2.11.1
StructuredText = 2.11.1
suds = 0.4
suds = 0.4
suds-py3 = 1.4.5.0
tifffile = 2024.2.12
tomli = 2.0.1:whl
tomlkit = 0.12.4:whl
toolz = 0.9.0
toolz = 0.9.0
typed-ast = 1.5.5
typing = 3.10.0.0
typing = 3.10.0.0
unidiff = 0.5.5
unidiff = 0.5.5
uri-template = 1.2.0
uri-template = 1.2.0
...
@@ -894,8 +912,10 @@ urlnorm = 1.1.4+SlapOSPatched001
...
@@ -894,8 +912,10 @@ urlnorm = 1.1.4+SlapOSPatched001
uuid = 1.30
uuid = 1.30
validictory = 1.1.0
validictory = 1.1.0
webcolors = 1.12
webcolors = 1.12
wrapt = 1.16.0
WSGIProxy2 = 0.4.6
WSGIProxy2 = 0.4.6
WSGIUtils = 0.7
WSGIUtils = 0.7
wstools-py3 = 0.54.4
xfw = 0.10
xfw = 0.10
xupdate-processor = 0.5
xupdate-processor = 0.5
yapf = 0.28.0
yapf = 0.28.0
...
@@ -916,29 +936,6 @@ zope.sendmail = 6.1
...
@@ -916,29 +936,6 @@ zope.sendmail = 6.1
zope.session = 4.5
zope.session = 4.5
zope.testbrowser = 5.5.1
zope.testbrowser = 5.5.1
suds-py3 = 1.4.5.0
google-api-core = 2.17.1
google-auth-httplib2 = 0.2.0
google-auth = 2.28.1
pylint = 3.1.0:whl
mccabe = 0.7.0:whl
tomli = 2.0.1:whl
lazy-object-proxy = 1.10.0
isort = 5.13.2
astroid = 3.1.0:whl
wrapt = 1.16.0
typed-ast = 1.5.5
tomlkit = 0.12.4:whl
platformdirs = 4.2.0:whl
dill = 0.3.8:whl
tifffile = 2024.2.12
imageio = 2.34.0
wstools-py3 = 0.54.4
protobuf = 4.25.3
googleapis-common-protos = 1.62.0
pydantic-settings = 2.2.1:whl
python-dotenv = 1.0.1
[versions:python2]
[versions:python2]
AccessControl = 4.4
AccessControl = 4.4
...
@@ -947,7 +944,7 @@ APacheDEX = 1.8
...
@@ -947,7 +944,7 @@ APacheDEX = 1.8
astroid = 1.3.8+SlapOSPatched002
astroid = 1.3.8+SlapOSPatched002
AuthEncoding = 4.3
AuthEncoding = 4.3
Chameleon = 3.9.1
Chameleon = 3.9.1
DateTime = 4.9
DateTime = 4.9
+SlapOSPatched004
deepdiff = 3.3.0
deepdiff = 3.3.0
DocumentTemplate = 3.4
DocumentTemplate = 3.4
ExtensionClass = 4.9
ExtensionClass = 4.9
...
@@ -971,7 +968,6 @@ Paste = 3.5.2
...
@@ -971,7 +968,6 @@ Paste = 3.5.2
PasteDeploy = 2.1.1
PasteDeploy = 2.1.1
pbr = 5.11.0
pbr = 5.11.0
Persistence = 3.6
Persistence = 3.6
persistent = 4.9.3
Pillow = 6.2.2
Pillow = 6.2.2
Products.BTreeFolder2 = 4.4
Products.BTreeFolder2 = 4.4
Products.DCWorkflow = 2.4.1+SlapOSPatched001
Products.DCWorkflow = 2.4.1+SlapOSPatched001
...
@@ -1013,7 +1009,6 @@ WebTest = 2.0.35
...
@@ -1013,7 +1009,6 @@ WebTest = 2.0.35
WSGIProxy2 = 0.4.6
WSGIProxy2 = 0.4.6
z3c.pt = 3.3.1
z3c.pt = 3.3.1
zc.lockfile = 2.0
zc.lockfile = 2.0
ZConfig = 3.6.1
zdaemon = 4.4
zdaemon = 4.4
zExceptions = 4.3
zExceptions = 4.3
Zope = 4.8.9+SlapOSPatched002
Zope = 4.8.9+SlapOSPatched002
...
...
stack/erp5/zope-versions.cfg
View file @
636f1628
...
@@ -9,7 +9,8 @@ Acquisition = 5.1
...
@@ -9,7 +9,8 @@ Acquisition = 5.1
AuthEncoding = 5.0
AuthEncoding = 5.0
BTrees = 5.1
BTrees = 5.1
Chameleon = 4.2.0
Chameleon = 4.2.0
DateTime = 5.3
; DateTime = 5.3
DateTime = 5.5
DocumentTemplate = 4.6
DocumentTemplate = 4.6
ExtensionClass = 5.1
ExtensionClass = 5.1
MultiMapping = 5.0
MultiMapping = 5.0
...
...
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