Merge pull request #1317 from jmaddux-techempower/master

Fix django and pyramid

frameworks/Python/pyramid/frameworkbenchmarks/__init__.py

@@ -0,0 +1,23 @@
+"""
+App config and initialization.
+"""
+
+from pyramid.request import Request
+from pyramid.config import Configurator
+from frameworkbenchmarks.models import sqlalchemy_encoder_factory
+
+
+def main(global_config, **settings):
+    """ This function returns a Pyramid WSGI application.
+    """
+    config = Configurator(settings=settings)
+    config.add_renderer('sqla_json', sqlalchemy_encoder_factory)
+    config.include('pyramid_chameleon')
+    config.add_route('test_1', '/json')
+    config.add_route('test_2', '/db')
+    config.add_route('test_3', '/queries')
+    config.add_route('test_4', '/fortunes')
+    config.add_route('test_5', '/updates')
+    config.add_route('test_6', '/plaintext')
+    config.scan()
+    return config.make_wsgi_app()

frameworks/Python/pyramid/frameworkbenchmarks/views.py

@@ -21,7 +21,7 @@ def test_2(request):
     """
     Test type 2: Single database query
     """
-    num = randint(1, 10001)
+    num = randint(1, 10000)
     result = DBSession.query(World).filter(World.id == num).one()
     return result
 
@@ -43,7 +43,7 @@ def test_3(request):
             queries = 500
     result = [
         DBSession.query(World).filter(World.id == num).one()
-        for num in [randint(1, 10001) for _ in range(1, queries + 1)]
+        for num in [randint(1, 10000) for _ in range(1, queries + 1)]
     ]
     return result
 
@@ -77,10 +77,10 @@ def test_5(request):
             queries = 500
     objset = [
         DBSession.query(World).filter(World.id == num).one()
-        for num in [randint(1, 10001) for _ in range(1, queries + 1)]
+        for num in [randint(1, 10000) for _ in range(1, queries + 1)]
     ]
     for obj in objset:
-        obj.randomNumber = randint(1, 10001)
+        obj.randomNumber = randint(1, 10000)
     resultset = [obj.__json__() for obj in objset]
     DBSession.commit()
     return resultset

toolset/setup/linux/languages/python3.sh

@@ -10,6 +10,7 @@ cd Python-3.4.2
 make -j4 --quiet
 make install --quiet
 
+ln -s ${IROOT}/py3/bin/python3.4m ${IROOT}/py3/bin/python3.4
 ${IROOT}/py3/bin/python3 -m ensurepip -U
 ${IROOT}/py3/bin/pip3 install -U setuptools pip