From e6c2d2eb7a9608658823fc2854104c2a61284942 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
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 <chrism@plope.com>
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 <chrism@plope.com>
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 <chrism@plope.com>
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