Merge pull request #788 from gratipay/upgrade-aspen-to-0.42

Upgrade Aspen to 0.42

Makefile

@@ -13,8 +13,8 @@ env: requirements.txt requirements_tests.txt
 				--extra-search-dir=./vendor/ \
 				./env/
 	./$(env_bin)/pip --version
-	./$(env_bin)/pip install -f file:///$(PWD)/vendor -r requirements.txt
-	./$(env_bin)/pip install -f file:///$(PWD)/vendor -r requirements_tests.txt
+	./$(env_bin)/pip install --no-index --find-links=file:///$(PWD)/vendor -r requirements.txt
+	./$(env_bin)/pip install --no-index --find-links=file:///$(PWD)/vendor -r requirements_tests.txt
 
 clean:
 	rm -rf env

configure-aspen.py → inside_gratipay/main.py

@@ -1,12 +1,16 @@
 import os
 import string
 import random
-from os.path import basename, dirname, join, realpath, isdir
+from os.path import basename, dirname
 
 from aspen import Response
-import canonizer
-import gfm
-from nav import NavItem
+from aspen.website import Website
+
+from . import canonizer, gfm
+from .nav import NavItem
+
+
+website = Website(www_root='www', project_root='.')
 
 
 # Manually register markdown renderer to work around Heroku deployment woes.

nav.py → inside_gratipay/nav.py

@@ -6,12 +6,12 @@
 from os.path import join, realpath, isfile, isdir, basename
 
 from aspen import resources
-from aspen.resources.static_resource import StaticResource
+from aspen.http.resource import Static
 
 
 def get_simplate_context(website, fs):
     resource = resources.get(website, fs)
-    return {} if isinstance(resource, StaticResource) else resource.pages[0]
+    return {} if isinstance(resource, Static) else resource.pages[0]
 
 
 class NavItem(OrderedDict):

requirements.txt

@@ -1,14 +1,13 @@
 
-aspen==0.37
-  filesystem_tree==1.0.1
-  first==2.0.1
-mimeparse==0.1.3
-dependency_injection==1.1.0
-algorithm==1.0.0
+ algorithm==1.0.0
+ dependency_injection==1.1.0
+ filesystem_tree==1.0.1
+ python-mimeparse==0.1.4
+aspen==0.42
 
-MarkupSafe==0.18
-Jinja2==2.7.1
-aspen-jinja2==0.3
+  MarkupSafe==0.18
+ Jinja2==2.7.1
+aspen-jinja2==0.4
 
 simplejson==2.3.2
 
@@ -17,5 +16,7 @@ mistune_contrib==0.1
 
 honcho==0.5.0
 
+ six==1.10.0
 libsass==0.3.0
-  six==1.10.0
+
+--editable .

requirements_tests.txt

@@ -1 +1,2 @@
+ py==1.4.29
 pytest==2.9.2

setup.py

@@ -0,0 +1,3 @@
+from setuptools import setup, find_packages
+
+setup(name='inside_gratipay', packages=find_packages())

startapp.py

@@ -8,25 +8,18 @@
 PORT = 8536  # default/devserver port
 
 import sys
-from aspen.website import Website
-
-aspen_config = [
-    '--www_root=www/',
-    '--project_root=.'
-]
-
+
 for param in sys.argv:
     if param.startswith('--port'):
         _, PORT = param.split('=')
         PORT = int(PORT)
- 
- 
+
+
 # by WSGI convention, we need to create webapp object
 # and by default most WSGI servers look for 'application'
-application = Website(aspen_config)
- 
+from inside_gratipay.main import website as application
+
 if __name__ == '__main__':
     from wsgiref.simple_server import make_server
-    print("* Running development server on http://%s:%s" % (HOST, PORT))
+    print("* Running development server on http://%s:%s" % (HOST or 'localhost', PORT))
     make_server(HOST, PORT, application).serve_forever()
-

tests/py/test_security.py

@@ -2,10 +2,13 @@
 from pytest import yield_fixture
 
 from aspen.testing.client import Client
+from inside_gratipay.main import website
 
 @yield_fixture
 def client():
-    yield Client(www_root='www', project_root='')
+    client = Client(www_root='www', project_root='.')
+    client._website = website
+    yield client
 
 def test_disallowed_methods(client):
     for disallowed in ['TRACE', 'trAce', 'DELETE', 'PUT', 'OPTIONS', 'JUNK']: