diff --git a/.travis.yml b/.travis.yml
index c1b7a89..10f5802 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,29 @@
language: python
python: 2.7
+sudo: false
+cache:
+ directories:
+ - eggs
env:
- - PLONE_VERSION=4.2
- - PLONE_VERSION=4.3 QA=true
+- PLONE_VERSION=4.2
+- PLONE_VERSION=4.3
matrix:
- allow_failures:
- - env: PLONE_VERSION=4.2
fast_finish: true
install:
- - sed -ie "s#travis-4.x.cfg#travis-$PLONE_VERSION.x.cfg#" travis.cfg
- - mkdir -p buildout-cache/downloads
- - python bootstrap.py -c travis.cfg
- - bin/buildout -c travis.cfg annotate
- - bin/buildout -c travis.cfg -N -q
+- sed -ie "s#test-4.x#test-$PLONE_VERSION#" buildout.cfg
+- python bootstrap.py
+- bin/buildout annotate
+- bin/buildout -Nq
before_script:
- - export DISPLAY=:99.0
- - sh -e /etc/init.d/xvfb start
- - firefox -v
-script: bin/test
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
+- firefox -v
+script:
+- bin/code-analysis
+- bin/test
after_success:
- - test $QA && bin/coverage.sh && pip install -q coveralls && coveralls || true
+- bin/createcoverage -t "--layer=!Robot"
+- pip install -q coveralls
+- coveralls
notifications:
irc: irc.freenode.org#plone-testing
diff --git a/CHANGES.rst b/CHANGES.rst
index 8483979..95f7b2c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,14 @@
-There's a frood who really knows where his towel is
----------------------------------------------------
+Changelog
+---------
+
+There's a frood who really knows where his towel is.
1.0b12 (unreleased)
^^^^^^^^^^^^^^^^^^^
- Fix JS to be jQuery 1.9 compat
+ [simahawk]
+
- Make CSS resources render as
[simahawk]
@@ -23,8 +27,8 @@ There's a frood who really knows where his towel is
``plone.formwidget.autocomplete``.
[rnixx]
-- remove zope.i18n from package dependencies in order to avoid
- conflicting zcml with between zope.i18n and Zope2 Publihser
+- remove zope.i18n from package dependencies in order to avoid
+ conflicting zcml with between zope.i18n and Zope2 Publihser
i18n.zcml
[jensens]
diff --git a/MANIFEST.in b/MANIFEST.in
index c8582dc..8bb1b59 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,4 @@
-include *.rst
-
-recursive-include src *
-recursive-include docs *
-
global-exclude *.pyc
+graft docs
+graft src
+include *.rst
diff --git a/README.rst b/README.rst
index a1fd03a..f992dd1 100755
--- a/README.rst
+++ b/README.rst
@@ -10,7 +10,7 @@ Life, the Universe, and Everything
A widget package for Dexterity projects.
.. Warning::
- This package is no longer being actively maintained.
+ This package will no longer be actively maintained.
Take a look at `plone.app.widgets`_ for an alternative set of widgets.
collective.z3cform.widgets provides the following widgets:
@@ -47,7 +47,9 @@ collective.z3cform.widgets provides the following widgets:
**MultiContentSearchFieldWidget**
A widget to add a dynamic list of objects. This works as a widget for
- related items field so it must be used like this::
+ related items field so it must be used like this:
+
+.. code-block::
relatedItems = RelationList(
title=_(u'label_related_items', default=u'Related Items'),
@@ -80,18 +82,15 @@ collective.z3cform.widgets provides the following widgets:
Mostly Harmless
---------------
-.. image:: https://secure.travis-ci.org/collective/collective.z3cform.widgets.png?branch=master
- :alt: Travis CI badge
+.. image:: http://img.shields.io/pypi/v/collective.z3cform.widgets.svg
+ :target: https://pypi.python.org/pypi/collective.z3cform.widgets
+
+.. image:: https://img.shields.io/travis/collective/collective.z3cform.widgets/master.svg
:target: http://travis-ci.org/collective/collective.z3cform.widgets
-.. image:: https://coveralls.io/repos/collective/collective.z3cform.widgets/badge.png?branch=master
- :alt: Coveralls badge
+.. image:: https://img.shields.io/coveralls/collective/collective.z3cform.widgets/master.svg
:target: https://coveralls.io/r/collective/collective.z3cform.widgets
-.. image:: https://pypip.in/d/collective.z3cform.widgets/badge.png
- :alt: Downloads
- :target: https://pypi.python.org/pypi/collective.z3cform.widgets
-
Got an idea? Found a bug? Let us know by `opening a support ticket`_.
Don't Panic
@@ -128,6 +127,8 @@ New fields
To use this widget we must use a List field or a Tuple field with the
value_type as an schema.TextLine() like this::
+.. code-block::
+
from collective.z3cform.widgets.enhancedtextlines import EnhancedTextLinesFieldWidget
form.widget(options = EnhancedTextLinesFieldWidget)
@@ -141,6 +142,8 @@ New fields
To use this Widget we must use a List field or a Tuple field with the
value_type as a schema.TextLine() like this::
+.. code-block::
+
from collective.z3cform.widgets.token_input_widget import TokenInputFieldWidget
form.widget(subjects=TokenInputFieldWidget)
@@ -155,6 +158,8 @@ New fields
the search of elements to relate to.. if none parameter are passed, a tree
structure is shown in the widget::
+.. code-block::
+
from collective.z3cform.widgets.multicontent_search_widget import MultiContentSearchFieldWidget
form.widget(relatedItems=MultiContentSearchFieldWidget)
diff --git a/buildout.cfg b/buildout.cfg
index 75f06a3..d772ab7 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -9,18 +9,28 @@ package-extras = [test]
parts +=
code-analysis
+ createcoverage
i18ndude
node
omelette
rebuild_i18n-sh
[code-analysis]
+recipe = plone.recipe.codeanalysis
directory = ${buildout:directory}/src/collective/z3cform/widgets
-pre-commit-hook = True
+clean-lines = True
+clean-lines-exclude = ${buildout:directory}/src/collective/z3cform/widgets/static
csslint = True
-csslint-bin = ${buildout:directory}/bin/csslint
+csslint-bin = bin/csslint
deprecated-aliases = True
+flake8-extensions =
+# flake8-blind-except
+ flake8-coding
+ flake8-debugger
+# flake8-quotes
flake8-ignore = E501
+multiprocessing = True
+return-status-codes = False
[i18ndude]
recipe = zc.recipe.egg
@@ -29,3 +39,8 @@ eggs = i18ndude
[omelette]
recipe = collective.recipe.omelette
eggs = ${instance:eggs}
+
+[versions]
+plone.recipe.codeanalysis = 2.0b1
+# use latest version of setuptools
+setuptools =
diff --git a/src/collective/z3cform/widgets/configure.zcml b/src/collective/z3cform/widgets/configure.zcml
index 96a65ee..8f57bb8 100644
--- a/src/collective/z3cform/widgets/configure.zcml
+++ b/src/collective/z3cform/widgets/configure.zcml
@@ -53,9 +53,9 @@
provides="Products.GenericSetup.interfaces.EXTENSION"
/>
-
\ No newline at end of file
+
diff --git a/src/collective/z3cform/widgets/related_selected.pt b/src/collective/z3cform/widgets/related_selected.pt
index 8cffaef..c5d487c 100644
--- a/src/collective/z3cform/widgets/related_selected.pt
+++ b/src/collective/z3cform/widgets/related_selected.pt
@@ -4,7 +4,7 @@
-
+
Selected Item Title
diff --git a/src/collective/z3cform/widgets/simple_rich_text.py b/src/collective/z3cform/widgets/simple_rich_text.py
index 1468f73..0866b0f 100644
--- a/src/collective/z3cform/widgets/simple_rich_text.py
+++ b/src/collective/z3cform/widgets/simple_rich_text.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from zope.interface import classImplements
diff --git a/travis.cfg b/travis.cfg
deleted file mode 100644
index 5d445ca..0000000
--- a/travis.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-[versions]
-# XXX: Plone 4.2 compatibility
-collective.js.jqueryui = 1.8.16.9
-
-[buildout]
-extends =
- https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg
- https://raw.github.com/collective/buildout.plonetest/master/qa.cfg
- https://raw.github.com/plone/plone.app.robotframework/master/versions.cfg
-
-package-name = collective.z3cform.widgets
-package-extras = [test]
-package-min-coverage = 88
-test-eggs = Pillow
-
-parts +=
- createcoverage
- coverage-sh