Skip to content
Browse files

Implement IDefaultWorkflow. Don't duplicate test requirements, depend…

… on Kotti's instead.
  • Loading branch information...
1 parent 2ee20fc commit 1ddca07170b43b5fc921afa7a26a89b4c4e713cb @disko disko committed Jan 5, 2013
Showing with 14 additions and 19 deletions.
  1. +4 −1 CHANGES.txt
  2. +2 −2 README.rst
  3. +4 −0 kotti_contactform/resources.py
  4. +1 −1 setup.cfg
  5. +3 −15 setup.py
View
5 CHANGES.txt
@@ -4,8 +4,11 @@ History
0.2 - Unreleased
----------------
+- Implement IDefaultworkflow.
- Add an additional one column layout for the contact form view.
-- Use decorators for view config
+- Use decorators for view config.
+- Add fanstatic filter to development.ini.
+
0.1.1 - 2012-12-28
------------------
View
4 README.rst
@@ -9,8 +9,8 @@ to your site. |build status|_
Development happens at https://github.com/Kotti/kotti_contactform
-.. |build status| image:: https://secure.travis-ci.org/chrneumann/kotti_contactform.png?branch=master
-.. _build status: http://travis-ci.org/chrneumann/kotti_contactform
+.. |build status| image:: https://secure.travis-ci.org/Kotti/kotti_contactform.png?branch=master
+.. _build status: http://travis-ci.org/Kotti/kotti_contactform
.. _Find out more about Kotti: http://pypi.python.org/pypi/Kotti
Setup
View
4 kotti_contactform/resources.py
@@ -1,10 +1,12 @@
+from kotti.interfaces import IDefaultWorkflow
from kotti.resources import Content
from sqlalchemy import Boolean
from sqlalchemy import Column
from sqlalchemy import ForeignKey
from sqlalchemy import Integer
from sqlalchemy import String
from sqlalchemy import Text
+from zope.interface import implements
from kotti_contactform import _
@@ -14,6 +16,8 @@ class ContactForm(Content):
__tablename__ = 'contact_forms'
__mapper_args__ = dict(polymorphic_identity='contact_form')
+ implements(IDefaultWorkflow)
+
id = Column('id', Integer, ForeignKey('contents.id'), primary_key=True)
recipient = Column(String(255), nullable=False)
body = Column(Text)
View
2 setup.cfg
@@ -35,4 +35,4 @@ markers =
pep8ignore = E501 E122 E123 E125 E128 E711
[aliases]
-dev = develop easy_install kotti_contactform[testing]
+dev = develop easy_install kotti[testing] kotti[development]
View
18 setup.py
@@ -13,16 +13,6 @@
'alembic',
]
-tests_require = [
- 'WebTest',
- 'mock',
- 'pytest',
- 'pytest-cov',
- 'pytest-pep8==1.0.2',
- 'pytest-xdist',
- 'wsgi_intercept',
- 'zope.testbrowser',
-]
setup(name='kotti_contactform',
version='0.2dev',
@@ -31,7 +21,7 @@
keywords='kotti contact form',
maintainer='Christian Neumann',
maintainer_email='cneumann@datenkarussell.de',
- url='http://pypi.python.org/pypi/kotti_contactform',
+ url='https://github.com/Kotti/kotti_contactform',
classifiers=[
"Development Status :: 4 - Beta",
"Programming Language :: Python",
@@ -48,10 +38,8 @@
include_package_data=True,
zip_safe=False,
install_requires=install_requires,
- extras_require={
- 'testing': tests_require,
- },
- message_extractors={"kotti_events": [
+ extras_require={},
+ message_extractors={"kotti_contactform": [
("**.py", "lingua_python", None),
("**.pt", "lingua_xml", None),
]},

0 comments on commit 1ddca07

Please sign in to comment.
Something went wrong with that request. Please try again.