Skip to content

Commit 1e47cda

Browse files
committed
Merge pull request #11 from smajda/upgrades
Django 1.5 upgrade
2 parents 6787acb + 03e18ab commit 1e47cda

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

docs/local_development.rst

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@ Running PythonKC.com Locally
1818
# Otherwise, you probably want emails you test with to come to you:
1919
CONTACT_EMAIL_TO = ['me@gmail.com']
2020

21-
#. Create a `.env` file with:
22-
23-
#!/bin/sh
24-
export MEETUP_API_KEY="<your meetup.com API key>"
25-
26-
# if you're not using console.EmailBackend:
27-
export EMAIL_HOST_USER="<your email user>"
28-
export EMAIL_HOST_PASSWORD="<your email password>"
21+
#. Create a `.env` file with::
22+
23+
#!/bin/sh
24+
export MEETUP_API_KEY="<your meetup.com API key>"
25+
export DJANGO_SECRET_KEY="<your secret key>"
26+
27+
# if you're not using console.EmailBackend:
28+
export EMAIL_HOST_USER="<your email user>"
29+
export EMAIL_HOST_PASSWORD="<your email password>"
2930

3031
#. Source your .env file: ``source .env``.
3132

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Django==1.3.6
2+
South==0.7.3
3+
distribute==0.7.3
4+
django-redis-cache==0.9.2
25
gondor==1.0.5
6+
mimeparse==0.1.3
7+
pip-tools==0.3.4
38
psycopg2==2.4.2
4-
South==0.7.3
9+
python-dateutil==1.5
510
pythonkc-meetups==0.1.0
6-
django-redis-cache==0.9.2
11+
redis==2.8.0
12+
requests==0.7.5
13+
wsgiref==0.1.2

pythonkc_site/settings.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
MANAGERS = ADMINS
1414

15+
SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY')
16+
1517
DATABASES = {
1618
'default': {
1719
'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.

pythonkc_site/templates/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ <h1>FOLLOW US</h1>
142142
</section>
143143
<section>
144144
<div id="contact-form">
145-
<form action="{% url home %}" method="post"
145+
<form action="{% url 'home' %}" method="post"
146146
enctype="application/x-www-form-urlencoded"
147147
class="contact-form">
148148
{% csrf_token %}

0 commit comments

Comments
 (0)