Skip to content

Commit

Permalink
Merge pull request #43 from collective/plone5
Browse files Browse the repository at this point in the history
Plone5
  • Loading branch information
jensens committed Sep 14, 2016
2 parents c7032d0 + b1d2c89 commit f566092
Show file tree
Hide file tree
Showing 54 changed files with 1,810 additions and 1,634 deletions.
2 changes: 2 additions & 0 deletions .coveragerc
Expand Up @@ -8,3 +8,5 @@ omit =
parts/*
src/*
collective/easyform/tests/*
*/lib/*
collective/__init__.py
5 changes: 4 additions & 1 deletion .gitignore
Expand Up @@ -6,12 +6,14 @@
*.py?
*.pyc
*~
._*
.DS_Store
.coverage
.installed.cfg
.mr.developer.cfg
bin/
buildout-cache/
build/
collective/easyform/tests/*.tar.gz
develop-eggs/
dist
Expand All @@ -23,7 +25,8 @@ extras/
htmlcov/
include/
lib/
lib64
lib64/
local/
parts/
pip-selfcheck.json
src/
Expand Down
29 changes: 19 additions & 10 deletions .travis.yml
@@ -1,18 +1,27 @@
language: python
sudo: false
cache:
pip: true
directories:
- $HOME/buildout-cache
python:
- 2.7
before_install:
- pip install coveralls
- sudo apt-get install -qq libxml2-dev libxslt-dev
- mkdir -p buildout-cache/eggs
- mkdir -p buildout-cache/downloads
- mkdir -p $HOME/buildout-cache/{eggs,downloads}
- mkdir $HOME/.buildout
- echo "[buildout]" > $HOME/.buildout/default.cfg
- echo "download-cache = $HOME/buildout-cache/downloads" >> $HOME/.buildout/default.cfg
- echo "eggs-directory = $HOME/buildout-cache/eggs" >> $HOME/.buildout/default.cfg
install:
- python bootstrap.py -v 1.6.3 -c travis.cfg
- bin/buildout -t 5 -Nq -c travis.cfg
- python bootstrap-buildout.py -c travis.cfg
- bin/buildout -Nc travis.cfg annotate
- bin/buildout -Nc travis.cfg
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- export DISPLAY=:99.0
# - sh -e /etc/init.d/xvfb start
script:
- bin/coverage.sh
- bin/code-analysis
- bin/coverage run bin/test -a 1
after_success:
- coveralls || true
- pip install -q coveralls python-coveralls==2.5.0 coverage==3.7.1
- coveralls
19 changes: 19 additions & 0 deletions CHANGES.rst
Expand Up @@ -12,6 +12,17 @@ Changelog
------------------

New:
- Change recipient address field to Email type so it gets properly validated
[davilima6]

- Make the default buildout use Plone 5. Update travis setup to the point where
tests actually run, though many still fail.
[smcmahon]

Fixes:

- look up email_from_address in registry
[kcleong]

- Move the default xml configuration out into xml files. These can be picked up
by ``i18ndude`` or other po file generators for translations strings. Also
Expand All @@ -33,6 +44,12 @@ New:
- Depend on plone.schemaeditor > 2.0 for JS compatibility.
[thet]

- fix plone.schemaeditor i18n factory import. This fixes 5.0.1 support.
[vangheem]

- Fix modeleditor.pt markup so it works with barceloneta.
[ebrehault]

Fixes:

- fix plone.schemaeditor i18n factory import. This fixes 5.0.1 support
Expand All @@ -56,6 +73,7 @@ Fixes:
- Set script type correctly
[fredvd]


1.0a2 (2014-06-13)
------------------

Expand All @@ -77,6 +95,7 @@ Fixes:
- Added fields parameter in Mailer override expressions
[gborelli]


1.0a1 (2014-03-18)
------------------

Expand Down
22 changes: 22 additions & 0 deletions README.rst
Expand Up @@ -5,10 +5,20 @@ collective.easyform
Collective.easyform enables creation of custom forms using dexterity. This Plone package is similar to Products.PloneFormGen that is based on Archetypes. Dexterity is a new platform for content types in Plone and will be used instead of Archetypes in Plone 5. Easyform provides a Plone form builder through-the-web using fields, widgets, actions and validators.

Similarly to PloneFormGen, Easyform is used to generate web forms that save or mail form input. Simple and user-friendly interface allows non-programmers to create custom forms.
.. image:: https://travis-ci.org/collective/collective.easyform.png?branch=master
:target: https://travis-ci.org/collective/collective.easyform
:alt: Travis CI status

.. image:: https://coveralls.io/repos/github/collective/collective.easyform/badge.svg?branch=master :target: https://coveralls.io/github/collective/collective.easyform?branch=master
:target: https://coveralls.io/r/collective/collective.easyform?branch=master
:alt: Coveralls status


Usage
-----
.. image:: https://badge.fury.io/gh/collective%2Fcollective.easyform.svg
:target: http://badge.fury.io/gh/collective%2Fcollective.easyform
:alt: Fury Github

- Install product (in your buildout.cfg add ‘collective.easyform’ to the eggs section), rerun your Plone instance and activate Collective.easyform.
- Choose Easyform from the 'Add new' drop-down menu. Insert form title, description and other settings.
Expand All @@ -24,6 +34,13 @@ See quick overview of this product:

Contribute
----------
.. image:: https://pypip.in/license/collective.easyform/badge.png
:target: https://pypi.python.org/pypi/collective.easyform/
:alt: License

.. figure:: http://collective.com/services/plone-development/products/easyform/easyform.png
:target: https://github.com/collective/collective.easyform
:alt: Logo

- Issue Tracker: https://github.com/collective/collective.easyform/issues
- Source Code: https://github.com/collective/collective.easyform
Expand All @@ -34,9 +51,14 @@ License

The project is licensed under the GPLv2.

.. image:: http://collective.com/services/plone-development/products/easyform/easyform-youtube.png
:target: https://www.youtube.com/watch?v=DMCYnYE9RKU
:alt: Collective.easyform

Compatibility
-------------

2.x targets Plone 5.x
1.x targets Plone 4.x
Plone 4.3.2
Plone 5.0
210 changes: 210 additions & 0 deletions bootstrap-buildout.py
@@ -0,0 +1,210 @@
##############################################################################
#
# 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

__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]
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("--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 "
"*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("--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)


######################################################################
# load/install setuptools

try:
from urllib.request import urlopen
except ImportError:
from urllib2 import urlopen

ez = {}
if os.path.exists('ez_setup.py'):
exec(open('ez_setup.py').read(), ez)
else:
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

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.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):
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) != 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)

0 comments on commit f566092

Please sign in to comment.