Merge pull request #27 from yougov/python3

Major refresh
chadwhitacre · Jan 20, 2016 · 9b10944 · 9b10944
2 parents 82049a8 + 60237ad
commit 9b10944
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 2,015 deletions.
diff --git a/Makefile b/Makefile
@@ -1,18 +1,15 @@
 env:
-	python2.7 ./vendor/virtualenv-1.6.4.py \
-				--no-site-packages \
-				--unzip-setuptools \
+	unzip -q -d vendor/virtualenv vendor/virtualenv*.whl
+	python ./vendor/virtualenv/virtualenv.py \
 				--prompt="[mongs] " \
-				--never-download \
-				--extra-search-dir=./vendor/ \
-				--distribute \
 				./env/
+	rm -R vendor/virtualenv
 	./env/bin/pip install -r requirements.txt
 
 clean:
 	rm -rf env
 
 run: env
-	./env/bin/aspen --network_address=127.0.0.1:29017 \
-				    --www_root=www/ \
-					--project_root=.
+	ASPEN_WWW_ROOT=www ASPEN_PROJECT_ROOT=. PORT=29017 \
+	ASPEN_RENDERER_DEFAULT=jinja2 \
+		./env/bin/python -m aspen
diff --git a/base.html b/base.html
@@ -128,6 +128,6 @@
         </script>
     </head>
     <body>
-        {% block content %}{% end %}
+        {% block content %}{% endblock %}
     </body>
 </html>
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,3 @@
-./vendor/Cheroot-4.0.0beta.tar.gz
-./vendor/mimeparse-0.1.3.tar.gz
-./vendor/tornado-1.2.1.tar.gz
-./vendor/aspen-0.24.3.tar.gz
-./vendor/simplejson-2.2.1.tar.gz
-./vendor/pymongo-3.0.2.tar.gz
+aspen==0.42
+aspen-jinja2==0.4
+pymongo==3.2
diff --git a/vendor/Cheroot-4.0.0beta.tar.gz b/vendor/Cheroot-4.0.0beta.tar.gz
diff --git a/vendor/aspen-0.24.3.tar.gz b/vendor/aspen-0.24.3.tar.gz
diff --git a/vendor/distribute-0.6.19.tar.gz b/vendor/distribute-0.6.19.tar.gz
diff --git a/vendor/mimeparse-0.1.3.tar.gz b/vendor/mimeparse-0.1.3.tar.gz
diff --git a/vendor/pip-1.0.2.tar.gz b/vendor/pip-1.0.2.tar.gz
diff --git a/vendor/pymongo-3.0.2.tar.gz b/vendor/pymongo-3.0.2.tar.gz
diff --git a/vendor/simplejson-2.2.1.tar.gz b/vendor/simplejson-2.2.1.tar.gz
diff --git a/vendor/tornado-1.2.1.tar.gz b/vendor/tornado-1.2.1.tar.gz