From b2a749b34c1140613b3deaa2b55ab6c29dd343cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= Date: Mon, 20 Feb 2017 11:31:38 +0100 Subject: Add test. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d9fcec4c8..bd0e7f4d7 100644 --- a/setup.py +++ b/setup.py @@ -65,9 +65,10 @@ docs_extras = [ ] testing_extras = tests_require + [ + 'mock', 'nose', 'coverage', - 'virtualenv', # for scaffolding tests + 'virtualenv', # for scaffolding tests ] setup(name='pyramid', -- cgit v1.2.3 From 1702daa1d312381a37b86ebf869cf4e1abe2c185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= Date: Mon, 27 Feb 2017 18:32:58 +0100 Subject: Rewrite test without mock. --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bd0e7f4d7..ab2170fec 100644 --- a/setup.py +++ b/setup.py @@ -65,7 +65,6 @@ docs_extras = [ ] testing_extras = tests_require + [ - 'mock', 'nose', 'coverage', 'virtualenv', # for scaffolding tests -- cgit v1.2.3 From 8b96cfeedd5aee88cfb1a744d480130853526a87 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 28 Mar 2017 01:10:36 -0500 Subject: add python_requires metadata --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ab2170fec..29de8dcdf 100644 --- a/setup.py +++ b/setup.py @@ -98,6 +98,7 @@ setup(name='pyramid', packages=find_packages(), include_package_data=True, zip_safe=False, + python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*', install_requires=install_requires, extras_require={ 'testing': testing_extras, -- cgit v1.2.3 From 441503653073f465c0140f6f78f079526cf8efc2 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 28 Mar 2017 01:18:21 -0500 Subject: depend on python_requires in pip 9+ to check runtime versions - The python_requires checks work when installing a wheel as well, which these checks did not affect. --- setup.py | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 29de8dcdf..ff3e38874 100644 --- a/setup.py +++ b/setup.py @@ -13,21 +13,9 @@ ############################################################################## import os -import sys -import warnings from setuptools import setup, find_packages -py_version = sys.version_info[:2] - -if (3, 0) <= py_version < (3, 4): - warnings.warn( - 'On Python 3, Pyramid only supports Python 3.4 or better', - UserWarning, - ) -elif 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: with open(os.path.join(here, 'README.rst')) as f: -- cgit v1.2.3 From 14be695bd7d187e162145a28ac07fe341dae3208 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 28 Mar 2017 01:29:33 -0500 Subject: rewrite low-level pyramid config functions to use plaster --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ff3e38874..046341f13 100644 --- a/setup.py +++ b/setup.py @@ -34,10 +34,12 @@ install_requires = [ 'venusian >= 1.0a3', # ``ignore`` 'translationstring >= 0.4', # py3 compat 'PasteDeploy >= 1.5.0', # py3 compat + 'plaster', 'hupper', ] tests_require = [ + 'plaster_pastedeploy', 'WebTest >= 1.3.1', # py3 compat 'zope.component >= 4.0', # py3 compat ] -- cgit v1.2.3 From db8aeae4c79b0bec3b8c28f5b060a75e453e1f98 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Thu, 30 Mar 2017 01:53:03 -0500 Subject: depend on plaster_pastedeploy --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 046341f13..3048428aa 100644 --- a/setup.py +++ b/setup.py @@ -35,11 +35,11 @@ install_requires = [ 'translationstring >= 0.4', # py3 compat 'PasteDeploy >= 1.5.0', # py3 compat 'plaster', + 'plaster_pastedeploy', 'hupper', ] tests_require = [ - 'plaster_pastedeploy', 'WebTest >= 1.3.1', # py3 compat 'zope.component >= 4.0', # py3 compat ] -- cgit v1.2.3 From c84904381f664511060b39d0937fbe76efa22f25 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 1 May 2017 22:51:58 -0500 Subject: prep 1.9a1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3048428aa..6aac12ff8 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.9.dev0', + version='1.9a1', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From 607367ace939488f787d918c60275a90d5505dbd Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 9 May 2017 01:42:09 -0500 Subject: prep 1.9a2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6aac12ff8..03416efe7 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.9a1', + version='1.9a2', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From bd124a79c3c1517290b9d074f88875f05a2b619e Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 19 Jun 2017 22:16:26 -0500 Subject: prep 1.9b1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 03416efe7..840dcfdb5 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.9a2', + version='1.9b1', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From d826df0b03011f46ee4d92b446e6ff19db9831b4 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 26 Jun 2017 23:44:23 -0500 Subject: prep 1.9 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 840dcfdb5..2d8922eed 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.9b1', + version='1.9', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From 884eb55bbaef486deadb629d87abc0bf46a11719 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 27 Jun 2017 00:10:12 -0500 Subject: prep 1.10.dev0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2d8922eed..27421d8b2 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.9', + version='1.10.dev0', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3 From e42ba531963c35a89818bf57f08b0ab87c04e8bf Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 27 Jun 2017 23:11:44 -0500 Subject: add a manifest and a tox step to check it --- setup.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 27421d8b2..2af0535c3 100644 --- a/setup.py +++ b/setup.py @@ -12,18 +12,14 @@ # ############################################################################## -import os - from setuptools import setup, find_packages -here = os.path.abspath(os.path.dirname(__file__)) -try: - 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() -except IOError: - README = CHANGES = '' +def readfile(name): + with open(name) as f: + return f.read() + +README = readfile('README.rst') +CHANGES = readfile('CHANGES.txt') install_requires = [ 'setuptools', -- cgit v1.2.3 From e80491c54de5c54fe666526cd01217375d128efd Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Thu, 3 Aug 2017 18:45:59 +0200 Subject: Drop repoze.lru on Python 3 Starting with Python 3.2, the functools module grew a lru_cache function which can replace our usage of repoze.lru. --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2af0535c3..3a7f7e161 100644 --- a/setup.py +++ b/setup.py @@ -12,6 +12,8 @@ # ############################################################################## +import sys + from setuptools import setup, find_packages def readfile(name): @@ -24,7 +26,6 @@ CHANGES = readfile('CHANGES.txt') install_requires = [ 'setuptools', 'WebOb >= 1.7.0rc2', # Response.has_body - 'repoze.lru >= 0.4', # py3 compat 'zope.interface >= 3.8.0', # has zope.interface.registry 'zope.deprecation >= 3.5.0', # py3 compat 'venusian >= 1.0a3', # ``ignore`` @@ -87,6 +88,7 @@ setup(name='pyramid', python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*', install_requires=install_requires, extras_require={ + ':python_version<"3.2"': ['repoze.lru >= 0.4'], 'testing': testing_extras, 'docs': docs_extras, }, -- cgit v1.2.3 From d5a66295d8044cd7d60c684a5c1732771822d149 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sun, 22 Oct 2017 13:51:20 -0500 Subject: changelog for #3140 --- setup.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3a7f7e161..14c0ab770 100644 --- a/setup.py +++ b/setup.py @@ -11,9 +11,6 @@ # FITNESS FOR A PARTICULAR PURPOSE # ############################################################################## - -import sys - from setuptools import setup, find_packages def readfile(name): -- cgit v1.2.3 From 6141a7339840701fcff98a4e36152d998b59ea84 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Thu, 8 Mar 2018 12:29:42 -0500 Subject: Mark changelogs as ReST, for better Github rendering. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 14c0ab770..6fa833737 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ def readfile(name): return f.read() README = readfile('README.rst') -CHANGES = readfile('CHANGES.txt') +CHANGES = readfile('CHANGES.rst') install_requires = [ 'setuptools', -- cgit v1.2.3