From 560f0ea0e3813c6c61a9498ec6a3e7ac602de75a Mon Sep 17 00:00:00 2001 From: Ramiro Batista da Luz Date: Wed, 22 Apr 2020 22:20:22 -0300 Subject: [PATCH 1/2] Atualiza plone e cover. --- bootstrap.py | 307 ++++++++++++++++------------------------ buildout.d/base.cfg | 20 ++- buildout.d/sources.cfg | 2 - buildout.d/versions.cfg | 133 +++++++++++------ checkouts.cfg | 4 +- development.cfg | 4 - 6 files changed, 229 insertions(+), 241 deletions(-) diff --git a/bootstrap.py b/bootstrap.py index 1cce2ce..1f59b21 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -18,75 +18,17 @@ use the -c option to specify an alternate configuration file. """ -import os, shutil, sys, tempfile, urllib, urllib2, subprocess +import os +import shutil +import sys +import tempfile + from optparse import OptionParser -if sys.platform == 'win32': - def quote(c): - if ' ' in c: - return '"%s"' % c # work around spawn lamosity on windows - else: - return c -else: - quote = str - -# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments. -stdout, stderr = subprocess.Popen( - [sys.executable, '-Sc', - 'try:\n' - ' import ConfigParser\n' - 'except ImportError:\n' - ' print 1\n' - 'else:\n' - ' print 0\n'], - stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate() -has_broken_dash_S = bool(int(stdout.strip())) - -# In order to be more robust in the face of system Pythons, we want to -# run without site-packages loaded. This is somewhat tricky, in -# particular because Python 2.6's distutils imports site, so starting -# with the -S flag is not sufficient. However, we'll start with that: -if not has_broken_dash_S and 'site' in sys.modules: - # We will restart with python -S. - args = sys.argv[:] - args[0:0] = [sys.executable, '-S'] - args = map(quote, args) - os.execv(sys.executable, args) -# Now we are running with -S. We'll get the clean sys.path, import site -# because distutils will do it later, and then reset the path and clean -# out any namespace packages from site-packages that might have been -# loaded by .pth files. -clean_path = sys.path[:] -import site # imported because of its side effects -sys.path[:] = clean_path -for k, v in sys.modules.items(): - if k in ('setuptools', 'pkg_resources') or ( - hasattr(v, '__path__') and - len(v.__path__) == 1 and - not os.path.exists(os.path.join(v.__path__[0], '__init__.py'))): - # This is a namespace package. Remove it. - sys.modules.pop(k) - -is_jython = sys.platform.startswith('java') - -setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py' -distribute_source = 'http://python-distribute.org/distribute_setup.py' - - -# parsing arguments -def normalize_to_url(option, opt_str, value, parser): - if value: - if '://' not in value: # It doesn't smell like a URL. - value = 'file://%s' % ( - urllib.pathname2url( - os.path.abspath(os.path.expanduser(value))),) - if opt_str == '--download-base' and not value.endswith('/'): - # Download base needs a trailing slash to make the world happy. - value += '/' - else: - value = None - name = opt_str[2:].replace('-', '_') - setattr(parser.values, name, value) +__version__ = '2015-07-01' +# See zc.buildout's changelog if this version is up to date. + +tmpeggs = tempfile.mkdtemp(prefix='bootstrap-') usage = '''\ [DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] @@ -96,129 +38,134 @@ def normalize_to_url(option, opt_str, value, parser): Simply run this script in a directory containing a buildout.cfg, using the Python that you want bin/buildout to use. -Note that by using --setup-source and --download-base to point to -local resources, you can keep this script from going over the network. +Note that by using --find-links to point to local resources, you can keep +this script from going over the network. ''' parser = OptionParser(usage=usage) -parser.add_option("-v", "--version", dest="version", - help="use a specific zc.buildout version") -parser.add_option("-d", "--distribute", - action="store_true", dest="use_distribute", default=False, - help="Use Distribute rather than Setuptools.") -parser.add_option("--setup-source", action="callback", dest="setup_source", - callback=normalize_to_url, nargs=1, type="string", - help=("Specify a URL or file location for the setup file. " - "If you use Setuptools, this will default to " + - setuptools_source + "; if you use Distribute, this " - "will default to " + distribute_source + ".")) -parser.add_option("--download-base", action="callback", dest="download_base", - callback=normalize_to_url, nargs=1, type="string", - help=("Specify a URL or directory for downloading " - "zc.buildout and either Setuptools or Distribute. " - "Defaults to PyPI.")) -parser.add_option("--eggs", - help=("Specify a directory for storing eggs. Defaults to " - "a temporary directory that is deleted when the " - "bootstrap script completes.")) +parser.add_option("--version", + action="store_true", default=False, + help=("Return bootstrap.py version.")) parser.add_option("-t", "--accept-buildout-test-releases", dest='accept_buildout_test_releases', action="store_true", default=False, - help=("Normally, if you do not specify a --version, the " - "bootstrap script and buildout gets the newest " + help=("Normally, if you do not specify a --buildout-version, " + "the bootstrap script and buildout gets the newest " "*final* versions of zc.buildout and its recipes and " "extensions for you. If you use this flag, " "bootstrap and buildout will get the newest releases " "even if they are alphas or betas.")) -parser.add_option("-c", None, action="store", dest="config_file", - help=("Specify the path to the buildout configuration " - "file to be used.")) +parser.add_option("-c", "--config-file", + help=("Specify the path to the buildout configuration " + "file to be used.")) +parser.add_option("-f", "--find-links", + help=("Specify a URL to search for buildout releases")) +parser.add_option("--allow-site-packages", + action="store_true", default=False, + help=("Let bootstrap.py use existing site packages")) +parser.add_option("--buildout-version", + help="Use a specific zc.buildout version") +parser.add_option("--setuptools-version", + help="Use a specific setuptools version") +parser.add_option("--setuptools-to-dir", + help=("Allow for re-use of existing directory of " + "setuptools versions")) options, args = parser.parse_args() +if options.version: + print("bootstrap.py version %s" % __version__) + sys.exit(0) -if options.eggs: - eggs_dir = os.path.abspath(os.path.expanduser(options.eggs)) -else: - eggs_dir = tempfile.mkdtemp() - -if options.setup_source is None: - if options.use_distribute: - options.setup_source = distribute_source - else: - options.setup_source = setuptools_source -if options.accept_buildout_test_releases: - args.insert(0, 'buildout:accept-buildout-test-releases=true') +###################################################################### +# load/install setuptools try: - import pkg_resources - import setuptools # A flag. Sometimes pkg_resources is installed alone. - if not hasattr(pkg_resources, '_distribute'): - raise ImportError + from urllib.request import urlopen except ImportError: - ez_code = urllib2.urlopen( - options.setup_source).read().replace('\r\n', '\n') - ez = {} - exec ez_code in ez - setup_args = dict(to_dir=eggs_dir, download_delay=0) - if options.download_base: - setup_args['download_base'] = options.download_base - if options.use_distribute: - setup_args['no_fake'] = True - if sys.version_info[:2] == (2, 4): - setup_args['version'] = '0.6.32' - ez['use_setuptools'](**setup_args) - if 'pkg_resources' in sys.modules: - reload(sys.modules['pkg_resources']) - import pkg_resources - # This does not (always?) update the default working set. We will - # do it. - for path in sys.path: - if path not in pkg_resources.working_set.entries: - pkg_resources.working_set.add_entry(path) - -cmd = [quote(sys.executable), - '-c', - quote('from setuptools.command.easy_install import main; main()'), - '-mqNxd', - quote(eggs_dir)] - -if not has_broken_dash_S: - cmd.insert(1, '-S') - -find_links = options.download_base -if not find_links: - find_links = os.environ.get('bootstrap-testing-find-links') -if not find_links and options.accept_buildout_test_releases: - find_links = 'http://downloads.buildout.org/' -if find_links: - cmd.extend(['-f', quote(find_links)]) + from urllib2 import urlopen -if options.use_distribute: - setup_requirement = 'distribute' +ez = {} +if os.path.exists('ez_setup.py'): + exec(open('ez_setup.py').read(), ez) else: - setup_requirement = 'setuptools' + exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez) + +if not options.allow_site_packages: + # ez_setup imports site, which adds site packages + # this will remove them from the path to ensure that incompatible versions + # of setuptools are not in the path + import site + # inside a virtualenv, there is no 'getsitepackages'. + # We can't remove these reliably + if hasattr(site, 'getsitepackages'): + for sitepackage_path in site.getsitepackages(): + # Strip all site-packages directories from sys.path that + # are not sys.prefix; this is because on Windows + # sys.prefix is a site-package directory. + if sitepackage_path != sys.prefix: + sys.path[:] = [x for x in sys.path + if sitepackage_path not in x] + +setup_args = dict(to_dir=tmpeggs, download_delay=0) + +if options.setuptools_version is not None: + setup_args['version'] = options.setuptools_version +if options.setuptools_to_dir is not None: + setup_args['to_dir'] = options.setuptools_to_dir + +ez['use_setuptools'](**setup_args) +import setuptools +import pkg_resources + +# This does not (always?) update the default working set. We will +# do it. +for path in sys.path: + if path not in pkg_resources.working_set.entries: + pkg_resources.working_set.add_entry(path) + +###################################################################### +# Install buildout + ws = pkg_resources.working_set -setup_requirement_path = ws.find( - pkg_resources.Requirement.parse(setup_requirement)).location -env = dict( - os.environ, - PYTHONPATH=setup_requirement_path) + +setuptools_path = ws.find( + pkg_resources.Requirement.parse('setuptools')).location + +# Fix sys.path here as easy_install.pth added before PYTHONPATH +cmd = [sys.executable, '-c', + 'import sys; sys.path[0:0] = [%r]; ' % setuptools_path + + 'from setuptools.command.easy_install import main; main()', + '-mZqNxd', tmpeggs] + +find_links = os.environ.get( + 'bootstrap-testing-find-links', + options.find_links or + ('http://downloads.buildout.org/' + if options.accept_buildout_test_releases else None) + ) +if find_links: + cmd.extend(['-f', find_links]) requirement = 'zc.buildout' -version = options.version +version = options.buildout_version if version is None and not options.accept_buildout_test_releases: # Figure out the most recent final version of zc.buildout. import setuptools.package_index _final_parts = '*final-', '*final' def _final_version(parsed_version): - for part in parsed_version: - if (part[:1] == '*') and (part not in _final_parts): - return False - return True + try: + return not parsed_version.is_prerelease + except AttributeError: + # Older setuptools + for part in parsed_version: + if (part[:1] == '*') and (part not in _final_parts): + return False + return True + index = setuptools.package_index.PackageIndex( - search_path=[setup_requirement_path]) + search_path=[setuptools_path]) if find_links: index.add_find_links((find_links,)) req = pkg_resources.Requirement.parse(requirement) @@ -227,8 +174,6 @@ def _final_version(parsed_version): bestv = None for dist in index[req.project_name]: distv = dist.parsed_version - if distv >= pkg_resources.parse_version('2dev'): - continue if _final_version(distv): if bestv is None or distv > bestv: best = [dist] @@ -238,40 +183,28 @@ def _final_version(parsed_version): if best: best.sort() version = best[-1].version - if version: - requirement += '=='+version -else: - requirement += '<2dev' - + requirement = '=='.join((requirement, version)) cmd.append(requirement) -if is_jython: - import subprocess - exitcode = subprocess.Popen(cmd, env=env).wait() -else: # Windows prefers this, apparently; otherwise we would prefer subprocess - exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env])) -if exitcode != 0: - sys.stdout.flush() - sys.stderr.flush() - print ("An error occurred when trying to install zc.buildout. " - "Look above this message for any errors that " - "were output by easy_install.") - sys.exit(exitcode) - -ws.add_entry(eggs_dir) +import subprocess +if subprocess.call(cmd) != 0: + raise Exception( + "Failed to execute command:\n%s" % repr(cmd)[1:-1]) + +###################################################################### +# Import and run buildout + +ws.add_entry(tmpeggs) ws.require(requirement) import zc.buildout.buildout -# If there isn't already a command in the args, add bootstrap if not [a for a in args if '=' not in a]: args.append('bootstrap') - -# if -c was provided, we push it back into args for buildout's main function +# if -c was provided, we push it back into args for buildout' main function if options.config_file is not None: args[0:0] = ['-c', options.config_file] zc.buildout.buildout.main(args) -if not options.eggs: # clean up temporary egg directory - shutil.rmtree(eggs_dir) +shutil.rmtree(tmpeggs) diff --git a/buildout.d/base.cfg b/buildout.d/base.cfg index b6e87d1..60f2e73 100644 --- a/buildout.d/base.cfg +++ b/buildout.d/base.cfg @@ -1,10 +1,22 @@ [buildout] extends = - http://dist.plone.org/release/4.3.6/versions.cfg - https://raw.github.com/plone/plone.app.robotframework/master/versions.cfg +# setuptools - 0.6c11 +# http://dist.plone.org/release/4.3.6/versions.cfg +# setuptools - 20.1.1 +# https://dist.plone.org/release/4.3.8/versions.cfg +# setuptools - 26.1.1 + https://dist.plone.org/release/4.3.12/versions.cfg +# https://dist.plone.org/release/4.3.14/versions.cfg +# https://dist.plone.org/release/4.3.15/versions.cfg +# https://dist.plone.org/release/4.3.17/versions.cfg +# https://dist.plone.org/release/4.3.18/versions.cfg +# https://dist.plone.org/release/4.3.19/versions.cfg +# https://raw.github.com/plone/plone.app.robotframework/master/versions.cfg settings.cfg versions.cfg +index = https://pypi.python.org/simple/ + find-links = http://dist.plone.org/release/4.3.6 http://dist.plone.org/thirdparty @@ -46,6 +58,10 @@ environment-vars = TEMP ${buildout:directory}/tmp TMP ${buildout:directory}/tmp eggs = ${buildout:eggs} + eea.daviz + wkhtmltopdf + collective.vaporisation + zcml = ${buildout:zcml} [mkdir-chameleon] diff --git a/buildout.d/sources.cfg b/buildout.d/sources.cfg index ca9f0e3..59bc4fd 100644 --- a/buildout.d/sources.cfg +++ b/buildout.d/sources.cfg @@ -1,6 +1,5 @@ [sources] interlegis.intranetmodelo.departments = git git@github.com:interlegis/interlegis.intranetmodelo.departments.git -interlegis.intranetmodelo.policy = git git@github.com:interlegis/interlegis.intranetmodelo.policy.git interlegis.portalmodelo.api = git git@github.com:interlegis/interlegis.portalmodelo.api.git interlegis.portalmodelo.buscadores = git git@github.com:interlegis/interlegis.portalmodelo.buscadores.git interlegis.portalmodelo.ombudsman = git git@github.com:interlegis/interlegis.portalmodelo.ombudsman.git @@ -12,4 +11,3 @@ interlegis.portalmodelo.transparency = git git@github.com:interlegis/interlegis. Products.windowZ = git git@github.com:collective/Products.windowZ.git collective.opendata = git git@github.com:plonegovbr/collective.opendata.git rows = git git@github.com:interlegis/rows.git -eea.rdfmarshaller = git git@github.com:eea/eea.rdfmarshaller diff --git a/buildout.d/versions.cfg b/buildout.d/versions.cfg index 1fac9ec..461b9f8 100644 --- a/buildout.d/versions.cfg +++ b/buildout.d/versions.cfg @@ -1,7 +1,43 @@ [versions] +BTrees = 4.3.1 +BeautifulSoup = 3.2.1 +Mako = 1.0.3 +MarkupSafe = 0.23 +Products.AROfficeTransforms = 0.11.0 +Products.BrFieldsAndWidgets = 1.2.2 +Products.DataGridField = 1.9.5 +Products.DateRecurringIndex = 2.1 +Products.EasyNewsletter = 2.6.14 +Products.LDAPMultiPlugins = 1.14 +Products.LDAPUserFolder = 2.27 +Products.OpenXml = 1.1.1 +Products.PloneFormGen = 1.7.19 +Products.PloneLDAP = 1.2 +Products.Ploneboard = 3.6 +Products.PrintingMailHost = 0.7 +Products.PythonField = 1.1.3 +Products.SQLAlchemyDA = 0.5.1 +Products.SimpleAttachment = 4.3 +Products.TALESField = 1.1.3 +Products.TemplateFields = 1.2.5 +Products.TinyMCE = 1.4.3 +Products.UserAndGroupSelectionWidget = 3.0b5 +Products.ZSPARQLMethod = 1.0 +Products.ZServerViews = 0.2.0 +Products.windowZ = 1.5 +PyPDF2 = 1.26.0 +PyYAML = 3.11 +SPARQLWrapper = 1.7.6 +SQLAlchemy = 0.9.6 +Solgema.ContextualContentMenu = 0.2 +Solgema.fullcalendar = 2.3.4 +StoneageHTML = 0.2.1 +Twisted = 13.2.0 +ZODB = 5.0.0 +ZopeHealthWatcher = 0.9.0 argh = 0.24.1 +backports.functools-lru-cache = 1.5 bda.cache = 1.1.3 -BeautifulSoup = 3.2.1 brasil.gov.vcge = 2.0.0 brasil.vocab = 0.8 cioppino.twothumbs = 1.7 @@ -17,15 +53,18 @@ collective.js.bootstrap = 2.3.1.1 collective.js.colorpicker = 1.0 collective.js.fullcalendar = 1.6.4 collective.js.galleria = 1.2.5 +collective.js.underscore = 1.5.2 collective.jsonmigrator = 0.3 collective.oembed = 2.0.1 collective.opendata = 1.0a2 collective.polls = 1.7 +collective.quickupload = 1.8.2 collective.recipe.backup = 3.0.0 collective.recipe.plonesite = 1.9.2 collective.recipe.supervisor = 0.20 collective.transmogrifier = 1.5.1 collective.upload = 1.0rc1 +collective.vaporisation = 1.3.7 collective.watcherlist = 1.2 collective.weather = 1.0a4 collective.xmpp.chat = 0.3.1 @@ -36,12 +75,22 @@ createzopecoverage = 1.5 cssselect = 0.9.1 cssutils = 1.0 dataflake.fakeldap = 1.1 -et-xmlfile = 1.0.1 +eea.app.visualization = 10.7 +eea.converter = 11.0 eea.daviz = 10.3 -eea.converter = 10.6 +eea.exhibit = 8.3 +eea.forms = 6.6 +eea.googlecharts = 16.5 +eea.icons = 2.2 +eea.jquery = 9.3 +eea.sparql = 5.6 +eea.versions = 9.4 +et-xmlfile = 1.0.1 +eventlet = 0.19.0 ftw.globalstatusmessage = 1.4.0 ftw.upgrade = 1.7.4 gocept.munin = 0.1 +greenlet = 0.4.10 hachoir-core = 1.3.3 hachoir-metadata = 1.3.3 hachoir-parser = 1.3.4 @@ -49,31 +98,32 @@ html5lib = 1.0b3 i18ndude = 3.4.0 icalendar = 3.8.4 interlegis.intranetmodelo.departments = 1.0b4 -interlegis.intranetmodelo.policy = 1.0b7 interlegis.portalmodelo.api = 1.0b4 interlegis.portalmodelo.buscadores = 1.0rc4 interlegis.portalmodelo.migrator = 1.0a1 interlegis.portalmodelo.ombudsman = 1.0 -interlegis.portalmodelo.pl = 1.0rc3 -interlegis.portalmodelo.policy = 1.0rc6 -interlegis.portalmodelo.theme = 1.0rc5 +interlegis.portalmodelo.pl = 1.0rc2 +interlegis.portalmodelo.policy = 1.0rc5 +interlegis.portalmodelo.theme = 1.0rc4 interlegis.portalmodelo.transparency = 1.0rc3 isodate = 0.5.1 jarn.jsi18n = 1.0 jdcal = 1.2 +keepalive = 0.5 +kv = 0.2 lxml = 3.3.5 -Mako = 1.0.3 -MarkupSafe = 0.23 meld3 = 1.0.2 munin.zope = 2.1 norecaptcha = 0.3.0 openpyxl = 2.3.1 openxmllib = 1.0.7 pathtools = 0.1.2 +persistent = 4.2.1 plone.api = 1.3.2 +plone.app.async = 1.7.0 plone.app.blocks = 1.1.1 plone.app.drafts = 1.0a2 -plone.app.event = 1.1.8 +plone.app.event = 1.1.4 plone.app.ldap = 1.3.2 plone.app.tiles = 1.0.1 plone.app.transmogrifier = 1.4 @@ -84,40 +134,20 @@ plone.formwidget.recaptcha = 2.0a2 plone.formwidget.recurrence = 1.2.5 plone.recipe.command = 1.1 plone.recipe.haproxy = 1.1.2 +plone.stringinterp = 1.2 +plone.tiles = 1.2 plonesocial.activitystream = 0.5.6 plonesocial.microblog = 0.5.3 plonesocial.network = 0.6.1 -plone.tiles = 1.2 -Products.AROfficeTransforms = 0.11.0 -Products.BrFieldsAndWidgets = 1.2.2 -Products.DateRecurringIndex = 2.1 -Products.EasyNewsletter = 2.6.14 -Products.LDAPMultiPlugins = 1.14 -Products.LDAPUserFolder = 2.27 -Products.OpenXml = 1.1.1 -Products.Ploneboard = 3.6 -Products.PloneFormGen = 1.7.19 -Products.PloneLDAP = 1.2 -Products.PrintingMailHost = 0.7 -Products.PythonField = 1.1.3 -Products.SimpleAttachment = 4.3 -Products.SQLAlchemyDA = 0.5.1 -Products.TALESField = 1.1.3 -Products.TemplateFields = 1.2.5 -Products.TinyMCE = 1.4.3 -Products.UserAndGroupSelectionWidget = 3.0b5 -Products.windowZ = 1.5 -Products.ZServerViews = 0.2.0 -pyparsing = 1.5.7 +pyparsing = 2.0.2 python-ldap = 2.4.19 python-memcached = 1.53 python-oembed = 0.2.2 -pytz = 2015.2 -PyYAML = 3.11 +pytz = 2015.7 raptus.autocompletewidget = 1.0b3 rdflib = 4.2.1 requests = 2.8.1 -rows = 0.1.1 +rows = 0.3.0 s17.portlets = 1.0b2 s17.taskmanager = 1.0b2 sauna.reload = 0.5.3 @@ -129,19 +159,28 @@ sc.embedder = 1.1b2 sc.galleria.support = 1.0 sc.social.like = 2.4.1 skimpyGimpy = 1.4 -Solgema.ContextualContentMenu = 0.2 -Solgema.fullcalendar = 2.3.4 -SPARQLWrapper = 1.7.6 -SQLAlchemy = 0.9.6 -StoneageHTML = 0.2.1 +#soupsieve = 1.1 +#soupsieve = 1.2 +#soupsieve = 1.2.1 +#soupsieve = 1.3 +#soupsieve = 1.3.1 +#soupsieve = 1.4 +#soupsieve = 1.5 +#soupsieve = 1.6 +#soupsieve = 1.6.1 +soupsieve = 1.6.2 +sparql-client = 2.6 stripogram = 1.5 superlance = 0.11 supervisor = 3.2.0 tarjan = 0.1.2 -Twisted = 13.2.0 +transaction = 1.6.1 +ua-parser = 0.7.2 unicodecsv = 0.14.1 +uuid = 1.30 watchdog = 0.7.1 webcouturier.dropdownmenu = 2.3.1 +wkhtmltopdf = 0.2 wokkel = 0.7.1 xlrd = 0.9.4 xlwt = 1.0.0 @@ -149,7 +188,15 @@ z3c.jbot = 0.7.2 z3c.recipe.usercrontab = 1.3 z3c.sqlalchemy = 1.4.0 z3c.unconfigure = 1.1 +zc.async = 1.5.4 +zc.blist = 1.0b2 +zc.dict = 1.3b1 +zc.monitor = 0.3.1 +zc.ngi = 2.0.1 +zc.queue = 2.0.0a1 +zc.twist = 1.3.1 +zc.z3monitor = 0.8.0 +zodbpickle = 0.6.0 +zope.bforest = 1.2 zope.configuration = 3.8.0 -ZopeHealthWatcher = 0.9.0 zope.sqlalchemy = 0.7.5 -ZODB = 4.0.0a4 diff --git a/checkouts.cfg b/checkouts.cfg index 6d4fe0c..a4d87ab 100644 --- a/checkouts.cfg +++ b/checkouts.cfg @@ -5,8 +5,7 @@ always-checkout = force # Apos um release, esta lista devera ser comentada auto-checkout = - interlegis.intranetmodelo.departments - interlegis.intranetmodelo.policy +# interlegis.intranetmodelo.departments interlegis.portalmodelo.api interlegis.portalmodelo.buscadores # interlegis.portalmodelo.migrator @@ -18,6 +17,5 @@ auto-checkout = # collective.opendata # Products.windowZ rows - eea.rdfmarshaller # Test fixes only diff --git a/development.cfg b/development.cfg index e11618d..769f6e4 100644 --- a/development.cfg +++ b/development.cfg @@ -1,6 +1,5 @@ [buildout] extensions += - buildout.dumppickedversions mr.developer extends = @@ -19,8 +18,6 @@ parts += package-extras = [test] test-eggs = - interlegis.intranetmodelo.departments [test] - interlegis.intranetmodelo.policy [test] interlegis.portalmodelo.api [test] interlegis.portalmodelo.buscadores [test] interlegis.portalmodelo.ombudsman [test] @@ -33,7 +30,6 @@ test-eggs = eggs += sauna.reload Products.PrintingMailHost - eea.daviz # Products.PDBDebugMode [checkversions] From 579e78049f6ef2ec263b983557abd86fa43ac07d Mon Sep 17 00:00:00 2001 From: Ramiro Batista da Luz Date: Tue, 19 May 2020 17:09:50 -0300 Subject: [PATCH 2/2] WIP. Replace collective.flowplayer with wildcard.media. --- buildout.d/base.cfg | 6 +++--- buildout.d/versions.cfg | 6 ++---- development.cfg | 1 + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/buildout.d/base.cfg b/buildout.d/base.cfg index 60f2e73..9a9f14c 100644 --- a/buildout.d/base.cfg +++ b/buildout.d/base.cfg @@ -5,12 +5,12 @@ extends = # setuptools - 20.1.1 # https://dist.plone.org/release/4.3.8/versions.cfg # setuptools - 26.1.1 - https://dist.plone.org/release/4.3.12/versions.cfg +# https://dist.plone.org/release/4.3.12/versions.cfg # https://dist.plone.org/release/4.3.14/versions.cfg # https://dist.plone.org/release/4.3.15/versions.cfg # https://dist.plone.org/release/4.3.17/versions.cfg # https://dist.plone.org/release/4.3.18/versions.cfg -# https://dist.plone.org/release/4.3.19/versions.cfg + https://dist.plone.org/release/4.3.19/versions.cfg # https://raw.github.com/plone/plone.app.robotframework/master/versions.cfg settings.cfg versions.cfg @@ -18,7 +18,7 @@ extends = index = https://pypi.python.org/simple/ find-links = - http://dist.plone.org/release/4.3.6 + http://dist.plone.org/release/4.3.19 http://dist.plone.org/thirdparty https://github.com/interlegis/rows/archive/0.1.0a0.zip#egg=rows-0.1.0a0 diff --git a/buildout.d/versions.cfg b/buildout.d/versions.cfg index 461b9f8..1c798e8 100644 --- a/buildout.d/versions.cfg +++ b/buildout.d/versions.cfg @@ -48,7 +48,6 @@ collective.contentrules.mailtogroup = 1.5 collective.cover = 1.0a9 collective.dexteritytextindexer = 2.0.1 collective.elephantvocabulary = 0.2.4 -collective.flowplayer = 4.2.1 collective.js.bootstrap = 2.3.1.1 collective.js.colorpicker = 1.0 collective.js.fullcalendar = 1.6.4 @@ -91,9 +90,6 @@ ftw.globalstatusmessage = 1.4.0 ftw.upgrade = 1.7.4 gocept.munin = 0.1 greenlet = 0.4.10 -hachoir-core = 1.3.3 -hachoir-metadata = 1.3.3 -hachoir-parser = 1.3.4 html5lib = 1.0b3 i18ndude = 3.4.0 icalendar = 3.8.4 @@ -124,6 +120,7 @@ plone.app.async = 1.7.0 plone.app.blocks = 1.1.1 plone.app.drafts = 1.0a2 plone.app.event = 1.1.4 +plone.app.jquery = 1.8.3 plone.app.ldap = 1.3.2 plone.app.tiles = 1.0.1 plone.app.transmogrifier = 1.4 @@ -180,6 +177,7 @@ unicodecsv = 0.14.1 uuid = 1.30 watchdog = 0.7.1 webcouturier.dropdownmenu = 2.3.1 +wildcard.media = 2.1.0 wkhtmltopdf = 0.2 wokkel = 0.7.1 xlrd = 0.9.4 diff --git a/development.cfg b/development.cfg index 769f6e4..daaf598 100644 --- a/development.cfg +++ b/development.cfg @@ -31,6 +31,7 @@ eggs += sauna.reload Products.PrintingMailHost # Products.PDBDebugMode + wildcard.media [checkversions] recipe=zc.recipe.egg