diff --git a/.gitignore b/.gitignore index 5ef1a3ea..0f26d7bd 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ parts/ src/collective.* src/plone.* var/ +/share/ +/local +/pip-selfcheck.json diff --git a/.travis.yml b/.travis.yml index 276519e5..486cbfff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ +services: + - xvfb language: python python: 2.7 -sudo: false cache: directories: - $HOME/.pylint.d @@ -16,22 +17,18 @@ matrix: allow_failures: - env: PLONE_VERSION=5.1 fast_finish: true -before_install: -# FIXME: I have no idea how and why six==1.11.0 is being installed -- pip uninstall -y six install: -- sed -ie "s#test-4.3#test-$PLONE_VERSION#" buildout.cfg -- sed -ie "s#versions-4.3#versions-$PLONE_VERSION#" buildout.cfg -- python bootstrap.py -- bin/buildout buildout:test-eggs=$TEST_EGGS annotate -- bin/buildout buildout:test-eggs=$TEST_EGGS + - sed -ie "s#test-4.3#test-$PLONE_VERSION#" buildout.cfg + - sed -ie "s#versions-4.3#versions-$PLONE_VERSION#" buildout.cfg + - virtualenv . + - bin/pip install -r requirements.txt + - bin/buildout buildout:test-eggs=$TEST_EGGS annotate + - bin/buildout buildout:test-eggs=$TEST_EGGS before_script: -- export DISPLAY=:99.0 -- sh -e /etc/init.d/xvfb start -- firefox -v + - firefox -v script: - bin/code-analysis -- CATALOG_OPTIMIZATION_DISABLED=true bin/test +- bin/test - bin/pylint --py3k --disable=no-absolute-import src/collective/nitf after_success: - pip install coverage diff --git a/bootstrap.py b/bootstrap.py deleted file mode 100644 index a6295667..00000000 --- a/bootstrap.py +++ /dev/null @@ -1,189 +0,0 @@ -############################################################################## -# -# Copyright (c) 2006 Zope Foundation and Contributors. -# All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE. -# -############################################################################## -"""Bootstrap a buildout-based project - -Simply run this script in a directory containing a buildout.cfg. -The script accepts buildout command-line options, so you can -use the -c option to specify an alternate configuration file. -""" - -import os -import shutil -import sys -import tempfile - -from optparse import OptionParser - -tmpeggs = tempfile.mkdtemp() - -usage = '''\ -[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] - -Bootstraps a buildout-based project. - -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 --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", help="use a specific zc.buildout 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 " - "*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", "--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("--setuptools-version", - help="use a specific setuptools version") - - -options, args = parser.parse_args() - -###################################################################### -# load/install setuptools - -try: - if options.allow_site_packages: - import setuptools - import pkg_resources - from urllib.request import urlopen -except ImportError: - from urllib2 import urlopen - -ez = {} -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(): - 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 - -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 - -cmd = [sys.executable, '-c', - '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]) - -setuptools_path = ws.find( - pkg_resources.Requirement.parse('setuptools')).location - -requirement = 'zc.buildout' -version = options.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): - 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=[setuptools_path]) - if find_links: - index.add_find_links((find_links,)) - req = pkg_resources.Requirement.parse(requirement) - if index.obtain(req) is not None: - best = [] - bestv = None - for dist in index[req.project_name]: - distv = dist.parsed_version - if _final_version(distv): - if bestv is None or distv > bestv: - best = [dist] - bestv = distv - elif distv == bestv: - best.append(dist) - if best: - best.sort() - version = best[-1].version -if version: - requirement = '=='.join((requirement, version)) -cmd.append(requirement) - -import subprocess -if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 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 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' main function -if options.config_file is not None: - args[0:0] = ['-c', options.config_file] - -zc.buildout.buildout.main(args) -shutil.rmtree(tmpeggs) diff --git a/buildout.cfg b/buildout.cfg index fe95830f..02e6a71f 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,9 +1,8 @@ [buildout] extends = - https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x.cfg - https://raw.github.com/collective/buildout.plonetest/master/qa.cfg - https://raw.github.com/plone/plone.app.robotframework/master/versions.cfg - https://raw.github.com/collective/collective.cover/master/versions-4.3.x.cfg + https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-4.3.x.cfg + https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg + versions-4.3.x.cfg package-name = collective.nitf package-extras = [test] diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..1f655844 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +-c https://dist.plone.org/release/5.1-latest/requirements.txt +setuptools +zc.buildout \ No newline at end of file diff --git a/versions-4.3.x.cfg b/versions-4.3.x.cfg new file mode 100644 index 00000000..ab8bfc5d --- /dev/null +++ b/versions-4.3.x.cfg @@ -0,0 +1,6 @@ +[versions] +setuptools = 40.8.0 +zc.buildout = 2.13.1 + +collective.js.bootstrap = 2.3.1.1 +zipp = <2.0.0 diff --git a/versions-5.1.x.cfg b/versions-5.1.x.cfg new file mode 100644 index 00000000..053d98f3 --- /dev/null +++ b/versions-5.1.x.cfg @@ -0,0 +1,2 @@ +[versions] +zipp = <2.0.0