Merge branch 'development' of ssh://git.code.sf.net/p/turbogears2/tg2…

…devtools into development
TurboGears · Apr 11, 2012 · cd4e933 · cd4e933
2 parents 1247799 + 1e5f448
commit cd4e933
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 23 deletions.
diff --git a/devtools/templates/turbogears-minimal/setup.py_tmpl b/devtools/templates/turbogears-minimal/setup.py_tmpl
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#quckstarted Options:
+#quickstarted Options:
 #
 # sqlalchemy: {{sqlalchemy}}
 # auth:       {{auth}}
@@ -14,10 +14,6 @@ except ImportError:
     use_setuptools()
     from setuptools import setup, find_packages
 
-import sys
-if sys.version_info[:2] == (2,4):
-    testpkgs.extend(['hashlib', 'pysqlite'])
-
 setup(
     name='{{project}}',
     version='0.1',
@@ -26,7 +22,7 @@ setup(
     author_email='',
     #url='',
     install_requires=[
-        "TurboGears2 >= 2.1",
+        "TurboGears2 >= 2.2.0rc1",
         {{if mako == 'True'}}
         "Mako",
         {{else}}
@@ -83,6 +79,6 @@ setup(
     main = pylons.util:PylonsInstaller
     """,
     dependency_links=[
-        "http://www.turbogears.org/2.1/downloads/current"
+        "http://tg.gy/beta"
         ]
 )
diff --git a/devtools/templates/turbogears/setup.cfg_tmpl b/devtools/templates/turbogears/setup.cfg_tmpl
@@ -47,6 +47,6 @@ onepass = true
 [aliases]
 # A handy alias to make a release to pypi
 release = egg_info -RDb "" sdist bdist_egg register upload
-{{package}}develop = develop -i http://tg.gy/current
+{{package}}develop = develop -i http://tg.gy/beta
-{{package}}deps = easy_install -i http://tg.gy/current AddOns BytecodeAssembler Chameleon coverage DecoratorTools Extremes Genshi Jinja2 Kajiki kid PEAK_Rules repoze.tm2 repoze.what repoze.what.plugins.sql repoze.what_pylons repoze.what_quickstart repoze.who repoze.who_friendlyform repoze.who.plugins.sa repoze.who_testutil simplegeneric sprox SQLAlchemy SymbolType tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms zope.interface zope.sqlalchemy
+{{package}}deps = easy_install -i http://tg.gy/beta AddOns BytecodeAssembler Chameleon coverage DecoratorTools Extremes Genshi Jinja2 Kajiki kid PEAK_Rules repoze.tm2 repoze.what repoze.what.plugins.sql repoze.what_pylons repoze.what_quickstart repoze.who repoze.who_friendlyform repoze.who.plugins.sa repoze.who_testutil simplegeneric sprox SQLAlchemy SymbolType tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms zope.interface zope.sqlalchemy
-tgupgrade = easy_install -i http://tg.gy/current -U AddOns Babel Beaker BytecodeAssembler Chameleon coverage decorator DecoratorTools Extremes Genshi Jinja2 Kajiki kid Mako MarkupSafe nose Paste PasteDeploy PasteScript PEAK_Rules Pygments Pylons repoze.tm2 repoze.what repoze.what.plugins.sql repoze.what_pylons repoze.what_quickstart repoze.who repoze.who_friendlyform repoze.who.plugins.sa repoze.who_testutil simplegeneric simplejson sprox SQLAlchemy SymbolType Tempita tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms WebError WebFlash WebHelpers WebOb WebTest zope.interface zope.sqlalchemy
+tgupgrade = easy_install -i http://tg.gy/beta -U AddOns Babel Beaker BytecodeAssembler Chameleon coverage decorator DecoratorTools Extremes Genshi Jinja2 Kajiki kid Mako MarkupSafe nose Paste PasteDeploy PasteScript PEAK_Rules Pygments Pylons repoze.tm2 repoze.what repoze.what.plugins.sql repoze.what_pylons repoze.what_quickstart repoze.who repoze.who_friendlyform repoze.who.plugins.sa repoze.who_testutil simplegeneric simplejson sprox SQLAlchemy SymbolType Tempita tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms WebError WebFlash WebHelpers WebOb WebTest zope.interface zope.sqlalchemy
diff --git a/devtools/templates/turbogears/setup.py_tmpl b/devtools/templates/turbogears/setup.py_tmpl
@@ -23,7 +23,7 @@ testpkgs=['WebTest >= 1.2.3',
                'repoze.who-testutil >= 1.0.1',
                ]
 install_requires=[
-    "TurboGears2 >= 2.1.4",
+    "TurboGears2 >= 2.2.0rc1",
     {{if mako == 'True'}}
     "Mako",
     {{elif jinja == 'True'}}
@@ -62,12 +62,6 @@ install_requires=[
     {{endif}}
     ]
 
-if sys.version_info[:2] == (2,4):
-    testpkgs.extend(['hashlib', 'pysqlite'])
-    install_requires.extend(['hashlib', 'pysqlite'])
-
-print install_requires
-
 setup(
     name='{{project}}',
     version='0.1',
@@ -102,7 +96,7 @@ setup(
     main = pylons.util:PylonsInstaller
     """,
     dependency_links=[
-        "http://www.turbogears.org/2.1/downloads/current/"
+        "http://tg.gy/beta"
         ],
     zip_safe=False
 )
diff --git a/setup.cfg b/setup.cfg
@@ -2,9 +2,9 @@
 # A handy alias to make a release to pypi
 release = egg_info -RDb "" sdist bdist_egg register upload
 # A handy alias to install for development
-tgdevelop = develop -i http://www.turbogears.org/2.1/downloads/development/index/
+tgdevelop = develop -i http://tg.gy/beta/
 # Another alias for installing all possible requirements for testing
-tgtesting = easy_install -i http://www.turbogears.org/2.1/downloads/development/index/ AddOns BytecodeAssembler Chameleon coverage DecoratorTools Extremes Genshi Jinja2 Kajiki kid nose PEAK_Rules repoze.tm2 repoze.what repoze.what.plugins.sql repoze.what_pylons repoze.what_quickstart repoze.who repoze.who_friendlyform repoze.who.plugins.sa repoze.who_testutil simplegeneric sprox SQLAlchemy SymbolType tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms zope.interface zope.sqlalchemyd
+tgtesting = easy_install -i http://tg.gy/beta AddOns BytecodeAssembler Chameleon coverage DecoratorTools Extremes Genshi Jinja2 Kajiki kid nose PEAK_Rules repoze.tm2 repoze.what repoze.what.plugins.sql repoze.what_pylons repoze.what_quickstart repoze.who repoze.who_friendlyform repoze.who.plugins.sa repoze.who_testutil simplegeneric sprox SQLAlchemy SymbolType tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms zope.interface zope.sqlalchemy
 
 [egg_info]
 #tag_build = dev

diff --git a/setup.py b/setup.py
@@ -16,12 +16,12 @@
                     ]
 
 install_requirements = [
-                        'TurboGears2 >= 2.1.4',
+                        'TurboGears2 >= 2.2.0rc1',
                         ]
 
 setup(
     name='tg.devtools',
-    version="2.1.4",
+    version="2.2.0rc1",
     description="",
     long_description="""""",
     classifiers=[],
@@ -52,6 +52,6 @@
     test_suite='nose.collector',
     tests_require = test_requirements,
     dependency_links=[
-        "http://www.turbogears.org/2.1/downloads/current/"
+        "http://tg.gy/beta"
         ]
 )