[Python-modules-commits] r5793 - in packages/turbogears2/trunk/debian (11 files)
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Wed Jul 2 01:48:37 UTC 2008
Date: Wednesday, July 2, 2008 @ 01:48:35
Author: kov
Revision: 5793
modifying the package to handle TG2, removing obsolete patches and stuff like that
Added:
packages/turbogears2/trunk/debian/python-turbogears2.install
(from rev 5792, packages/turbogears2/trunk/debian/python-turbogears.install)
Modified:
packages/turbogears2/trunk/debian/README.Debian
packages/turbogears2/trunk/debian/changelog
packages/turbogears2/trunk/debian/control
packages/turbogears2/trunk/debian/copyright
Deleted:
packages/turbogears2/trunk/debian/NEWS.Debian
packages/turbogears2/trunk/debian/patches/01_disable_requirements.diff
packages/turbogears2/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff
packages/turbogears2/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff
packages/turbogears2/trunk/debian/patches/04_loosen_sqlobject_requirement.diff
packages/turbogears2/trunk/debian/python-turbogears.install
Deleted: packages/turbogears2/trunk/debian/NEWS.Debian
===================================================================
--- packages/turbogears2/trunk/debian/NEWS.Debian 2008-07-02 01:31:11 UTC (rev 5792)
+++ packages/turbogears2/trunk/debian/NEWS.Debian 2008-07-02 01:48:35 UTC (rev 5793)
@@ -1,12 +0,0 @@
-python-turbogears (1.0-1) unstable; urgency=low
-
- This is the first stable release of TurboGears. Those who have been
- using the preview versions will probably have already quickstarted
- their applications using an earlier version. If you did so before
- the 1.0b2 version (any Debian package version, in summary) and use
- SQLObject with the Identity framework you will hit a problem when
- starting your applications. See the "Upgrading from Preview versions"
- section of the README.Debian file for information on how to modify
- your application to make it work.
-
- -- Gustavo Noronha Silva <kov at debian.org> Fri, 5 Jan 2007 16:21:16 -0200
Modified: packages/turbogears2/trunk/debian/README.Debian
===================================================================
--- packages/turbogears2/trunk/debian/README.Debian 2008-07-02 01:31:11 UTC (rev 5792)
+++ packages/turbogears2/trunk/debian/README.Debian 2008-07-02 01:48:35 UTC (rev 5793)
@@ -13,107 +13,4 @@
extensions and specially applications. If you have comments or ideas,
please send them to my email: kov at debian.org.
-2. SQLObject vs SQLAlchemy
-
-SQLObject is the default ORM used by TurboGears; For the Debian
-packaging we are providing patches which make using SQLAlchemy as the
-primary ORM saner, though TG will prefer SQLObject if a working
-version is installed.
-
-3. Toolbox
-
-Two of the Toolbox tools are disabled if you're using SQLAlchemy, for
-they are not suppored by that backend yet: Catwalk and
-ModelDesigner. Yeah, I know. You can take advantage of those tools by
-installing and using SQLObject.
-
-4. Upgrading from Preview versions
-
-4.1. Visit framework model change
-
-This is the first stable release of TurboGears. Those who have been
-using the preview versions will probably have already quickstarted
-their applications using an earlier version. If you did so before
-the 1.0b2 version (any Debian package version, in summary) and use
-SQLObject with the Identity framework you will hit the following
-problem when starting your applications under this release:
-
--- code starts here --
- [...]
- File "turbogears/visit/api.py", line 144, in before_main
- visit= _manager.new_visit_with_key( visit_key )
- File "turbogears/visit/sovisit.py", line 44, in new_visit_with_key
- visit= visit_class( visit_key=visit_key,
- expiry=datetime.now() + self.timeout )
- File "sqlobject/declarative.py", line 94, in _wrapper
- return fn(self, *args, **kwargs)
- File "sqlobject/main.py", line 1214, in __init__
- self._create(id, **kw)
- File "sqlobject/main.py", line 1235, in _create
- raise TypeError, "%s() did not get expected keyword argument %s" % \
- (self.__class__.__name__, column.name)
- TypeError: VisitIdentity() did not get expected keyword argument user_id
--- code ends here --
-
-This is because the Visit framework model has been modified in the
-1.0b2 version, which eventually evolved into 1.0 proper. You will have
-to edit your model.py file manually. The VisitIdentity class became
-Visit, and has the following definition:
-
--- code starts here --
- class Visit(SQLObject):
- class sqlmeta:
- table = "visit"
-
- visit_key = StringCol(length=40, alternateID=True,
- alternateMethodName="by_visit_key")
- created = DateTimeCol(default=datetime.now)
- expiry = DateTimeCol()
-
- def lookup_visit(cls, visit_key):
- try:
- return cls.by_visit_key(visit_key)
- except SQLObjectNotFound:
- return None
- lookup_visit = classmethod(lookup_visit)
--- code ends here --
-
-After adding that to your model.py go to the
-<application>/config/app.cfg configuration file and change the
-visit.soprovider.model setting to point to <application>.model.Visit.
-Don't forget to run `tg-admin sql create' after you do all that
-to have the new table created in your database.
-
-This information has been gathered from Christopher Arndt's blog:
-http://paddyland.serveblog.net/article/14. Thanks! This information
-will probably show up afterwards at:
-
- http://www.turbogears.org/download/upgrade.html
-
-4.2. Problems viewing kid templates
-
-You may also hit the following problem:
-
--- code starts here --
- [...]
- File "/var/lib/python-support/python2.4/kid/filter.py", line 28, in apply_matches
- item = stream.expand()
- File "/var/lib/python-support/python2.4/kid/parser.py", line 103, in expand
- for ev, item in self._iter:
- File "/var/lib/python-support/python2.4/kid/parser.py", line 174, in _track
- for p in stream:
- File "/var/lib/python-support/python2.4/kid/parser.py", line 218, in _coalesce
- for ev, item in stream:
- File "/home/kov/src/application/application/templates/mytemplate.py", line 37, in _pull
- TypeError: generate_content() takes exactly 1 argument (2 given)
--- code ends here --
-
-This happens simply because your 'compiled' templates are incompatible
-with a newer kid version; all you need to do is remove all the .pyc
-files from the templates directory:
-
- $ rm <aplication>/templates/*pyc
-
-This should make it work again.
-
- -- Gustavo Noronha Silva <kov at debian.org>, Fri, 5 Jan 2007 17:38:18 -0200
+ -- Gustavo Noronha Silva <kov at debian.org>, Tue, 1 Jul 2008 22:42:24 -0300
Modified: packages/turbogears2/trunk/debian/changelog
===================================================================
--- packages/turbogears2/trunk/debian/changelog 2008-07-02 01:31:11 UTC (rev 5792)
+++ packages/turbogears2/trunk/debian/changelog 2008-07-02 01:48:35 UTC (rev 5793)
@@ -1,3 +1,9 @@
+turbogears2 (1.9.7~a2-1) unstable; urgency=low
+
+ * New, development release of the next major TG version
+
+ -- Gustavo Noronha Silva <kov at debian.org> Tue, 01 Jul 2008 22:33:38 -0300
+
turbogears (1.0.4.4-1) unstable; urgency=low
* New upstream release
Modified: packages/turbogears2/trunk/debian/control
===================================================================
--- packages/turbogears2/trunk/debian/control 2008-07-02 01:31:11 UTC (rev 5792)
+++ packages/turbogears2/trunk/debian/control 2008-07-02 01:48:35 UTC (rev 5793)
@@ -1,22 +1,22 @@
-Source: turbogears
+Source: turbogears2
Section: python
Priority: optional
Maintainer: Gustavo Noronha Silva <kov at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: python-support (>= 0.6.4), cdbs (>= 0.4.43), debhelper (>= 5.0.37.1), python-all, python-setuptools (>= 0.6b3), python-cherrypy (>= 2.3.0), python-cherrypy (<< 3.0.0), python-kid (>= 0.9), python-sqlalchemy (>= 0.3), python-sqlobject (>= 0.8), python (>= 2.5) | python-celementtree (>= 1.0.5-6), python-formencode (>= 0.7.1), python-pastedeploy (>= 0.5), python-pastescript (>= 1.6.1.1), python-paste, python-simplejson (>= 1.3), python-configobj (>= 4.3.2), python-dispatch (>= 0.5a.svn20080510), python-nose (>= 0.9.1), python-turbokid (>= 1.0.4), python-turbojson (>= 1.1.2), python-cheetah (>> 1.0), python-decoratortools
-Standards-Version: 3.7.3
+Build-Depends: python-support (>= 0.6.4), cdbs (>= 0.4.43), debhelper (>= 5.0.37.1), python-all, python-setuptools (>= 0.6b3), python-pylons (>= 0.9.7), python-nose (>= 0.9.1), python-babel-i18n, python-turbokid (>= 1.0.4), python-turbojson (>= 1.1.2)
+Standards-Version: 3.8.0
Homepage: http://www.turbogears.org/
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/turbogears/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/?op=log
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/turbogears2/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/turbogears2/trunk/?op=log
-Package: python-turbogears
+Package: python-turbogears2
Architecture: all
XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${misc:Depends}, python-cherrypy (>= 2.3.0), python-cherrypy (<< 3.0.0), python-kid (>= 0.9), python-sqlalchemy (>= 0.3) | python-sqlobject (>= 0.8), python (>= 2.5) | python-celementtree (>= 1.0.5-6), python-formencode (>= 0.7.1), python-pastedeploy (>= 0.5), python-pastescript (>= 1.6.1.1), python-paste, python-simplejson (>= 1.3), python-configobj (>= 4.3.2), python-dispatch (>= 0.5a.svn20080510), python-nose (>= 0.9.1), python-turbokid (>= 1.0.4), python-turbojson (>= 1.1.2), python-cheetah (>> 1.0), python-pkg-resources (>= 0.6b3), python-decoratortools
+Depends: ${python:Depends}, ${misc:Depends}, python-pylons (>= 0.9.7), python-nose (>= 0.9.1), python-babel-i18n, python-turbokid (>= 1.0.4), python-turbojson (>= 1.1.2)
Recommends: python-pysqlite2 (>= 2.3.0), python-elixir
Suggests: python-genshi
Description: Python-based web framework
- TurboGears takes the best components available and combines them into
+ TurboGears2 takes the best components available and combines them into
one easy-to-install, documented whole. TurboGears includes parts that
join the pieces together and make them work together seamlessly, but
doesn't obscure each included project. This allows you to take
@@ -24,9 +24,5 @@
other resources that have built up in the communities for each
project.
.
- TurboGears glues together the following components:
- .
- * CherryPy
- * SQLObject / SQLAlchemy
- * Kid
- * Mochikit
+ TurboGears2 is the next major version of TurboGears, and builds on
+ the Pylons framework.
Modified: packages/turbogears2/trunk/debian/copyright
===================================================================
--- packages/turbogears2/trunk/debian/copyright 2008-07-02 01:31:11 UTC (rev 5792)
+++ packages/turbogears2/trunk/debian/copyright 2008-07-02 01:48:35 UTC (rev 5793)
@@ -3,11 +3,18 @@
It was downloaded from http://www.turbogears.org/
+Authors:
+ Mark Ramm
+ Jonathan LaCour
+ Rick Copland
+ Alberto Vargas
+ and the TurboGears community
+
Copyright:
TurboGears has the folowing copyright:
-Copyright (c) 2005, 2006 Kevin Dangoor and contributors.
+Copyright (c) 2005-2007 Kevin Dangoor and contributors.
TurboGears is a trademark of Kevin Dangoor.
License:
Deleted: packages/turbogears2/trunk/debian/patches/01_disable_requirements.diff
===================================================================
--- packages/turbogears2/trunk/debian/patches/01_disable_requirements.diff 2008-07-02 01:31:11 UTC (rev 5792)
+++ packages/turbogears2/trunk/debian/patches/01_disable_requirements.diff 2008-07-02 01:48:35 UTC (rev 5793)
@@ -1,18 +0,0 @@
---- setup.py.old 2008-01-01 19:18:41.000000000 -0200
-+++ setup.py 2008-01-01 19:20:08.000000000 -0200
-@@ -1,5 +1,5 @@
--from ez_setup import use_setuptools
--use_setuptools()
-+#from ez_setup import use_setuptools
-+#use_setuptools()
- from setuptools import setup, find_packages
- from pkg_resources import DistributionNotFound
-
-@@ -21,7 +21,6 @@
- "RuleDispatch >= 0.5a0.dev-r2303",
- "setuptools >= 0.6c2",
- "simplejson >= 1.3",
-- "TurboCheetah >= 1.0",
- "TurboJson >= 1.1.2",
- "TurboKid >= 1.0.4",
- ]
Deleted: packages/turbogears2/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff
===================================================================
--- packages/turbogears2/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff 2008-07-02 01:31:11 UTC (rev 5792)
+++ packages/turbogears2/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff 2008-07-02 01:48:35 UTC (rev 5793)
@@ -1,24 +0,0 @@
---- turbogears/command/quickstart.py.orig 2008-03-07 17:53:54.000000000 -0300
-+++ turbogears/command/quickstart.py 2008-05-10 17:06:33.000000000 -0300
-@@ -128,9 +128,19 @@
- parser = optparse.OptionParser(
- usage="%prog quickstart [options] [project name]",
- version="%prog " + version)
-+ # Debian hack to make sqlalchemy the default if the
-+ # required version of sqlobject is not available
-+ try:
-+ pkg_resources.require (str(get_requirement('sqlobject')))
-+ debsqlalchemy = False
-+ except:
-+ print 'Warning: using SQLAlchemy since your version of SQLObject does not meet the requirements: ',
-+ print str(get_requirement('sqlobject'))
-+ debsqlalchemy = True
- parser.add_option("-s", "--sqlalchemy",
-- help="use SQLAlchemy instead of SQLObject",
-- action="store_true", dest="sqlalchemy", default = False)
-+ help="use SQLAlchemy instead of SQLObject",
-+ action="store_true", dest="sqlalchemy", default = debsqlalchemy)
-+ # end of Debian hack
- parser.add_option("-e", "--elixir",
- help="use SQLAlchemy Elixir instead of SQLObject",
- action="store_true", dest="elixir", default = False)
Deleted: packages/turbogears2/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff
===================================================================
--- packages/turbogears2/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff 2008-07-02 01:31:11 UTC (rev 5792)
+++ packages/turbogears2/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff 2008-07-02 01:48:35 UTC (rev 5793)
@@ -1,28 +0,0 @@
---- turbogears/command/base.py.orig 2008-03-03 18:30:58.000000000 -0300
-+++ turbogears/command/base.py 2008-05-10 11:18:51.000000000 -0300
-@@ -47,6 +47,8 @@
- development or installed project."""
- load_project_config(self.config)
- self.dburi = config.get("sqlobject.dburi", None)
-+ if not self.dburi:
-+ self.dburi = config.get("sqlalchemy.dburi", None)
- if self.dburi and self.dburi.startswith("notrans_"):
- self.dburi = self.dburi[8:]
-
-@@ -276,8 +278,14 @@
- if 'global' in conf:
- config.update({'global': conf['global']})
-
-- root = SecureObject(toolbox.Toolbox(), from_any_host(self.hostlist),
-- exclude=['noaccess'])
-+ tb = toolbox.Toolbox()
-+ # Disable tools which need SQLObject if it is not being used
-+ if conf.get('global').get('sqlobject.dburi', None) is None:
-+ for tool in tb.toolbox:
-+ if tool['label'] == 'CatWalk' or tool['label'] == 'ModelDesigner':
-+ tool['disabled'] = True
-+ root = SecureObject(tb, from_any_host(self.hostlist),
-+ exclude=['noaccess'])
-
- cherrypy.tree.mount(root, "/")
-
Deleted: packages/turbogears2/trunk/debian/patches/04_loosen_sqlobject_requirement.diff
===================================================================
--- packages/turbogears2/trunk/debian/patches/04_loosen_sqlobject_requirement.diff 2008-07-02 01:31:11 UTC (rev 5792)
+++ packages/turbogears2/trunk/debian/patches/04_loosen_sqlobject_requirement.diff 2008-07-02 01:48:35 UTC (rev 5793)
@@ -1,11 +0,0 @@
---- setup.py~ 2008-03-03 18:30:58.000000000 -0300
-+++ setup.py 2008-05-10 18:01:37.000000000 -0300
-@@ -39,7 +39,7 @@
- ]
- else:
- sqlobject = [
-- "SQLObject>=0.8,<=0.10.0"
-+ "SQLObject>=0.8"
- ]
-
- sqlalchemy = [
Deleted: packages/turbogears2/trunk/debian/python-turbogears.install
===================================================================
--- packages/turbogears2/trunk/debian/python-turbogears.install 2008-07-02 01:31:11 UTC (rev 5792)
+++ packages/turbogears2/trunk/debian/python-turbogears.install 2008-07-02 01:48:35 UTC (rev 5793)
@@ -1 +0,0 @@
-newdocs/docs/* usr/share/doc/python-turbogears/docs
Copied: packages/turbogears2/trunk/debian/python-turbogears2.install (from rev 5792, packages/turbogears2/trunk/debian/python-turbogears.install)
===================================================================
--- packages/turbogears2/trunk/debian/python-turbogears2.install (rev 0)
+++ packages/turbogears2/trunk/debian/python-turbogears2.install 2008-07-02 01:48:35 UTC (rev 5793)
@@ -0,0 +1 @@
+newdocs/docs/* usr/share/doc/python-turbogears/docs
Property changes on: packages/turbogears2/trunk/debian/python-turbogears2.install
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the Python-modules-commits
mailing list