[Checkins] SVN: megrok.rdb/trunk/ Stop depending on Grok directly, depend on grokcore.component instead.
Martijn Faassen
faassen at startifact.com
Fri Aug 14 11:04:54 EDT 2009
Log message for revision 102774:
Stop depending on Grok directly, depend on grokcore.component instead.
Note that 'Fields' was taken out of the public interface as a result,
and grok.interfaces.IContainer was re-defined by megrok.rdb.
Changed:
_U megrok.rdb/trunk/
U megrok.rdb/trunk/README.txt
U megrok.rdb/trunk/buildout.cfg
U megrok.rdb/trunk/setup.py
U megrok.rdb/trunk/src/megrok/rdb/README.txt
U megrok.rdb/trunk/src/megrok/rdb/__init__.py
U megrok.rdb/trunk/src/megrok/rdb/components.py
U megrok.rdb/trunk/src/megrok/rdb/interfaces.py
U megrok.rdb/trunk/src/megrok/rdb/schema.py
U megrok.rdb/trunk/src/megrok/rdb/schema.txt
U megrok.rdb/trunk/src/megrok/rdb/tests/creation.py
U megrok.rdb/trunk/src/megrok/rdb/tests/explicittable.py
U megrok.rdb/trunk/src/megrok/rdb/tests/location.py
U megrok.rdb/trunk/src/megrok/rdb/tests/polymorphic.py
U megrok.rdb/trunk/src/megrok/rdb/tests/reflection.py
U megrok.rdb/trunk/src/megrok/rdb/tests/tableargs.py
-=-
Property changes on: megrok.rdb/trunk
___________________________________________________________________
Modified: svn:externals
- z3c.saconfig svn://svn.zope.org/repos/main/z3c.saconfig/trunk
+
Modified: megrok.rdb/trunk/README.txt
===================================================================
--- megrok.rdb/trunk/README.txt 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/README.txt 2009-08-14 15:04:53 UTC (rev 102774)
@@ -1,4 +1,6 @@
-Introduction
-============
+megrok.rdb
+==========
+See src/megrok/rdb/README.txt
+
Modified: megrok.rdb/trunk/buildout.cfg
===================================================================
--- megrok.rdb/trunk/buildout.cfg 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/buildout.cfg 2009-08-14 15:04:53 UTC (rev 102774)
@@ -1,13 +1,7 @@
[buildout]
-develop = . z3c.saconfig
+develop = .
parts = test
-newest = false
-extends = http://grok.zope.org/releaseinfo/grok-0.13.cfg
-versions = versions
-[versions]
-zc.recipe.testrunner = 1.0.0
-
[test]
recipe = zc.recipe.testrunner
eggs = megrok.rdb
Modified: megrok.rdb/trunk/setup.py
===================================================================
--- megrok.rdb/trunk/setup.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/setup.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -3,10 +3,12 @@
version = '0.1'
+long_description = ''
+
setup(name='megrok.rdb',
version=version,
description="SQLAlchemy based RDB support for Grok.",
- long_description=open("README.txt").read(),
+ long_description=long_description,
# Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers
classifiers=[
"Programming Language :: Python",
@@ -30,11 +32,11 @@
'zope.event',
'zope.location',
'grokcore.component',
- 'martian',
- 'grok >= 0.13',
+ 'zope.app.container', # want to depend on zope.container directly but can't yet to retain grok compatibility
+ 'martian < 0.12', # 0.12 is too new for grokcore.component..
'SQLAlchemy > 0.5beta2',
'zope.sqlalchemy',
- 'z3c.saconfig >= 0.1',
+ 'z3c.saconfig >= 0.9',
],
entry_points="""
# -*- Entry points: -*-
Modified: megrok.rdb/trunk/src/megrok/rdb/README.txt
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/README.txt 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/README.txt 2009-08-14 15:04:53 UTC (rev 102774)
@@ -104,12 +104,12 @@
First we grok this package's grokkers::
- >>> import grok.testing
- >>> grok.testing.grok('megrok.rdb.meta')
+ >>> import grokcore.component.testing
+ >>> grokcore.component.testing.grok('megrok.rdb.meta')
Now we can grok the components::
- >>> from grok.testing import grok_component
+ >>> from grokcore.component.testing import grok_component
>>> grok_component('Courses', Courses)
True
>>> grok_component('Department', Department)
Modified: megrok.rdb/trunk/src/megrok/rdb/__init__.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/__init__.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/__init__.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -1,5 +1,5 @@
from megrok.rdb.components import Model, Container, QueryContainer
-from megrok.rdb.schema import Fields
+#from megrok.rdb.schema import Fields
from megrok.rdb.directive import (key, metadata, tablename, reflected, table,
tableargs, polymorphic_on, inherits,
polymorphic_identity)
Modified: megrok.rdb/trunk/src/megrok/rdb/components.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/components.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/components.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -5,7 +5,7 @@
from zope.location.interfaces import ILocation
from grokcore.component import Context
-from grok.interfaces import IContainer
+from megrok.rdb.interfaces import IContainer
from megrok.rdb import directive
from z3c.saconfig import Session
Modified: megrok.rdb/trunk/src/megrok/rdb/interfaces.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/interfaces.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/interfaces.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -1,8 +1,13 @@
from zope.interface import Interface, Attribute, implements
from zope.app.container.interfaces import IContainer as IContainerBase
+from grokcore.component.interfaces import IContext
-class IContainer(IContainerBase):
+# FIXME: this doesn't depend on grok.interfaces.IContainer. If something
+# is registered directly for those containers, it won't show up for
+# this IContainer... Want to avoid directly having to depend on Grok
+# with megrok.rdb however
+class IContainer(IContext, IContainerBase):
def set(value):
"""Add a new value to the container without having to specify the key.
Modified: megrok.rdb/trunk/src/megrok/rdb/schema.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/schema.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/schema.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -1,4 +1,5 @@
-import grok
+#import grok
+import grokcore.component
from zope.schema.interfaces import IField
from zope.interface import Interface
from zope.interface.interface import InterfaceClass
@@ -10,8 +11,8 @@
from zope.schema import Text
from zope.schema import TextLine
-def Fields(model):
- return grok.Fields(schema_from_model(model))
+#def Fields(model):
+# return grok.Fields(schema_from_model(model))
def schema_from_model(model):
table = model.__table__
@@ -32,14 +33,14 @@
attrs=attrs,
__doc__='Generated from metadata')
- at grok.adapter(String)
- at grok.implementer(IField)
+ at grokcore.component.adapter(String)
+ at grokcore.component.implementer(IField)
def field_from_sa_string(s):
return TextLine(__name__ = u'__dummy__',
title = u'__dummy__')
- at grok.adapter(Integer)
- at grok.implementer(IField)
+ at grokcore.component.adapter(Integer)
+ at grokcore.component.implementer(IField)
def field_from_sa_integer(i):
return Int(__name__ = u'__dummy__',
title = u'__dummy__')
Modified: megrok.rdb/trunk/src/megrok/rdb/schema.txt
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/schema.txt 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/schema.txt 2009-08-14 15:04:53 UTC (rev 102774)
@@ -21,11 +21,11 @@
Let's grok the ``Department`` class now::
- >>> from grok.testing import grok
+ >>> from grokcore.component.testing import grok
>>> grok('megrok.rdb.meta')
>>> grok('megrok.rdb.schema')
>>> __file__ = 'foo' # hack
- >>> from grok.testing import grok_component
+ >>> from grokcore.component.testing import grok_component
>>> grok_component('Department', Department)
True
Modified: megrok.rdb/trunk/src/megrok/rdb/tests/creation.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/tests/creation.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/tests/creation.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -4,7 +4,7 @@
Let's first grok things::
- >>> from grok.testing import grok
+ >>> from grokcore.component.testing import grok
>>> grok('megrok.rdb.meta')
>>> grok(__name__)
@@ -60,8 +60,6 @@
3 Metaphysics Philosophy
"""
-
-import grok
from megrok import rdb
from sqlalchemy import Column, ForeignKey
Modified: megrok.rdb/trunk/src/megrok/rdb/tests/explicittable.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/tests/explicittable.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/tests/explicittable.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -3,7 +3,7 @@
Let's first grok things::
- >>> from grok.testing import grok
+ >>> from grokcore.component.testing import grok
>>> grok('megrok.rdb.meta')
>>> grok(__name__)
@@ -33,7 +33,6 @@
"""
-import grok
from megrok import rdb
from sqlalchemy import (Table, Column, MetaData, Integer, Unicode)
Modified: megrok.rdb/trunk/src/megrok/rdb/tests/location.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/tests/location.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/tests/location.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -4,7 +4,7 @@
Let's first grok things::
- >>> from grok.testing import grok
+ >>> from grokcore.component.testing import grok
>>> grok('megrok.rdb.meta')
>>> grok(__name__)
@@ -69,8 +69,6 @@
"""
-
-import grok
from megrok import rdb
from sqlalchemy import Column, ForeignKey
Modified: megrok.rdb/trunk/src/megrok/rdb/tests/polymorphic.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/tests/polymorphic.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/tests/polymorphic.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -1,6 +1,6 @@
import unittest
-import grok.testing
+import grokcore.component.testing
from megrok import rdb
@@ -9,7 +9,7 @@
class Polymorphic(unittest.TestCase):
def setUp(self):
- grok.testing.grok('megrok.rdb.meta')
+ grokcore.component.testing.grok('megrok.rdb.meta')
from megrok.rdb.testing import configureEngine
engine = configureEngine()
@@ -52,8 +52,8 @@
rdb.inherits(Content)
rdb.polymorphic_identity('person')
- grok.testing.grok_component('Content', Content)
- grok.testing.grok_component('Person', Person)
+ grokcore.component.testing.grok_component('Content', Content)
+ grokcore.component.testing.grok_component('Person', Person)
# this has to be called after classes are grokked
rdb.setupDatabase(metadata)
Modified: megrok.rdb/trunk/src/megrok/rdb/tests/reflection.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/tests/reflection.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/tests/reflection.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -4,7 +4,7 @@
Let's first grok things::
- >>> from grok.testing import grok
+ >>> from grokcore.component.testing import grok
>>> grok('megrok.rdb.meta')
>>> grok(__name__)
@@ -68,7 +68,6 @@
"""
-import grok
from megrok import rdb
from sqlalchemy import Column, ForeignKey
Modified: megrok.rdb/trunk/src/megrok/rdb/tests/tableargs.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/tests/tableargs.py 2009-08-14 14:47:53 UTC (rev 102773)
+++ megrok.rdb/trunk/src/megrok/rdb/tests/tableargs.py 2009-08-14 15:04:53 UTC (rev 102774)
@@ -2,7 +2,7 @@
from megrok import rdb
-import grok.testing
+import grokcore.component.testing
from sqlalchemy import Column
from sqlalchemy.types import Integer
@@ -10,14 +10,14 @@
class TableArgs(unittest.TestCase):
def setUp(self):
- grok.testing.grok('megrok.rdb.meta')
+ grokcore.component.testing.grok('megrok.rdb.meta')
def test_no_tableargs(self):
class MyClass(rdb.Model):
rdb.metadata(rdb.MetaData())
id = Column(Integer, primary_key=True)
- grok.testing.grok_component('MyClass', MyClass)
+ grokcore.component.testing.grok_component('MyClass', MyClass)
self.assert_(not hasattr(MyClass, '__table_args__'))
def test_empty_tableargs(self):
@@ -26,7 +26,7 @@
id = Column(Integer, primary_key=True)
rdb.tableargs()
- grok.testing.grok_component('MyClass', MyClass)
+ grokcore.component.testing.grok_component('MyClass', MyClass)
self.assert_(not hasattr(MyClass, '__table_args__'))
def test_non_keyword_tableargs(self):
@@ -35,7 +35,7 @@
rdb.tableargs(ForeignKeyConstraint(['id'], ['whah.id']))
id = Column(Integer, primary_key=True)
- grok.testing.grok_component('MyClass', MyClass)
+ grokcore.component.testing.grok_component('MyClass', MyClass)
arg, kw = MyClass.__table_args__
self.assert_(isinstance(arg, ForeignKeyConstraint))
self.assertEquals({}, kw)
@@ -46,7 +46,7 @@
rdb.tableargs(schema='bar')
id = Column(Integer, primary_key=True)
- grok.testing.grok_component('MyClass', MyClass)
+ grokcore.component.testing.grok_component('MyClass', MyClass)
self.assertEquals({'schema': 'bar'}, MyClass.__table_args__)
def test_both_tableargs(self):
@@ -56,7 +56,7 @@
schema='bar')
id = Column(Integer, primary_key=True)
- grok.testing.grok_component('MyClass', MyClass)
+ grokcore.component.testing.grok_component('MyClass', MyClass)
arg = MyClass.__table_args__[:-1]
kw = MyClass.__table_args__[-1]
self.assertEquals(1, len(arg))
More information about the Checkins
mailing list