Merge pull request #9 from smajda/master

Updates for local development

Author: estebistec

.gitignore

@@ -3,3 +3,4 @@
 pythonkc_site/pythonkc.sqlite
 pythonkc_site/local_settings.py
 pythonkc_site/private_settings.py
+pythonkc_site/.env

docs/local_development.rst

@@ -10,8 +10,6 @@ Running PythonKC.com Locally
 
 #. ``pip install -r requirements/project.txt``
 
-#. ``python manage.py syncdb``
-
 #. Create ``local_settings.py``, with::
 
     DEBUG = TEMPLATE_DEBUG = True
@@ -20,23 +18,21 @@ Running PythonKC.com Locally
     # Otherwise, you probably want emails you test with to come to you:
     CONTACT_EMAIL_TO = ['me@gmail.com']
 
-#. Create ``private_settings.py`` with:
+#. Create a `.env` file with:
 
-    #. Meetup.com API key::
+   #!/bin/sh
+   export MEETUP_API_KEY="<your meetup.com API key>"
 
-        MEETUP_API_KEY = "<your API key for meetup.com>"
+   # if you're not using console.EmailBackend:
+   export EMAIL_HOST_USER="<your email user>"
+   export EMAIL_HOST_PASSWORD="<your email password>"
 
-    #. SMTP settings (if you kept the default email backend of SMTP above)::
+#. Source your .env file: ``source .env``.
 
-        # For example....
-        EMAIL_HOST = "smtp.gmail.com"
-        EMAIL_PORT = 587
-        EMAIL_USE_TLS = True
-        EMAIL_HOST_USER = "contact@pythonkc.com"
-        EMAIL_HOST_PASSWORD = "*******************"
+#. ``python manage.py syncdb``
 
 #. ``python manage.py runserver``
 
 #. Profit!!!
 
-Note that both ``local_settings.py`` and ``private_settings.py`` are in our ``.gitignore``, so you don't commit what you do there.
+Note that both ``local_settings.py`` and ``.env`` are in our ``.gitignore``, so you don't commit what you do there.

pythonkc_site/settings.py

@@ -163,8 +163,8 @@
 EMAIL_HOST = "smtp.gmail.com"
 EMAIL_PORT = 587
 EMAIL_USE_TLS = True
-EMAIL_HOST_USER = os.environ["EMAIL_HOST_USER"]
-EMAIL_HOST_PASSWORD = os.environ["EMAIL_HOST_PASSWORD"]
+EMAIL_HOST_USER = os.environ.get("EMAIL_HOST_USER")
+EMAIL_HOST_PASSWORD = os.environ.get("EMAIL_HOST_PASSWORD")
 MEETUP_API_KEY = os.environ["MEETUP_API_KEY"]
 
 try:
@@ -174,7 +174,7 @@
 
 
 try:
-    # NOTE The GONDOR_REDIS_* settings are placed in local_settings by the 
+    # NOTE The GONDOR_REDIS_* settings are placed in local_settings by the
     # Gondor runtime.
     CACHES = {
         'default': {