Skip to content

Commit

Permalink
Merge branch 'master' into dictmulti3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
djay committed Mar 9, 2013
2 parents dbbd1d1 + 8704569 commit 797188e
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 3 deletions.
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
language: python
python:
- 2.6
- 2.7
- 3.3
install:
- pip install . --use-mirrors
script:
- python setup.py test -q
notifications:
email: false
9 changes: 8 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@
CHANGES
=======

3.0.0a2 (unreleased)
3.0.0a3 (unreleased)
--------------------

- Added support for IDict Widget in MultiWidget.


3.0.0a2 (2013-02-26)
--------------------

- The 3.0.0a1 release was missing some files (e.g. locales) due to an
incomplete MANIFEST.in.


3.0.0a1 (2013-02-24)
--------------------

Expand Down
6 changes: 5 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
global-include *.mo
include *.txt
recursive-include src/z3c/form *.zcml *.pt *.txt *.png *.dot *.ps
include bootstrap.py
include buildout.cfg
include dev.cfg
include tox.ini
recursive-include src/z3c/form *.zcml *.pt *.txt *.png *.dot *.ps *.po *.pot
recursive-include benchmark *.py
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def alltests():

setup(
name='z3c.form',
version='3.0.0a2.dev0',
version='3.0.0a3.dev0',
author="Stephan Richter, Roger Ineichen and the Zope Community",
author_email="zope-dev@zope.org",
description="An advanced form and widget framework for Zope 3",
Expand Down

0 comments on commit 797188e

Please sign in to comment.