Commit fa7200f1 authored by Arnaud Fontaine's avatar Arnaud Fontaine

Minimize diff with master branch.

parent c9ef610c
from __future__ import print_function from __future__ import print_function
import os import os
import subprocess import subprocess
import time import time
......
...@@ -62,7 +62,6 @@ extends = ...@@ -62,7 +62,6 @@ extends =
../../software/neoppod/software-zodb5.cfg ../../software/neoppod/software-zodb5.cfg
# keep neoppod extends last # keep neoppod extends last
parts += parts +=
erp5-util-develop erp5-util-develop
slapos-cookbook slapos-cookbook
...@@ -506,6 +505,7 @@ eggs = ${neoppod:eggs} ...@@ -506,6 +505,7 @@ eggs = ${neoppod:eggs}
typing typing
pytracemalloc pytracemalloc
xlrd xlrd
# Zope # Zope
${zope.security:egg} ${zope.security:egg}
${zope.container:egg} ${zope.container:egg}
...@@ -525,30 +525,41 @@ eggs = ${neoppod:eggs} ...@@ -525,30 +525,41 @@ eggs = ${neoppod:eggs}
${Products.DCWorkflow:egg} ${Products.DCWorkflow:egg}
${Products.GenericSetup:egg} ${Products.GenericSetup:egg}
five.localsitemanager five.localsitemanager
# Other products # Other products
Products.DCWorkflowGraph Products.DCWorkflowGraph
Products.MimetypesRegistry Products.MimetypesRegistry
Products.ExternalEditor Products.ExternalEditor
Products.TIDStorage Products.TIDStorage
Products.LongRequestLogger Products.LongRequestLogger
# BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF # BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF
# (for tests like testCookieCrumbler). # (for tests like testCookieCrumbler).
zope.app.testing zope.app.testing
# Currently forked in our repository # Currently forked in our repository
# Products.PortalTransforms # Products.PortalTransforms
# Dependency for our fork of PortalTransforms # Dependency for our fork of PortalTransforms
StructuredText StructuredText
# Needed for parsing .po files from our Localizer subset # Needed for parsing .po files from our Localizer subset
polib polib
# Needed for Google OAuth # Needed for Google OAuth
google-api-python-client google-api-python-client
# Need for Facebook OAuth # Need for Facebook OAuth
facebook-sdk facebook-sdk
# Used by ERP5 Jupyter backend
# ipykernel
# Used by DiffTool # Used by DiffTool
xmltodict xmltodict
deepdiff deepdiff
unidiff unidiff
jsonpickle jsonpickle
# WSGI server # WSGI server
zope.globalrequest zope.globalrequest
waitress waitress
......
...@@ -81,7 +81,6 @@ trusted-proxy 0.0.0.0 ...@@ -81,7 +81,6 @@ trusted-proxy 0.0.0.0
{% endif %} {% endif %}
{% endif -%} {% endif -%}
{% set sql_connection_string = parameter_dict.get('sql-connection-string') -%} {% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}
{% if sql_connection_string -%} {% if sql_connection_string -%}
{% set bt5_repository_url = [] -%} {% set bt5_repository_url = [] -%}
......
...@@ -25,7 +25,6 @@ depends = ${slapos-toolbox-dependencies:eggs} ...@@ -25,7 +25,6 @@ depends = ${slapos-toolbox-dependencies:eggs}
[slapos.cookbook-repository] [slapos.cookbook-repository]
develop = true develop = true
branch = zope4
# Used for resiliency tests only # Used for resiliency tests only
[erp5.util-repository] [erp5.util-repository]
......
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