Changeset 3777

Timestamp:

11/27/07 17:00:55 (1 year ago)

Author:

deets

Message:

applied patch for #1501/#1620 + removed a SO depencecy in the designer

Files:

• branches/1.1/setup.py (modified) (4 diffs)
• branches/1.1/turbogears/command/quickstart.py (modified) (5 diffs)
• branches/1.1/turbogears/qstemplates/quickstart/+package+/controllers.py_tmpl (modified) (1 diff)
• branches/1.1/turbogears/qstemplates/quickstart/setup.py_tmpl (modified) (2 diffs)
• branches/1.1/turbogears/toolbox/designer/__init__.py (modified) (1 diff)

branches/1.1/setup.py

@@ -31 +31 @@
-    "TurboKid >= 1.0.4",
-]
+
+
-if sys.version_info < (2, 5):
-compat.append("SQLObject>=0.7.1,<0.10dev")
+sqlobject = ["SQLObject>=0.7.1,<0.10dev"]
-else:
-compat.append("SQLObject>=0.8,<0.10dev")
+sqlobject = ["SQLObject>=0.8,<0.10dev"]
-
-exp = ["TGFastData"]
@@ -40 +42 @@
-future = []
-
-tandard
+qlalchemy
-    "Elixir >= 0.4.0",
-    "SQLAlchemy >= 0.3.10",
@@ -51 +53 @@
-tgtesttools =  [
-    "nose >= 0.9.3,<=0.10.0a1",
- + standard
+
-
-# python 2.5 compatible list
@@ -153 +155 @@
-        "compat": compat,
-        "exp" : exp,
-
+
+
-        "future" : future,
-        "testtools" : testtools,

branches/1.1/turbogears/command/quickstart.py

@@ -101 +101 @@
-
-
+def get_requirement(name):
+    dist = pkg_resources.get_distribution("TurboGears")
+    with_reqs = set(dist.requires((name,)))
+    without_reqs = set(dist.requires())
+    reqs = with_reqs - without_reqs
+    try:
+        return [r for r in reqs if r.project_name.lower() == name][0]
+    except IndexError:
+        raise ValueError("Did not find matching %s requirement in the TurboGears setup.py:extras_require." % name)
+
+
-class quickstart:
-    "Implementation of quickstart."
@@ -224 +235 @@
-        cmd_args.append("identity=%s" % self.identity)
-        cmd_args.append("package=%s" % self.package)
+        # set the exact ORM-version for the proper requirements
+        # it's extracted from our own requirements, so looking
+        # them up must be in sync (there must be the extras_require named sqlobject/sqlalchemy)
+        if self.sqlobject:
+            sqlobjectversion = str(get_requirement('sqlobject'))
+            cmd_args.append("sqlobjectversion=%s" % sqlobjectversion)
+
+        if self.sqlalchemy:
+            sqlalchemyversion = str(get_requirement('sqlalchemy'))
+            cmd_args.append("sqlalchemyversion=%s" % sqlalchemyversion)
+
-        command.run(cmd_args)
-
@@ -242 +264 @@
-                except OSError:
-                    pass
+
-            startscript = "start-%s.py" % self.package
-            if os.path.exists(startscript):
@@ -290 +313 @@
-        options, args = parser.parse_args()
-        self.__dict__.update(options.__dict__)
-        self.turbogearsversion = version
-
-    def run(self):
@@ -338 +360 @@
-        cmd_args.append("identity=%s" % self.identity)
-        cmd_args.append("package=%s" % self.package)
+        # set the exact ORM-version for the proper requirements
+        # it's extracted from our own requirements, so looking
+        # them up must be in sync (there must be the extras_require named sqlobject/sqlalchemy)
+        if self.sqlobject:
+            sqlobjectversion = str(get_requirement('sqlobject'))
+            cmd_args.append("sqlobjectversion=%s" % sqlobjectversion)
+
+        if self.sqlalchemy:
+            sqlalchemyversion = str(get_requirement('sqlalchemy'))
+            cmd_args.append("sqlalchemyversion=%s" % sqlalchemyversion)
+
-        command.run(cmd_args)
-

branches/1.1/turbogears/qstemplates/quickstart/+package+/controllers.py_tmpl

@@ -1 +1 @@
-from turbogears import controllers, expose, flash
-# from model import *
+#if $sqlobject == 'True'
+import pkg_resources
+try:
+    pkg_resources.require("$sqlobjectversion")
+except pkg_resources.DistributionNotFound:
+    import sys
+    print >> sys.stderr, """You are required to install SQLObject but appear not to have done so. 
+Please run your projects setup.py or run `easy_install SQLObject`.
+
+"""
+    sys.exit(1)
+#end if
+#if $sqlalchemy == 'True'
+import pkg_resources
+try:
+    pkg_resources.require("$sqlalchemyversion")
+except pkg_resources.DistributionNotFound:
+    import sys
+    print >> sys.stderr, """You are required to install SQLAlchemy but appear not to have done so. 
+Please run your projects setup.py or run `easy_install SQLAlchemy`.
+
+"""
+    sys.exit(1)
+#end if
-#if $identity != "none"
-from turbogears import identity, redirect

branches/1.1/turbogears/qstemplates/quickstart/setup.py_tmpl

@@ -18 +18 @@
-    name="${project}",
-    version=version,
-
-    # uncomment the following lines if you fill them out in release.py
-    #description=description,
@@ -29 +28 @@
-    install_requires=[
-        "TurboGears >= ${turbogearsversion}",
-
-
+
+
+
+
+
-#end if
-    ],

branches/1.1/turbogears/toolbox/designer/__init__.py

@@ -7 +7 @@
-from turbogears import controllers
-import cherrypy
-import sqlobject
-import pkg_resources
+
+try:
+    import sqlobject
+except:
+    import warnings
+    warnings.warn("SQLObject is missing, toolbox designer won't work")
-
-model_template = """from datetime import datetime