From bb69a069791074dd8557da60a857a701d370a5c4 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 29 Sep 2011 03:04:03 -0400 Subject: experimental use of glue --- setup.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3334a01d6..af0094856 100644 --- a/setup.py +++ b/setup.py @@ -39,15 +39,9 @@ install_requires=[ 'zope.deprecation >= 3.5.0', # py3 compat 'venusian >= 1.0a1', # ``onerror`` 'translationstring >= 0.4', # py3 compat + 'glue', ] -if not PY3: - install_requires.extend([ - 'Paste > 1.7', # temp version pin to prevent PyPi install failure :-( - 'PasteDeploy', - 'PasteScript >= 1.7.4', # "here" in logging fileConfig - ]) - tests_require = install_requires + [ 'WebTest >= 1.3.1', # py3 compat 'virtualenv', @@ -90,12 +84,12 @@ setup(name='pyramid', tests_require = tests_require, test_suite="pyramid.tests", entry_points = """\ - [paste.paster_create_template] + [glue.create_template] pyramid_starter=pyramid.scaffolds:StarterProjectTemplate pyramid_zodb=pyramid.scaffolds:ZODBProjectTemplate pyramid_routesalchemy=pyramid.scaffolds:RoutesAlchemyProjectTemplate pyramid_alchemy=pyramid.scaffolds:AlchemyProjectTemplate - [paste.paster_command] + [glue.command] pshell=pyramid.paster:PShellCommand proutes=pyramid.paster:PRoutesCommand pviews=pyramid.paster:PViewsCommand -- cgit v1.2.3 From a30a39ae06b26f57c0c393bbfd3e0cc0b540df14 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 5 Oct 2011 05:06:49 -0400 Subject: add a pcreate command --- setup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index af0094856..d029c1a61 100644 --- a/setup.py +++ b/setup.py @@ -84,11 +84,11 @@ setup(name='pyramid', tests_require = tests_require, test_suite="pyramid.tests", entry_points = """\ - [glue.create_template] - pyramid_starter=pyramid.scaffolds:StarterProjectTemplate - pyramid_zodb=pyramid.scaffolds:ZODBProjectTemplate - pyramid_routesalchemy=pyramid.scaffolds:RoutesAlchemyProjectTemplate - pyramid_alchemy=pyramid.scaffolds:AlchemyProjectTemplate + [pyramid.scaffold] + starter=pyramid.scaffolds:StarterProjectTemplate + zodb=pyramid.scaffolds:ZODBProjectTemplate + routesalchemy=pyramid.scaffolds:RoutesAlchemyProjectTemplate + alchemy=pyramid.scaffolds:AlchemyProjectTemplate [glue.command] pshell=pyramid.paster:PShellCommand proutes=pyramid.paster:PRoutesCommand @@ -96,6 +96,7 @@ setup(name='pyramid', ptweens=pyramid.paster:PTweensCommand [console_scripts] bfg2pyramid = pyramid.fixers.fix_bfg_imports:main + pcreate = pyramid.scripts.pcreate:main """ ) -- cgit v1.2.3 From 0e0cb766f9b8c49ce53123fe9d13d0184196e9b1 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 5 Oct 2011 08:11:52 -0400 Subject: add pserve command and move template code out of glue; add a wsgiref paste.server_runner entry point --- setup.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d029c1a61..1602f9aa7 100644 --- a/setup.py +++ b/setup.py @@ -97,6 +97,9 @@ setup(name='pyramid', [console_scripts] bfg2pyramid = pyramid.fixers.fix_bfg_imports:main pcreate = pyramid.scripts.pcreate:main + pserve = pyramid.scripts.pserve:main + [paste.server_runner] + wsgiref = pyramid.scripts.pserve:wsgiref_server_runner """ ) -- cgit v1.2.3 From 33796033414d4460381531e713622a21401972a6 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 5 Oct 2011 09:05:00 -0400 Subject: turn all paster commands into scripts --- setup.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1602f9aa7..559467fe8 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ install_requires=[ 'zope.deprecation >= 3.5.0', # py3 compat 'venusian >= 1.0a1', # ``onerror`` 'translationstring >= 0.4', # py3 compat - 'glue', + 'PasteDeploy >= 1.5.0', # py3 compat ] tests_require = install_requires + [ @@ -89,15 +89,14 @@ setup(name='pyramid', zodb=pyramid.scaffolds:ZODBProjectTemplate routesalchemy=pyramid.scaffolds:RoutesAlchemyProjectTemplate alchemy=pyramid.scaffolds:AlchemyProjectTemplate - [glue.command] - pshell=pyramid.paster:PShellCommand - proutes=pyramid.paster:PRoutesCommand - pviews=pyramid.paster:PViewsCommand - ptweens=pyramid.paster:PTweensCommand [console_scripts] bfg2pyramid = pyramid.fixers.fix_bfg_imports:main pcreate = pyramid.scripts.pcreate:main pserve = pyramid.scripts.pserve:main + pshell = pyramid.scripts.pshell:main + proutes = pyramid.scripts.proutes:main + pviews = pyramid.scripts.pviews:main + ptweens = pyramid.scripts.ptweens:main [paste.server_runner] wsgiref = pyramid.scripts.pserve:wsgiref_server_runner """ -- cgit v1.2.3