From 83549e631fe28e8e3b0b0274d0e631f1ebebd205 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 20 Jun 2011 01:31:27 -0400 Subject: prep for 1.1a1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6f3fb4eea..f77ae9393 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1a0', + version='1.1a1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From cc85e7a96ccbb1671514adb1a1b1992fd1f02461 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 22 Jun 2011 19:39:45 -0400 Subject: prep for 1.1a2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f77ae9393..5c3232fca 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1a1', + version='1.1a2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 1ba6fe34b9f37594d926cc63b6219ad61dbeebb6 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 26 Jun 2011 04:00:52 -0400 Subject: prep for 1.1a3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5c3232fca..91d456a89 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1a2', + version='1.1a3', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From b9c0e79be2764b8f6c59e5be9044675666154ea0 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 1 Jul 2011 04:41:34 -0400 Subject: prep for 1.1a4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 91d456a89..3b57d6698 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1a3', + version='1.1a4', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From a36fdbd40967117d34a70f156d2865aa2b21991e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 10 Jul 2011 01:13:44 -0400 Subject: prep for 1.1b1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3b57d6698..54e45e14a 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1a4', + version='1.1b1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From d4ccb85f76f38400eaf90b40ccbc56b017e3a6bd Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 13 Jul 2011 03:34:05 -0400 Subject: prep for 1.1b2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 54e45e14a..55be461e4 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1b1', + version='1.1b2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 999d44cf53e2213be8df881c2b407986b462c79c Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 15 Jul 2011 10:40:35 -0400 Subject: prep for 1.1b3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 55be461e4..3ba985769 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1b2', + version='1.1b3', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 40c643e07e1a5eeb48e86070cd0ffbd998899669 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 18 Jul 2011 02:59:50 -0400 Subject: prep for 1.1b4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3ba985769..99bd761fc 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1b3', + version='1.1b4', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 8c03444dd5d80adaf65e30ebdabf1e6dde644965 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 21 Jul 2011 23:32:50 -0400 Subject: prep for 1.1; gather contributors --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 99bd761fc..376f503f6 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1b4', + version='1.1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 9e5f538a1d73f99b047502670228b862d42c2c59 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 27 Jul 2011 19:25:48 -0400 Subject: use dev version number, for trunk-dependent add-ons --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 376f503f6..109be6951 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1', + version='1.1.1dev', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From b4843bc087524320460fb3fca9d33688cafa0dbb Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 6 Aug 2011 17:38:37 -0400 Subject: requesthandlers->tweens; add ptweens command --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 109be6951..5e362ea86 100644 --- a/setup.py +++ b/setup.py @@ -86,6 +86,7 @@ setup(name='pyramid', 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 """ -- cgit v1.2.3 From 57144ec3a2387abc46abea1e00d36c23b25cc1b7 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 10 Aug 2011 20:52:06 -0400 Subject: trunk is 1.2dev, who are we fooling --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5e362ea86..f6cc911f6 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1.1dev', + version='1.2dev', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From eef9724c7edcd68114c420bd8b274fecc11ffe1e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 12 Aug 2011 16:51:49 -0400 Subject: - Pyramid now relies on PasteScript >= 1.7.4. This version contains a feature important for allowing flexible logging configuration. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f6cc911f6..4c556dbc3 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ install_requires=[ 'Mako >= 0.3.6', # strict_undefined 'Paste > 1.7', # temp version pin to prevent PyPi install failure :-( 'PasteDeploy', - 'PasteScript', + 'PasteScript >= 1.7.4', # "here" in logging fileConfig 'WebOb >= 1.0.2', # no "default_charset"; request.script_name doesnt error 'repoze.lru', 'setuptools', -- cgit v1.2.3 From 5bf23fad3e0c9a949e8b01ab68991633af2d6df7 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 15 Aug 2011 06:05:39 -0400 Subject: - Refactor ``pyramid.config`` into a package. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4c556dbc3..df73e788b 100644 --- a/setup.py +++ b/setup.py @@ -75,7 +75,7 @@ setup(name='pyramid', zip_safe=False, install_requires = install_requires, tests_require = tests_require, - test_suite="pyramid.tests", + test_suite="pyramid", entry_points = """\ [paste.paster_create_template] pyramid_starter=pyramid.scaffolds:StarterProjectTemplate -- cgit v1.2.3 From beb87d104dd69c8363bd87f64e81e1bcc087375c Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 15 Aug 2011 06:18:22 -0400 Subject: appease setup.py test --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index df73e788b..4c556dbc3 100644 --- a/setup.py +++ b/setup.py @@ -75,7 +75,7 @@ setup(name='pyramid', zip_safe=False, install_requires = install_requires, tests_require = tests_require, - test_suite="pyramid", + test_suite="pyramid.tests", entry_points = """\ [paste.paster_create_template] pyramid_starter=pyramid.scaffolds:StarterProjectTemplate -- cgit v1.2.3 From c1a179fbc713a8c8c5be19f8d327b8ced567d957 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 24 Aug 2011 00:29:42 -0400 Subject: prep for 1.2a1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4c556dbc3..40823384a 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2dev', + version='1.2a1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 5bee607f61614cd8d57e64eacd83c26cbb25a385 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 27 Aug 2011 04:23:45 -0400 Subject: prep for 1.2a2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 40823384a..c854cf6c6 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2a1', + version='1.2a2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 21a4c9b232b2d5c9660f27904b92645b109eda15 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 29 Aug 2011 11:46:41 -0400 Subject: prep for 1.2a3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c854cf6c6..75f8d16c0 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2a2', + version='1.2a3', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 1aeae3565e07b99e737e6572ac5ba1b1bbf42abb Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 31 Aug 2011 01:53:17 -0400 Subject: - Support an ``onerror`` keyword argument to ``pyramid.config.Configurator.scan()``. This onerror keyword argument is passed to ``venusian.Scanner.scan()`` to influence error behavior when an exception is raised during scanning. - Pyramid now requires Venusian 1.0a1 or better to support the ``onerror`` keyword argument to ``pyramid.config.Configurator.scan``. - Move test fixtures around so test_config tests are not looking "up" for fixtures. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 75f8d16c0..4d32db715 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ install_requires=[ 'zope.configuration', 'zope.deprecation', 'zope.interface >= 3.5.1', # 3.5.0 comment: "allow to bootstrap on jython" - 'venusian >= 0.5', # ``codeinfo`` + 'venusian >= 1.0a1', # ``onerror`` 'translationstring', ] -- cgit v1.2.3 From f1c6e093706f54c301655d9894c163afbb48ae1e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 2 Sep 2011 12:52:53 -0400 Subject: prep for 1.2a4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4d32db715..9a19b8a5b 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2a3', + version='1.2a4', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 79ef3d108e2aa1d630a6f06a8bed107e2ba6d43e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 3 Sep 2011 03:09:17 -0400 Subject: mechanical cut at removing zope.configuration dependencies (breaks pyramid_zcml right now) --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9a19b8a5b..18260b992 100644 --- a/setup.py +++ b/setup.py @@ -35,9 +35,8 @@ install_requires=[ 'repoze.lru', 'setuptools', 'zope.component >= 3.6.0', # independent of zope.hookable - 'zope.configuration', - 'zope.deprecation', 'zope.interface >= 3.5.1', # 3.5.0 comment: "allow to bootstrap on jython" + 'zope.deprecation', 'venusian >= 1.0a1', # ``onerror`` 'translationstring', ] -- cgit v1.2.3 From 7961af6994ec744298debc5c4b62bce9b2d395ba Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 4 Sep 2011 01:40:44 -0400 Subject: prep for 1.2a5 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 18260b992..bc5b47020 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2a4', + version='1.2a5', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From d00fa00e0ee116cce61f157b24b3924d38a352a5 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 6 Sep 2011 23:14:18 -0400 Subject: prep for 1.2a6 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bc5b47020..48cfdac23 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2a5', + version='1.2a6', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 9de21ff234ac7995a77d74f7da63b78a29ca1a56 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 8 Sep 2011 04:00:12 -0400 Subject: prep for 1.2b1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 48cfdac23..83e0a8c6b 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2a6', + version='1.2b1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From a66ae929a79a54f95a3786d9b95393a4fb8a8fc4 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 8 Sep 2011 17:45:20 -0400 Subject: Prep for 1.2b2; Closes #267 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 83e0a8c6b..3254a8bda 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2b1', + version='1.2b2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 2cf1d0efe6d281bc2a0d8316af8480765200eeea Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 11 Sep 2011 01:30:37 -0400 Subject: prep for 1.2b3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3254a8bda..86d3df9a5 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2b2', + version='1.2b3', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 63f65dbfcb5e7ef7864f8a954849597ba07a0299 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 12 Sep 2011 23:16:37 -0400 Subject: prep for 1.2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 86d3df9a5..0a5b0fb9a 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2b3', + version='1.2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 0dde01d3f74053ce0c1f6383929f87c117098ced Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 22 Sep 2011 05:19:09 -0400 Subject: - Pyramid no longer depends on the zope.component package, except as a testing dependency. - Pyramid now depends on a ``zope.interface`` version greater than or equal to 3.8.0. --- setup.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0a5b0fb9a..b3e5deea2 100644 --- a/setup.py +++ b/setup.py @@ -34,19 +34,27 @@ install_requires=[ 'WebOb >= 1.0.2', # no "default_charset"; request.script_name doesnt error 'repoze.lru', 'setuptools', - 'zope.component >= 3.6.0', # independent of zope.hookable - 'zope.interface >= 3.5.1', # 3.5.0 comment: "allow to bootstrap on jython" + 'zope.interface >= 3.8.0', # has zope.interface.registry 'zope.deprecation', 'venusian >= 1.0a1', # ``onerror`` 'translationstring', ] if platform.system() == 'Java': - tests_require = install_requires + ['WebTest', 'virtualenv'] + tests_require = install_requires + [ + 'WebTest', + 'virtualenv', + 'zope.component>=3.11.0', + ] else: - tests_require= install_requires + ['Sphinx', 'docutils', - 'WebTest', 'repoze.sphinx.autointerface', - 'virtualenv'] + tests_require= install_requires + [ + 'Sphinx', + 'docutils', + 'repoze.sphinx.autointerface', + 'WebTest', + 'virtualenv', + 'zope.component>=3.11.0', + ] if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') -- cgit v1.2.3 From e6c2d2eb7a9608658823fc2854104c2a61284942 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 22 Sep 2011 17:13:45 -0400 Subject: anger release commit --- setup.py | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b3e5deea2..4213bb628 100644 --- a/setup.py +++ b/setup.py @@ -18,6 +18,9 @@ import sys from setuptools import setup, find_packages +PY3 = sys.version_info[0] == 3 +JYTHON = platform.system() != 'Java' + here = os.path.abspath(os.path.dirname(__file__)) try: README = open(os.path.join(here, 'README.rst')).read() @@ -28,9 +31,6 @@ except IOError: install_requires=[ 'Chameleon >= 1.2.3', 'Mako >= 0.3.6', # strict_undefined - 'Paste > 1.7', # temp version pin to prevent PyPi install failure :-( - 'PasteDeploy', - 'PasteScript >= 1.7.4', # "here" in logging fileConfig 'WebOb >= 1.0.2', # no "default_charset"; request.script_name doesnt error 'repoze.lru', 'setuptools', @@ -40,21 +40,29 @@ install_requires=[ 'translationstring', ] -if platform.system() == 'Java': - tests_require = install_requires + [ - 'WebTest', - 'virtualenv', - 'zope.component>=3.11.0', - ] -else: - tests_require= install_requires + [ +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', + 'virtualenv', + ] + +if not JYTHON: + tests_require.extend([ 'Sphinx', 'docutils', 'repoze.sphinx.autointerface', - 'WebTest', - 'virtualenv', + ]) + +if not PY3: + tests_require.extend([ 'zope.component>=3.11.0', - ] + ]) if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') -- cgit v1.2.3 From 0e131e30da1c5ce9c35965252a5718f1b2660eea Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 24 Sep 2011 05:30:03 -0400 Subject: fix test_renderers tests on py3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4213bb628..010dd06cc 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ except IOError: install_requires=[ 'Chameleon >= 1.2.3', 'Mako >= 0.3.6', # strict_undefined - 'WebOb >= 1.0.2', # no "default_charset"; request.script_name doesnt error + 'WebOb >= 1.2dev', # response.text / py3 compat 'repoze.lru', 'setuptools', 'zope.interface >= 3.8.0', # has zope.interface.registry -- cgit v1.2.3 From c9b78f324cdbd38c2ac095ea97472605746e081e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 24 Sep 2011 08:39:40 -0400 Subject: version minimums --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 010dd06cc..99771a941 100644 --- a/setup.py +++ b/setup.py @@ -29,15 +29,15 @@ except IOError: README = CHANGES = '' install_requires=[ + 'setuptools', 'Chameleon >= 1.2.3', 'Mako >= 0.3.6', # strict_undefined 'WebOb >= 1.2dev', # response.text / py3 compat - 'repoze.lru', - 'setuptools', + 'repoze.lru >= 0.4', # py3 compat 'zope.interface >= 3.8.0', # has zope.interface.registry - 'zope.deprecation', + 'zope.deprecation >= 3.5.0', # py3 compat 'venusian >= 1.0a1', # ``onerror`` - 'translationstring', + 'translationstring >= 0.4', # py3 compat ] if not PY3: @@ -48,11 +48,11 @@ if not PY3: ]) tests_require = install_requires + [ - 'WebTest', + 'WebTest >= 1.3.1', # py3 compat 'virtualenv', ] -if not JYTHON: +if not (JYTHON or PY3): tests_require.extend([ 'Sphinx', 'docutils', -- cgit v1.2.3 From 795253eefe30d8799a55d31e9905c6af21a32ffb Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 24 Sep 2011 18:57:20 -0400 Subject: fix setup.py and tox.ini for dev/testing purposes --- setup.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 99771a941..08aa1643e 100644 --- a/setup.py +++ b/setup.py @@ -13,13 +13,14 @@ ############################################################################## import os -import platform import sys from setuptools import setup, find_packages +if sys.version_info[:2] < (2, 6): + raise RuntimeError('Requires Python 2.6 or better') + PY3 = sys.version_info[0] == 3 -JYTHON = platform.system() != 'Java' here = os.path.abspath(os.path.dirname(__file__)) try: @@ -52,21 +53,14 @@ tests_require = install_requires + [ 'virtualenv', ] -if not (JYTHON or PY3): +if not PY3: tests_require.extend([ 'Sphinx', 'docutils', 'repoze.sphinx.autointerface', - ]) - -if not PY3: - tests_require.extend([ 'zope.component>=3.11.0', ]) -if sys.version_info[:2] < (2, 6): - install_requires.append('simplejson') - setup(name='pyramid', version='1.2', description=('The Pyramid web application development framework, a ' -- cgit v1.2.3 From 502f7122efb6beabd2b05260ef10e43014658d00 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 25 Sep 2011 04:53:28 -0400 Subject: py3 trove classifiers --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 08aa1643e..aa8045a9a 100644 --- a/setup.py +++ b/setup.py @@ -69,6 +69,10 @@ setup(name='pyramid', classifiers=[ "Intended Audience :: Developers", "Programming Language :: Python", + "Programming Language :: Python :: 2.6", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.2", "Framework :: Pylons", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: WSGI", -- cgit v1.2.3 From 9871015cb19de379a34c60d7f2854257f2782181 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 28 Sep 2011 04:21:14 -0400 Subject: vb --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index aa8045a9a..3334a01d6 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.2', + version='1.3dev', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 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 From a0e3cbc5620776569f3c46180a527d6c6143f0f8 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 15 Oct 2011 16:53:23 -0400 Subject: add cherrypy server runner (requires the CherryPy package to be installed --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 559467fe8..b02459264 100644 --- a/setup.py +++ b/setup.py @@ -99,6 +99,7 @@ setup(name='pyramid', ptweens = pyramid.scripts.ptweens:main [paste.server_runner] wsgiref = pyramid.scripts.pserve:wsgiref_server_runner + cherrypy = pyramid.scripts.pserve:cherrypy_server_runner """ ) -- cgit v1.2.3 From 818f8cab1dff781bbacf94cbabb4bec3825e081e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 12 Nov 2011 20:41:29 -0500 Subject: - The ``alchemy`` scaffold has been removed. - The ``routesalchemy`` scaffold has been renamed ``alchemy``. --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b02459264..c6d1d237f 100644 --- a/setup.py +++ b/setup.py @@ -87,7 +87,6 @@ setup(name='pyramid', [pyramid.scaffold] starter=pyramid.scaffolds:StarterProjectTemplate zodb=pyramid.scaffolds:ZODBProjectTemplate - routesalchemy=pyramid.scaffolds:RoutesAlchemyProjectTemplate alchemy=pyramid.scaffolds:AlchemyProjectTemplate [console_scripts] bfg2pyramid = pyramid.fixers.fix_bfg_imports:main -- cgit v1.2.3 From 2de1025ec7080d2d493db5d46c8e87ed8467e806 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 30 Nov 2011 13:01:57 -0500 Subject: as per https://plus.google.com/107826054989536826392/posts/cbJKHFWbGDw --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c6d1d237f..4d3216e12 100644 --- a/setup.py +++ b/setup.py @@ -67,6 +67,8 @@ setup(name='pyramid', "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.2", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Pylons", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: WSGI", -- cgit v1.2.3 From 5f1cf3fbc519085b93fb16a230c0637050ce350d Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 15:04:49 -0500 Subject: prep for 1.3a1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4d3216e12..a09461303 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3dev', + version='1.3a1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 9dce50a3bdd30b7c5c9b8efd184bad7cbbb1a030 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 14 Dec 2011 09:23:22 -0500 Subject: prep for 1.3a2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a09461303..3d0cfd6fd 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3a1', + version='1.3a2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 4eab20d35162b86dd0168ba86e9fd9e51050071a Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 15 Dec 2011 05:10:13 -0500 Subject: add prequest script and entry point --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3d0cfd6fd..b9220285f 100644 --- a/setup.py +++ b/setup.py @@ -98,6 +98,7 @@ setup(name='pyramid', proutes = pyramid.scripts.proutes:main pviews = pyramid.scripts.pviews:main ptweens = pyramid.scripts.ptweens:main + prequest = pyramid.scripts.prequest:main [paste.server_runner] wsgiref = pyramid.scripts.pserve:wsgiref_server_runner cherrypy = pyramid.scripts.pserve:cherrypy_server_runner -- cgit v1.2.3 From d394da5175fece8388f2fc0dfd906942faa6f2ed Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 21 Dec 2011 02:18:37 -0500 Subject: prep for 1.3a3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b9220285f..78963289a 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3a2', + version='1.3a3', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 683941663033bbac588b9ac8f1ff28eeefc511c9 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 5 Jan 2012 09:21:55 -0500 Subject: prep for 1.3a4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 78963289a..378ef1b38 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3a3', + version='1.3a4', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From cf3a11e990adda800e284effb006f1c28335da4d Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 9 Jan 2012 03:49:46 -0500 Subject: prep for 1.3a5 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 378ef1b38..91b056778 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3a4', + version='1.3a5', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From a41c8ca521ba983594364b1eb1f6c6025149fbe7 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 20 Jan 2012 10:53:55 -0500 Subject: prep for 1.3a6 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 91b056778..64c0ad419 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3a5', + version='1.3a6', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From e3f9d0e6ea3c98699de7b60bc3900b1a40fcba19 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 8 Feb 2012 00:05:31 -0500 Subject: prep for 1.3a7 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 64c0ad419..c719bd9fe 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3a6', + version='1.3a7', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From e4b8fa632c5d2b020e168f4efe3d7c00049a279f Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 9 Feb 2012 00:12:26 -0500 Subject: Features -------- - The ``scan`` method of a ``Configurator`` can be passed an ``ignore`` argument, which can be a string, a callable, or a list consisting of strings and/or callables. This feature allows submodules, subpackages, and global objects from being scanned. See http://readthedocs.org/docs/venusian/en/latest/#ignore-scan-argument for more information about how to use the ``ignore`` argument to ``scan``. Dependencies ------------ - Depend on ``venusian`` >= 1.0a3 to provide scan ``ignore`` support. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c719bd9fe..a6cfa1480 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ install_requires=[ 'repoze.lru >= 0.4', # py3 compat 'zope.interface >= 3.8.0', # has zope.interface.registry 'zope.deprecation >= 3.5.0', # py3 compat - 'venusian >= 1.0a1', # ``onerror`` + 'venusian >= 1.0a3', # ``ignore`` 'translationstring >= 0.4', # py3 compat 'PasteDeploy >= 1.5.0', # py3 compat ] -- cgit v1.2.3 From 51919e05d9c251f7f80a4736be2b822eafc5d189 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 19 Feb 2012 17:54:27 -0500 Subject: prep for 1.3a8 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a6cfa1480..7a5e80c67 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3a7', + version='1.3a8', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 662d6ea96a79cdd9943a9e3c871fe07282ee671c Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 22 Feb 2012 21:10:08 -0500 Subject: prep for 1.3a9 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7a5e80c67..05abb437a 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3a8', + version='1.3a9', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From cf973d67fcae67f517d407a3f1bc3cb191def5b6 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 26 Feb 2012 15:59:20 -0500 Subject: prep for 1.3b1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 05abb437a..94292361c 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3a9', + version='1.3b1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 602453189d12fd31288d605d053a8e66841f2453 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 27 Feb 2012 00:06:13 -0500 Subject: separate checks for Python version numbers for 2 and 3 --- setup.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 94292361c..6e8119065 100644 --- a/setup.py +++ b/setup.py @@ -17,10 +17,16 @@ import sys from setuptools import setup, find_packages -if sys.version_info[:2] < (2, 6): - raise RuntimeError('Requires Python 2.6 or better') +py_version = sys.version_info[:2] -PY3 = sys.version_info[0] == 3 +PY3 = py_version[0] == 3 + +if PY3: + if py_version < (3, 2): + raise RuntimeError('On Python 3, Pyramid requires Python 3.2 or better') +else: + if py_version < (2, 6): + raise RuntimeError('On Python 2, Pyramid requires Python 2.6 or better') here = os.path.abspath(os.path.dirname(__file__)) try: -- cgit v1.2.3 From 3a14206e0f03fe24fa9a6611097230607332184d Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 2 Mar 2012 03:11:22 -0500 Subject: prep for 1.3b2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6e8119065..9dfb18a13 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3b1', + version='1.3b2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From b4ecceef53664bf22820991be24caf028b98ce0e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 4 Mar 2012 13:11:32 -0500 Subject: use pylons-discuss as email address in setup.py too --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9dfb18a13..93f426321 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ setup(name='pyramid', ], keywords='web wsgi pylons pyramid', author="Chris McDonough, Agendaless Consulting", - author_email="pylons-devel@googlegroups.com", + author_email="pylons-discuss@googlegroups.com", url="http://pylonsproject.org", license="BSD-derived (http://www.repoze.org/LICENSE.txt)", packages=find_packages(), -- cgit v1.2.3 From a3744b3dbf6b527a785944adb1f921157dd1c040 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 16 Mar 2012 23:58:32 -0400 Subject: add a dev alias for develop-and-install-testing-dependencies and depend on nose and coverage in setup.py --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 93f426321..5282ee64f 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,9 @@ install_requires=[ 'PasteDeploy >= 1.5.0', # py3 compat ] -tests_require = install_requires + [ +tests_require = [ + 'nose', + 'coverage', 'WebTest >= 1.3.1', # py3 compat 'virtualenv', ] @@ -89,6 +91,9 @@ setup(name='pyramid', include_package_data=True, zip_safe=False, install_requires = install_requires, + extras_require = { + 'testing':tests_require, + }, tests_require = tests_require, test_suite="pyramid.tests", entry_points = """\ -- cgit v1.2.3 From c75e507c7eab84e317588823b6a0e332561212ef Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 17 Mar 2012 16:32:00 -0400 Subject: dont depend on nose or coverage except for in extras --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5282ee64f..45f556e67 100644 --- a/setup.py +++ b/setup.py @@ -49,8 +49,6 @@ install_requires=[ ] tests_require = [ - 'nose', - 'coverage', 'WebTest >= 1.3.1', # py3 compat 'virtualenv', ] @@ -63,6 +61,8 @@ if not PY3: 'zope.component>=3.11.0', ]) +testing_extras = tests_require + ['nose', 'coverage'] + setup(name='pyramid', version='1.3b2', description=('The Pyramid web application development framework, a ' @@ -92,7 +92,7 @@ setup(name='pyramid', zip_safe=False, install_requires = install_requires, extras_require = { - 'testing':tests_require, + 'testing':testing_extras, }, tests_require = tests_require, test_suite="pyramid.tests", -- cgit v1.2.3 From 58d14988ca00ceda3764970a041f7e8c1d9b8501 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 17 Mar 2012 17:49:42 -0400 Subject: prep for 1.3b3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 45f556e67..d04fbed3a 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ if not PY3: testing_extras = tests_require + ['nose', 'coverage'] setup(name='pyramid', - version='1.3b2', + version='1.3b3', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 7c88fec67a3c3edd33ef44dc0ad0c55fb672b7e1 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 21 Mar 2012 03:46:00 -0400 Subject: prep for 1.3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d04fbed3a..b4179bba9 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ if not PY3: testing_extras = tests_require + ['nose', 'coverage'] setup(name='pyramid', - version='1.3b3', + version='1.3', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From abcfa5c11be5ab62af10d6837ac7d06ef418df17 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 29 Mar 2012 04:23:21 -0400 Subject: update version markers --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b4179bba9..f8c8c41e9 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ if not PY3: testing_extras = tests_require + ['nose', 'coverage'] setup(name='pyramid', - version='1.3', + version='1.4dev', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 4aafed62140a7e3937b7e2fd6c349a771b07e25c Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 16 Apr 2012 10:28:34 -0500 Subject: replaced pylons with pyramid trove classifier --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f8c8c41e9..e325b8a29 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ setup(name='pyramid', "Programming Language :: Python :: 3.2", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "Framework :: Pylons", + "Framework :: Pyramid", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: WSGI", "License :: Repoze Public License", -- cgit v1.2.3 From aca78fe3f08ad31be2cc154301c95a318d74ead8 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 18 Apr 2012 14:47:51 -0400 Subject: break docs stuff out of testing to hopefully appease shiningpanda --- setup.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e325b8a29..29a0f22ca 100644 --- a/setup.py +++ b/setup.py @@ -49,19 +49,22 @@ install_requires=[ ] tests_require = [ + 'nose', + 'coverage', 'WebTest >= 1.3.1', # py3 compat 'virtualenv', ] if not PY3: tests_require.extend([ - 'Sphinx', - 'docutils', - 'repoze.sphinx.autointerface', 'zope.component>=3.11.0', ]) -testing_extras = tests_require + ['nose', 'coverage'] +docs_extras = [ + 'Sphinx', + 'docutils', + 'repoze.sphinx.autointerface', + ] setup(name='pyramid', version='1.4dev', @@ -92,7 +95,8 @@ setup(name='pyramid', zip_safe=False, install_requires = install_requires, extras_require = { - 'testing':testing_extras, + 'testing':tests_require, + 'docs':docs_extras, }, tests_require = tests_require, test_suite="pyramid.tests", -- cgit v1.2.3 From 90da3b3b1363beb443d190fdcdee8d9323beb64b Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 21 Apr 2012 12:11:59 -0400 Subject: make virtualenv, nose, and coverage testing extras rather than test requirements --- setup.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 29a0f22ca..cbc1075bd 100644 --- a/setup.py +++ b/setup.py @@ -49,16 +49,11 @@ install_requires=[ ] tests_require = [ - 'nose', - 'coverage', 'WebTest >= 1.3.1', # py3 compat - 'virtualenv', ] if not PY3: - tests_require.extend([ - 'zope.component>=3.11.0', - ]) + tests_require.append('zope.component>=3.11.0') docs_extras = [ 'Sphinx', @@ -66,6 +61,12 @@ docs_extras = [ 'repoze.sphinx.autointerface', ] +testing_extras = tests_require + [ + 'nose', + 'coverage', + 'virtualenv', # for scaffolding tests + ] + setup(name='pyramid', version='1.4dev', description=('The Pyramid web application development framework, a ' @@ -95,7 +96,7 @@ setup(name='pyramid', zip_safe=False, install_requires = install_requires, extras_require = { - 'testing':tests_require, + 'testing':testing_extras, 'docs':docs_extras, }, tests_require = tests_require, -- cgit v1.2.3 From ebcdc7cccc977e388426f581abaf16e39c49cdbd Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 9 Sep 2012 13:06:06 -0400 Subject: - It is no longer possible to pass an environ dictionary directly to ``pyramid.traversal.ResourceTreeTraverser.__call__`` (aka ``ModelGraphTraverser.__call__``). Instead, you must pass a request object. Passing an environment instead of a request has generated a deprecation warning since Pyramid 1.1. - Pyramid will no longer work properly if you use the ``webob.request.LegacyRequest`` as a request factory. Instances of the LegacyRequest class have a ``request.path_info`` which return a string. This Pyramid release assumes that ``request.path_info`` will unconditionally be Unicode. - Pyramid now requires WebOb 1.2b3+ (the prior Pyramid release only relied on 1.2dev+). This is to ensure that we obtain a version of WebOb that returns ``request.path_info`` as text. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index cbc1075bd..03ebb4293 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ install_requires=[ 'setuptools', 'Chameleon >= 1.2.3', 'Mako >= 0.3.6', # strict_undefined - 'WebOb >= 1.2dev', # response.text / py3 compat + 'WebOb >= 1.2b3', # request.path_info is unicode 'repoze.lru >= 0.4', # py3 compat 'zope.interface >= 3.8.0', # has zope.interface.registry 'zope.deprecation >= 3.5.0', # py3 compat -- cgit v1.2.3 From ce1e86c44e812ae438c2647cd7d5b6a4ce2ab478 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 16 Sep 2012 23:15:45 -0400 Subject: prep for 1.4a1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 03ebb4293..bb0bf45a7 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4dev', + version='1.4a1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 072cbf7ae84e80185ebc122d0c11a6838ac36093 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 27 Sep 2012 11:40:57 -0400 Subject: prep for 1.4a2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bb0bf45a7..9af2f2100 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4a1', + version='1.4a2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 2d964c1b983a91ee4d59aa8dc28e33697199a46c Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sun, 14 Oct 2012 20:10:07 -0500 Subject: pypi support for python 3.3 --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9af2f2100..40117cf4c 100644 --- a/setup.py +++ b/setup.py @@ -79,6 +79,7 @@ setup(name='pyramid', "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.2", + "Programming Language :: Python :: 3.3", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Pyramid", -- cgit v1.2.3 From 4a6cca62ddf33580b1de210ef5ca54bfb2769243 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 26 Oct 2012 01:48:24 -0400 Subject: prep for 1.4a3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 40117cf4c..4ea63a3ee 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4a2', + version='1.4a3', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 948068688561806a321a17bfc15c87446a577b5b Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 14 Nov 2012 02:49:16 -0500 Subject: prep for release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4ea63a3ee..2356e76ac 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4a3', + version='1.4a4', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 1608b26c9d3967d258613f038ff8b5f258a4a698 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 21 Nov 2012 23:19:43 -0500 Subject: prep for 1.4b1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2356e76ac..55da3378d 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4a4', + version='1.4b1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From a7e0e601df4e093ebd2fdd7b53bd0bbb9e8d7ce5 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 10 Dec 2012 15:46:57 -0500 Subject: prep for 1.4b2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 55da3378d..2183fcbb1 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4b1', + version='1.4b2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From e609e19d028b1d714439188812ca3c9811e0a508 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 10 Dec 2012 21:42:18 -0500 Subject: prep for 1.4b3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2183fcbb1..9deded88a 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4b2', + version='1.4b3', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 96ab9f26990423f67045e5639a29579a1a76a71e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 18 Dec 2012 03:00:29 -0500 Subject: prep for 1.4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9deded88a..66c6aa5fa 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4b3', + version='1.4', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From eb3cee262ef52480198fc7f506debe0f35e3554a Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Mon, 4 Mar 2013 22:30:32 +0200 Subject: fix #311 --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 66c6aa5fa..e37c348a2 100644 --- a/setup.py +++ b/setup.py @@ -30,8 +30,10 @@ else: here = os.path.abspath(os.path.dirname(__file__)) try: - README = open(os.path.join(here, 'README.rst')).read() - CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() + with open(os.path.join(here, 'README.txt')) as f: + README = f.read() + with open(os.path.join(here, 'CHANGES.txt')) as f: + CHANGES = f.read() except IOError: README = CHANGES = '' -- cgit v1.2.3 From b23b135e26e00484564f8365892aa654eebee4a4 Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Fri, 22 Mar 2013 21:52:05 +0200 Subject: update Copyright year --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e37c348a2..4a3cecd98 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2008-2011 Agendaless Consulting and Contributors. +# Copyright (c) 2008-2013 Agendaless Consulting and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the BSD-like license at -- cgit v1.2.3 From 0d96b77150f1283a44acd0d9c2d2f74453d298a1 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 18 Jul 2013 18:17:20 -0400 Subject: version bump in setup.py conf.py CHANGES.txt, rejigger changes bugs vs. features --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4a3cecd98..df7622656 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4', + version='1.5dev', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From b210ce350a3856166376f63a32725cc1516ba294 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 2 Aug 2013 19:14:29 -0400 Subject: add pdistreport command --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index df7622656..0cff30439 100644 --- a/setup.py +++ b/setup.py @@ -118,6 +118,7 @@ setup(name='pyramid', pviews = pyramid.scripts.pviews:main ptweens = pyramid.scripts.ptweens:main prequest = pyramid.scripts.prequest:main + pdistreport = pyramid.scripts.pdistreport:main [paste.server_runner] wsgiref = pyramid.scripts.pserve:wsgiref_server_runner cherrypy = pyramid.scripts.pserve:cherrypy_server_runner -- cgit v1.2.3 From 83fefbf3f92183d1d899c8449a03546dd3c022a3 Mon Sep 17 00:00:00 2001 From: Paul Everitt Date: Sat, 3 Aug 2013 11:23:20 -0400 Subject: "Web Application Development Framework" -> "Web Framework". Yay. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4a3cecd98..0d3d296cb 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ testing_extras = tests_require + [ setup(name='pyramid', version='1.4', - description=('The Pyramid web application development framework, a ' + description=('The Pyramid Web Framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From 50f23dd4fb2ea8690893ac2cf20a0f0483b32a0d Mon Sep 17 00:00:00 2001 From: Tom Lazar Date: Sat, 17 Aug 2013 16:10:45 +0200 Subject: include and mention the `nose-selecttests `_ plugin --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 60b20b069..64e63956e 100644 --- a/setup.py +++ b/setup.py @@ -65,6 +65,7 @@ docs_extras = [ testing_extras = tests_require + [ 'nose', + 'nose-selecttests', 'coverage', 'virtualenv', # for scaffolding tests ] -- cgit v1.2.3 From 00bb95f513ddcedcaf025bb528e4d7f20b1f7a4b Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 30 Aug 2013 15:04:21 -0400 Subject: prep for 1.5a1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 64e63956e..6c6f1723f 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.5dev', + version='1.5a1', description=('The Pyramid Web Framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From b089c545920100b798c9806796b0c0ebf94db367 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Tue, 3 Sep 2013 17:34:55 -0600 Subject: Remove requirement from setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6c6f1723f..523dab191 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,6 @@ except IOError: install_requires=[ 'setuptools', 'Chameleon >= 1.2.3', - 'Mako >= 0.3.6', # strict_undefined 'WebOb >= 1.2b3', # request.path_info is unicode 'repoze.lru >= 0.4', # py3 compat 'zope.interface >= 3.8.0', # has zope.interface.registry -- cgit v1.2.3 From 5f2e977ac0052c65c5bc60a9492569e48012b449 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Tue, 3 Sep 2013 17:50:31 -0600 Subject: Require the pyramid_mako package This is mainly for backwards compatibility. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 523dab191..f3819dce9 100644 --- a/setup.py +++ b/setup.py @@ -47,6 +47,7 @@ install_requires=[ 'venusian >= 1.0a3', # ``ignore`` 'translationstring >= 0.4', # py3 compat 'PasteDeploy >= 1.5.0', # py3 compat + 'pyramid_mako', # Backwards compat ... ] tests_require = [ -- cgit v1.2.3 From 59801aaeaf431e1b66dee51e3774a5254c84b11c Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Tue, 3 Sep 2013 18:02:19 -0600 Subject: Remove last references to mako We remove the default addition of .mak/.mako files in the configuration object, and we remove the test to see if it is has been defined as a renderer. --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f3819dce9..523dab191 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,6 @@ install_requires=[ 'venusian >= 1.0a3', # ``ignore`` 'translationstring >= 0.4', # py3 compat 'PasteDeploy >= 1.5.0', # py3 compat - 'pyramid_mako', # Backwards compat ... ] tests_require = [ -- cgit v1.2.3 From f907b59336ffe13d5c7d7898a14f679a6de8779d Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Wed, 4 Sep 2013 22:01:49 -0600 Subject: Remove chameleon as a dependency in setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 523dab191..544a273e5 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,6 @@ except IOError: install_requires=[ 'setuptools', - 'Chameleon >= 1.2.3', 'WebOb >= 1.2b3', # request.path_info is unicode 'repoze.lru >= 0.4', # py3 compat 'zope.interface >= 3.8.0', # has zope.interface.registry -- cgit v1.2.3 From ccd4d40ed6ab6ce02f99bcd6de2e7f96f732ff99 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Wed, 4 Sep 2013 22:31:39 -0600 Subject: Remove bfg fixers script from entry points --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 544a273e5..36f0b1303 100644 --- a/setup.py +++ b/setup.py @@ -109,7 +109,6 @@ setup(name='pyramid', zodb=pyramid.scaffolds:ZODBProjectTemplate alchemy=pyramid.scaffolds:AlchemyProjectTemplate [console_scripts] - bfg2pyramid = pyramid.fixers.fix_bfg_imports:main pcreate = pyramid.scripts.pcreate:main pserve = pyramid.scripts.pserve:main pshell = pyramid.scripts.pshell:main -- cgit v1.2.3 From 78b41e570f69f054a51cd3f32432b92b261ed268 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 22 Sep 2013 14:11:45 -0400 Subject: prep for 1.5a2 --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 36f0b1303..2d49717b7 100644 --- a/setup.py +++ b/setup.py @@ -69,9 +69,8 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.5a1', - description=('The Pyramid Web Framework, a ' - 'Pylons project'), + version='1.5a2', + description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ "Intended Audience :: Developers", -- cgit v1.2.3 From 767e44f2fe7c238d0c67308e2e94241236a522e4 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 10 Dec 2013 05:19:41 -0500 Subject: use CookieProfile from webob in authentication module, add support for new domain attribute on dummy request, depend on webob 1.3 or better --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2d49717b7..d27240664 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ except IOError: install_requires=[ 'setuptools', - 'WebOb >= 1.2b3', # request.path_info is unicode + 'WebOb >= 1.3', # request.domain and CookieProfile 'repoze.lru >= 0.4', # py3 compat 'zope.interface >= 3.8.0', # has zope.interface.registry 'zope.deprecation >= 3.5.0', # py3 compat -- cgit v1.2.3 From 5c4318abe647b65869ac6dbb5b57cf1088712061 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 10 Dec 2013 15:10:08 -0500 Subject: prep for 1.5a3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d27240664..e6c9a490a 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.5a2', + version='1.5a3', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From 0506e76256fa25adffeff2aa4b1947c9bc2ceceb Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Fri, 13 Dec 2013 10:51:40 -0700 Subject: Depend on 1.3.1 of WebOb --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e6c9a490a..5bf096622 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ except IOError: install_requires=[ 'setuptools', - 'WebOb >= 1.3', # request.domain and CookieProfile + 'WebOb >= 1.3.1', # request.domain and CookieProfile 'repoze.lru >= 0.4', # py3 compat 'zope.interface >= 3.8.0', # has zope.interface.registry 'zope.deprecation >= 3.5.0', # py3 compat -- cgit v1.2.3 From 2c205f7477275f47fcf59ddcf755697fb695fc8e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 28 Jan 2014 21:32:31 -0500 Subject: prep for 1.5a4 release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5bf096622..bf6101533 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.5a3', + version='1.5a4', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From f8ebde9e5ba1719737099cef12aad641a39120d9 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 8 Feb 2014 16:11:03 -0500 Subject: nose-selecttests is not py3 compat, so we cant really rely on it in testing requirements --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bf6101533..ebdcc7b1f 100644 --- a/setup.py +++ b/setup.py @@ -63,7 +63,6 @@ docs_extras = [ testing_extras = tests_require + [ 'nose', - 'nose-selecttests', 'coverage', 'virtualenv', # for scaffolding tests ] -- cgit v1.2.3 From d7b647d27ebde9bc8203629b651e69d6e7ac7c38 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 8 Feb 2014 16:27:42 -0500 Subject: prep for 1.5b1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ebdcc7b1f..3c17af20d 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.5a4', + version='1.5b1', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From 32200c3af84c352c066eb2c402496305375912e4 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Thu, 27 Mar 2014 22:03:59 -0500 Subject: broadcast 3.4 support --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3c17af20d..bb443330d 100644 --- a/setup.py +++ b/setup.py @@ -79,6 +79,7 @@ setup(name='pyramid', "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Pyramid", -- cgit v1.2.3 From 0cb759758c97feba48c0bbba149a774f85f2606a Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 8 Apr 2014 19:09:47 -0400 Subject: prep for 1.5 release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bb443330d..2214611b7 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.5b1', + version='1.5', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From c61755f77b4f945057522a9f4d4360ed6e5504d7 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 8 Apr 2014 19:16:23 -0400 Subject: vb master to 1.6dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2214611b7..0ace211d7 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.5', + version='1.6dev', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From 77005d96fa57a83ac91c2547892fbb3e3c34e553 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 14 Apr 2014 01:56:02 -0400 Subject: mature dev status --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0ace211d7..54ced84e3 100644 --- a/setup.py +++ b/setup.py @@ -72,6 +72,7 @@ setup(name='pyramid', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ + "Development Status :: 6 - Mature", "Intended Audience :: Developers", "Programming Language :: Python", "Programming Language :: Python :: 2.6", -- cgit v1.2.3 From c740e8bd20c049cbab43ce0a1cd5a4533fe6b849 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Thu, 22 May 2014 10:41:02 -0500 Subject: fix project url --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 54ced84e3..c832d3fc8 100644 --- a/setup.py +++ b/setup.py @@ -91,7 +91,7 @@ setup(name='pyramid', keywords='web wsgi pylons pyramid', author="Chris McDonough, Agendaless Consulting", author_email="pylons-discuss@googlegroups.com", - url="http://pylonsproject.org", + url="http://docs.pylonsproject.org/en/latest/docs/pyramid.html", license="BSD-derived (http://www.repoze.org/LICENSE.txt)", packages=find_packages(), include_package_data=True, -- cgit v1.2.3 From e2ec94f197f7e2a040091d661cc56496e6136eba Mon Sep 17 00:00:00 2001 From: goodwillcoding Date: Sun, 1 Jun 2014 19:31:20 -0700 Subject: fix inclusion of README.rst in the package description --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c832d3fc8..d736dc38d 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ else: here = os.path.abspath(os.path.dirname(__file__)) try: - with open(os.path.join(here, 'README.txt')) as f: + with open(os.path.join(here, 'README.rst')) as f: README = f.read() with open(os.path.join(here, 'CHANGES.txt')) as f: CHANGES = f.read() -- cgit v1.2.3 From 432e61ed8e0174850ddfeefc81fb31c27a018fa7 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 26 Dec 2014 02:49:01 -0800 Subject: - establish minimum version of 1.2.3 for Sphinx. I hope this works. See https://github.com/Pylons/pyramid/issues/1068 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d736dc38d..629b77f3d 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: tests_require.append('zope.component>=3.11.0') docs_extras = [ - 'Sphinx', + 'Sphinx >= 1.2.3', 'docutils', 'repoze.sphinx.autointerface', ] -- cgit v1.2.3 From 686f03bab3df9e1527dce1b02bcca1b05fc74bf5 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Thu, 5 Feb 2015 16:36:12 -0600 Subject: we like pep 440 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 629b77f3d..3233193e7 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.6dev', + version='1.6.dev0', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From 454e4380432f5607e5f365450e29d2cbd92bf68e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 14 Apr 2015 17:23:37 -0400 Subject: prep for 1.6a1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3233193e7..46b08e59b 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.6.dev0', + version='1.6a1', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From 59626acab6014dcf433050e228a53886e764950b Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 15 Apr 2015 09:55:15 -0400 Subject: master is now 1.7 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 46b08e59b..e91e0ee21 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.6a1', + version='1.7.dev0', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From 71d66b84dbd2927e79ebf2512a4bd287b7664b84 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 16 Apr 2015 16:47:23 -0400 Subject: Replace git submodule crap with new pylons-sphinx-themes package goodness. See #1614. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e91e0ee21..ac03da9f5 100644 --- a/setup.py +++ b/setup.py @@ -59,6 +59,7 @@ docs_extras = [ 'Sphinx >= 1.2.3', 'docutils', 'repoze.sphinx.autointerface', + 'pylons-sphinx-themes >= 0.3', ] testing_extras = tests_require + [ -- cgit v1.2.3 From 5699df426148c6bd2e1619d31dc77afcefbfc51c Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sun, 26 Apr 2015 19:21:00 -0500 Subject: add pylons_sphinx_latesturl to the docs extras --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ac03da9f5..a36446d80 100644 --- a/setup.py +++ b/setup.py @@ -59,6 +59,7 @@ docs_extras = [ 'Sphinx >= 1.2.3', 'docutils', 'repoze.sphinx.autointerface', + 'pylons_sphinx_latesturl', 'pylons-sphinx-themes >= 0.3', ] -- cgit v1.2.3 From 896349140f0615a8b5a335c5e082cf6ab0197102 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 6 May 2015 00:00:20 -0700 Subject: bump and unpin versions. RTD uses Sphinx 1.3.1 now. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a36446d80..ffe70cd00 100644 --- a/setup.py +++ b/setup.py @@ -56,11 +56,11 @@ if not PY3: tests_require.append('zope.component>=3.11.0') docs_extras = [ - 'Sphinx >= 1.2.3', + 'Sphinx >= 1.3.1', 'docutils', 'repoze.sphinx.autointerface', 'pylons_sphinx_latesturl', - 'pylons-sphinx-themes >= 0.3', + 'pylons-sphinx-themes', ] testing_extras = tests_require + [ -- cgit v1.2.3 From cb92023e9d0ddb56d20dcc445a5e028fec581342 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Sun, 6 Sep 2015 15:26:35 -0700 Subject: Use entry points for pshell --- setup.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ffe70cd00..bb71880b5 100644 --- a/setup.py +++ b/setup.py @@ -110,6 +110,9 @@ setup(name='pyramid', starter=pyramid.scaffolds:StarterProjectTemplate zodb=pyramid.scaffolds:ZODBProjectTemplate alchemy=pyramid.scaffolds:AlchemyProjectTemplate + [pyramid.pshell] + ipython=pyramid.scripts.pshell:PShellCommand.make_ipython_shell + bpython=pyramid.scripts.pshell:PShellCommand.make_bpython_shell [console_scripts] pcreate = pyramid.scripts.pcreate:main pserve = pyramid.scripts.pserve:main -- cgit v1.2.3 From 90cda8d937f40e83760683271622868b211eb819 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 14 Oct 2015 22:56:47 -0500 Subject: broadcast py35 support --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bb71880b5..2a4271138 100644 --- a/setup.py +++ b/setup.py @@ -83,6 +83,7 @@ setup(name='pyramid', "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Pyramid", -- cgit v1.2.3 From 208e7b5e363b07476797d9f754962982c686e907 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 19 Oct 2015 23:44:17 -0500 Subject: add pshell --list and default_shell ini options --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2a4271138..f3f0524c3 100644 --- a/setup.py +++ b/setup.py @@ -114,6 +114,7 @@ setup(name='pyramid', [pyramid.pshell] ipython=pyramid.scripts.pshell:PShellCommand.make_ipython_shell bpython=pyramid.scripts.pshell:PShellCommand.make_bpython_shell + python=pyramid.scripts.pshell:PShellCommand.make_python_shell [console_scripts] pcreate = pyramid.scripts.pcreate:main pserve = pyramid.scripts.pserve:main -- cgit v1.2.3 From b7350ee78ad4101ea4112741ab26ce583b620ea7 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 21 Oct 2015 01:32:48 -0500 Subject: remove ipython and bpython from core --- setup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f3f0524c3..c81956e7f 100644 --- a/setup.py +++ b/setup.py @@ -111,10 +111,8 @@ setup(name='pyramid', starter=pyramid.scaffolds:StarterProjectTemplate zodb=pyramid.scaffolds:ZODBProjectTemplate alchemy=pyramid.scaffolds:AlchemyProjectTemplate - [pyramid.pshell] - ipython=pyramid.scripts.pshell:PShellCommand.make_ipython_shell - bpython=pyramid.scripts.pshell:PShellCommand.make_bpython_shell - python=pyramid.scripts.pshell:PShellCommand.make_python_shell + [pyramid.pshell_runner] + python=pyramid.scripts.pshell:python_shell_runner [console_scripts] pcreate = pyramid.scripts.pcreate:main pserve = pyramid.scripts.pserve:main -- cgit v1.2.3 From 50dd2e4c7d8f5ab8de79c490e304b44916183f77 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 20 Dec 2015 14:00:12 -0800 Subject: add sphinxcontrib-programoutput configuration to render command line output --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c81956e7f..9bdfcd90e 100644 --- a/setup.py +++ b/setup.py @@ -61,6 +61,7 @@ docs_extras = [ 'repoze.sphinx.autointerface', 'pylons_sphinx_latesturl', 'pylons-sphinx-themes', + 'sphinxcontrib-programoutput', ] testing_extras = tests_require + [ -- cgit v1.2.3 From 362e4dd4c131ba19bdcc3f14df8b26f802806544 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 12 Jan 2016 07:49:55 -0800 Subject: bump Sphinx to 1.3.4. Fixes #2209. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9bdfcd90e..daccd3258 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: tests_require.append('zope.component>=3.11.0') docs_extras = [ - 'Sphinx >= 1.3.1', + 'Sphinx >= 1.3.4', 'docutils', 'repoze.sphinx.autointerface', 'pylons_sphinx_latesturl', -- cgit v1.2.3 From b77ce845c66b271aba0909b12ccef06d6cc45e07 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 12 Jan 2016 08:18:06 -0800 Subject: use lower case "s" for sphinx --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index daccd3258..f7c0fe85a 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: tests_require.append('zope.component>=3.11.0') docs_extras = [ - 'Sphinx >= 1.3.4', + 'sphinx >= 1.3.4', 'docutils', 'repoze.sphinx.autointerface', 'pylons_sphinx_latesturl', -- cgit v1.2.3 From 5c5035530e4e41fdb5fdc9a5767bcd7a9c58413f Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 12 Jan 2016 08:23:29 -0800 Subject: Try upper case "S" for Sphinx --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f7c0fe85a..daccd3258 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: tests_require.append('zope.component>=3.11.0') docs_extras = [ - 'sphinx >= 1.3.4', + 'Sphinx >= 1.3.4', 'docutils', 'repoze.sphinx.autointerface', 'pylons_sphinx_latesturl', -- cgit v1.2.3 From ddbd96d56431583a372d3aaeed9dc262b142b2a9 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Wed, 20 Jan 2016 00:16:51 -0700 Subject: Increase lowest Py3 version to Python 3.3 --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index daccd3258..211c0a4ec 100644 --- a/setup.py +++ b/setup.py @@ -18,12 +18,13 @@ import sys from setuptools import setup, find_packages py_version = sys.version_info[:2] +is_pypy = '__pypy__' in sys.builtin_module_names PY3 = py_version[0] == 3 if PY3: - if py_version < (3, 2): - raise RuntimeError('On Python 3, Pyramid requires Python 3.2 or better') + if py_version < (3, 3) and not is_pypy: # PyPy3 masquerades as Python 3.2... + raise RuntimeError('On Python 3, Pyramid requires Python 3.3 or better') else: if py_version < (2, 6): raise RuntimeError('On Python 2, Pyramid requires Python 2.6 or better') @@ -81,7 +82,6 @@ setup(name='pyramid', "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", -- cgit v1.2.3 From 1779c2a7c7653142cc3164e83b1f0fe43850f97b Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 24 Jan 2016 00:15:46 -0800 Subject: Bump sphinx to 1.3.5; revert comment syntax. Closes #2251. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 211c0a4ec..e878b9932 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ if not PY3: tests_require.append('zope.component>=3.11.0') docs_extras = [ - 'Sphinx >= 1.3.4', + 'Sphinx >= 1.3.5', 'docutils', 'repoze.sphinx.autointerface', 'pylons_sphinx_latesturl', -- cgit v1.2.3 From afd04cf867e9916deef2bb7d4302c15ca5a21c63 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 2 Apr 2016 00:45:09 -0700 Subject: update url --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e878b9932..e26ae80d8 100644 --- a/setup.py +++ b/setup.py @@ -95,7 +95,7 @@ setup(name='pyramid', keywords='web wsgi pylons pyramid', author="Chris McDonough, Agendaless Consulting", author_email="pylons-discuss@googlegroups.com", - url="http://docs.pylonsproject.org/en/latest/docs/pyramid.html", + url="https://trypyramid.com", license="BSD-derived (http://www.repoze.org/LICENSE.txt)", packages=find_packages(), include_package_data=True, -- cgit v1.2.3 From 764b5d30d70aacf3d095f240ffd1650ab15065c2 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Sun, 10 Apr 2016 20:52:22 -0600 Subject: Python 2.7 is the lowest version we support Remove the trove classifier, and have an hard error on attempting to install Pyramid on 2.6 or lower. Blame @mmerickel for the PEP8 on this commit, pyflake put all kinds of red in my vim window.. --- setup.py | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e26ae80d8..05476446e 100644 --- a/setup.py +++ b/setup.py @@ -26,8 +26,8 @@ if PY3: if py_version < (3, 3) and not is_pypy: # PyPy3 masquerades as Python 3.2... raise RuntimeError('On Python 3, Pyramid requires Python 3.3 or better') else: - if py_version < (2, 6): - raise RuntimeError('On Python 2, Pyramid requires Python 2.6 or better') + if py_version < (2, 7): + raise RuntimeError('On Python 2, Pyramid requires Python 2.7 or better') here = os.path.abspath(os.path.dirname(__file__)) try: @@ -38,7 +38,7 @@ try: except IOError: README = CHANGES = '' -install_requires=[ +install_requires = [ 'setuptools', 'WebOb >= 1.3.1', # request.domain and CookieProfile 'repoze.lru >= 0.4', # py3 compat @@ -74,24 +74,23 @@ testing_extras = tests_require + [ setup(name='pyramid', version='1.7.dev0', description='The Pyramid Web Framework, a Pylons project', - long_description=README + '\n\n' + CHANGES, + long_description=README + '\n\n' + CHANGES, classifiers=[ - "Development Status :: 6 - Mature", - "Intended Audience :: Developers", - "Programming Language :: Python", - "Programming Language :: Python :: 2.6", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: PyPy", - "Framework :: Pyramid", - "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: WWW/HTTP :: WSGI", - "License :: Repoze Public License", - ], + "Development Status :: 6 - Mature", + "Intended Audience :: Developers", + "Programming Language :: Python", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", + "Framework :: Pyramid", + "Topic :: Internet :: WWW/HTTP", + "Topic :: Internet :: WWW/HTTP :: WSGI", + "License :: Repoze Public License", + ], keywords='web wsgi pylons pyramid', author="Chris McDonough, Agendaless Consulting", author_email="pylons-discuss@googlegroups.com", @@ -100,14 +99,14 @@ setup(name='pyramid', packages=find_packages(), include_package_data=True, zip_safe=False, - install_requires = install_requires, - extras_require = { - 'testing':testing_extras, - 'docs':docs_extras, + install_requires=install_requires, + extras_require={ + 'testing': testing_extras, + 'docs': docs_extras, }, - tests_require = tests_require, + tests_require=tests_require, test_suite="pyramid.tests", - entry_points = """\ + entry_points="""\ [pyramid.scaffold] starter=pyramid.scaffolds:StarterProjectTemplate zodb=pyramid.scaffolds:ZODBProjectTemplate @@ -128,4 +127,3 @@ setup(name='pyramid', cherrypy = pyramid.scripts.pserve:cherrypy_server_runner """ ) - -- cgit v1.2.3 From ccd9e10cb15fa7256feb47663eb994cd00dfe782 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Tue, 12 Apr 2016 17:54:46 -0600 Subject: Don't force Py2.7 or higher --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 05476446e..e5ea4c5dc 100644 --- a/setup.py +++ b/setup.py @@ -26,8 +26,8 @@ if PY3: if py_version < (3, 3) and not is_pypy: # PyPy3 masquerades as Python 3.2... raise RuntimeError('On Python 3, Pyramid requires Python 3.3 or better') else: - if py_version < (2, 7): - raise RuntimeError('On Python 2, Pyramid requires Python 2.7 or better') + if py_version < (2, 6): + raise RuntimeError('On Python 2, Pyramid requires Python 2.6 or better') here = os.path.abspath(os.path.dirname(__file__)) try: -- cgit v1.2.3 From 51cc630b6868a148aa153b751410ea9eb5ecc9d9 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Sat, 16 Apr 2016 23:10:33 -0600 Subject: Back to dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e5ea4c5dc..021da2b5f 100644 --- a/setup.py +++ b/setup.py @@ -72,7 +72,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.7.dev0', + version='1.8.dev0', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3