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