From 83fefbf3f92183d1d899c8449a03546dd3c022a3 Mon Sep 17 00:00:00 2001
From: Paul Everitt <paul@agendaless.com>
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 <tomster@pyfidelity.com>
Date: Sat, 17 Aug 2013 16:10:45 +0200
Subject: include and mention the `nose-selecttests
 <https://pypi.python.org/pypi/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