From 1157c8445d4985e83c0cf3eaacceab0cc649a0fc Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Mon, 22 Feb 2016 09:15:07 +0100 Subject: [PATCH] Test with Plone 5 by default. Use main_template/macros/master. Travis: test on Plone 4 and 5. --- .travis.yml | 11 +- CHANGES.rst | 10 +- Products/feedfeeder/browser/feed-folder.pt | 2 +- README.rst | 18 +- bootstrap.py | 303 ++++++++------------- buildout.cfg | 4 +- buildout4x.cfg | 10 + setup.py | 6 +- travis.cfg | 2 +- versions.cfg | 6 +- 10 files changed, 169 insertions(+), 203 deletions(-) create mode 100644 buildout4x.cfg diff --git a/.travis.yml b/.travis.yml index cdbe8da..efa2e64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,10 @@ cache: language: python python: - "2.7" +env: + matrix: + - PLONE=4 + - PLONE=5 notifications: email: recipients: @@ -13,7 +17,12 @@ notifications: install: - mkdir -p buildout-cache/eggs - mkdir -p buildout-cache/downloads - - python bootstrap.py -c travis.cfg + - sed -ie "s#travis-5.x.cfg#travis-$PLONE.x.cfg#" buildout.cfg +# Keep setuptools and zc.buildout synced with buildout.cfg, +# otherwise the buildout fails due to the non newest ('-N') option +# when it wants to downgrade one of them to the pinned version. + - python bootstrap.py -c travis.cfg --buildout-version=2.5.0 --setuptools-version=19.4 + - bin/buildout -N -t 3 -c travis.cfg annotate - bin/buildout -N -t 3 -c travis.cfg install download install - bin/buildout -N -t 3 -c travis.cfg script: bin/test diff --git a/CHANGES.rst b/CHANGES.rst index 2088668..9c84186 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,10 +2,14 @@ History of feedfeeder ===================== -2.9 (unreleased) ----------------- +3.0.0 (unreleased) +------------------ + +- Compatible with Plone 4.3 and 5.0. [maurits] -- Nothing changed yet. +- Use ``main_template/macros/master``, instead of strange old + ``@@standard-macros/view`` which would show only the core content on + Plone 5. [maurits] 2.8 (2015-05-16) diff --git a/Products/feedfeeder/browser/feed-folder.pt b/Products/feedfeeder/browser/feed-folder.pt index 87dbcdd..6947349 100644 --- a/Products/feedfeeder/browser/feed-folder.pt +++ b/Products/feedfeeder/browser/feed-folder.pt @@ -2,7 +2,7 @@ xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:i18n="http://xml.zope.org/namespaces/i18n" - metal:use-macro="context/@@standard_macros/view" + metal:use-macro="context/main_template/macros/master" i18n:domain="feedfeeder"> diff --git a/README.rst b/README.rst index 6c736be..12caff9 100644 --- a/README.rst +++ b/README.rst @@ -46,7 +46,7 @@ I'm using archgenxml to generate the boiler plate stuff. There's a 'generate.sh' shell script that'll call archgenxml for you. Nothing fancy. -The feedfeeder's content types are: +The feedfeeder's content types are: - folder.FeedfeederFolder - item.FeedFeederItem @@ -83,8 +83,8 @@ with the following data:: Updating all feeds once +++++++++++++++++++++++ -If your site has several feed folders and you -want update them all once you can do:: +If your site has several feed folders and you +want update them all once you can do:: method /yoursiteid/feed-mega-update @@ -93,7 +93,7 @@ want update them all once you can do:: password 123 host localhost:8080 - + Removing old feed items +++++++++++++++++++++++ @@ -112,12 +112,20 @@ You can periodically remove feed items older than a specific number of days. For Dependencies ------------ -We need Plone 4.x. Compatibility with Plone 4.3 has been checked. +Since version 3 we need Plone 4.3 or 5.0. + +Plone 5: in the add-ons control panel you also need to install +'Archetypes Content Types for Plone'. Otherwise, if you try to add a +FeedfeederFolder, you will get a 404 Not Found error because the +``createObject`` script is not found. + +For earlier Plone 4 versions, use version 2.x. The current latest is 2.8. If you use Plone 3, please use a Products.feedfeeder version from the 2.0 line. The current latest is 2.0.9. + Upgrade notes ------------- diff --git a/bootstrap.py b/bootstrap.py index 1cce2ce..a459921 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,31 +38,14 @@ 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, @@ -130,95 +55,117 @@ def normalize_to_url(option, opt_str, value, parser): "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.cfg b/buildout.cfg index 56137e1..60f8858 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -2,9 +2,9 @@ # mkdir -p buildout-cache/eggs # mkdir -p buildout-cache/downloads [buildout] -extensions = buildout-versions +show-picked-versions = true extends = - https://raw.github.com/collective/buildout.plonetest/master/test-4.x.cfg + https://raw.github.com/collective/buildout.plonetest/master/test-5.x.cfg versions.cfg package-name = Products.feedfeeder test-eggs = Products.feedfeeder[test] diff --git a/buildout4x.cfg b/buildout4x.cfg new file mode 100644 index 0000000..a959254 --- /dev/null +++ b/buildout4x.cfg @@ -0,0 +1,10 @@ +# Note: you need to create two directories manually: +# mkdir -p buildout-cache/eggs +# mkdir -p buildout-cache/downloads +[buildout] +show-picked-versions = true +extends = + https://raw.github.com/collective/buildout.plonetest/master/test-4.x.cfg + versions.cfg +package-name = Products.feedfeeder +test-eggs = Products.feedfeeder[test] diff --git a/setup.py b/setup.py index 2f50c89..bb94f6c 100644 --- a/setup.py +++ b/setup.py @@ -5,17 +5,15 @@ setup( name='Products.feedfeeder', - version='2.9.dev0', + version='3.0.0.dev0', description="Turn external feed entries into content items", long_description=readme + "\n\n" + history, # Get more strings from # https://pypi.python.org/pypi?%3Aaction=list_classifiers classifiers=[ "Framework :: Plone", - "Framework :: Plone :: 4.0", - "Framework :: Plone :: 4.1", - "Framework :: Plone :: 4.2", "Framework :: Plone :: 4.3", + "Framework :: Plone :: 5.0", "Programming Language :: Python", "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", diff --git a/travis.cfg b/travis.cfg index a8a1321..02b96a5 100644 --- a/travis.cfg +++ b/travis.cfg @@ -1,6 +1,6 @@ [buildout] extends = - https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg + https://raw.github.com/collective/buildout.plonetest/master/travis-5.x.cfg versions.cfg package-name = Products.feedfeeder test-eggs = Products.feedfeeder[test] diff --git a/versions.cfg b/versions.cfg index 073d500..e88407b 100644 --- a/versions.cfg +++ b/versions.cfg @@ -1,8 +1,12 @@ [versions] beautifulsoup4 = 4.3.2 -buildout-versions = 1.7 # We keep using feedparser 4.1 in the tests. Plone pins this to 5.0.1, # but that gives errors during testing. We should fix those, but it # seems everything works fine in a real website, also in Plone 4.3. #FeedParser = 4.1 feedparser = 4.1 + +# Keep setuptools and zc.buildout synced with the bootstrap call in +# .travis.yml. +setuptools = 19.4 +zc.buildout = 2.5.0