Updated Django GAE Standard Sample to CloudSQL v2 and Django 1.10 #714

ryanmats · 2016-12-13T03:03:43Z

Updated sample code and moved it from https://github.com/GoogleCloudPlatform/appengine-django-skeleton to python-docs-samples.

Tested code end to end to make sure it works locally / deployed.

Will update tutorial at https://cloud.google.com/python/django/appengine next.

theacodes · 2016-12-13T17:43:46Z

appengine/standard/django/CONTRIBUTING.md

@@ -0,0 +1,35 @@
+# How to become a contributor and submit your own code


Remove this file.

theacodes · 2016-12-13T17:45:22Z

appengine/standard/django/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) Waldemar Kornewald, Thomas Wanschik, and all contributors.


Remove this file.

theacodes · 2016-12-13T17:45:48Z

appengine/standard/django/README.md

+See our [Running Django in the App Engine Standard Environment](https://cloud.google.com/python/django/appengine) tutorial for instructions for setting up and deploying this sample application.
+
+
+## Contributing changes


Link to the top-level contributing and license files or remove these sections.

theacodes · 2016-12-13T17:46:02Z

appengine/standard/django/app.yaml

@@ -0,0 +1,43 @@
+# Copyright 2015 Google Inc.


We typically don't include this header in app.yaml.

theacodes · 2016-12-13T17:46:23Z

appengine/standard/django/app.yaml

+  version: 1.2.5
+# [END django_app]
+
+skip_files:


Can you add a comment here explaining why this is necessary and what you changed from the default.

theacodes · 2016-12-13T17:47:20Z

appengine/standard/django/mysite/settings.py

+# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
+
+# [START db_setup]
+import os


put this at the top to please the lint god.

done - looks like os was already imported up top

theacodes · 2016-12-13T17:48:05Z

appengine/standard/django/mysite/settings.py

+# [START db_setup]
+import os
+if os.getenv('SERVER_SOFTWARE', '').startswith('Google App Engine'):
+    # Running on production App Engine, so use a Google Cloud SQL database.


How about:

# Running on production App Engine, so connect to Google Cloud SQL using the unix socket # at /cloudsql/<connection string>

theacodes · 2016-12-13T17:48:49Z

appengine/standard/django/mysite/settings.py

+        }
+    }
+else:
+    DATABASES = {


Add a comment here like this:

# Running locally so connect to either a local MySQL instance or connect to Cloud SQL # via the proxy. To start the proxy: # # $ ... #

theacodes · 2016-12-13T17:49:23Z

appengine/standard/django/requirements.txt

+MySQL-python==1.2.5
+Django==1.10.3
+mysqlclient==1.3.9
+wheel==0.30.0a0


remove wheel.

theacodes · 2016-12-13T17:49:49Z

appengine/standard/django/requirements.txt

+# only install locally since GAE has its own version
+MySQL-python==1.2.5
+Django==1.10.3
+mysqlclient==1.3.9


Remove mysqlclient - we use this in flex because it supports Python 3.

…n-docs-samples into django-standard-sample

ryanmats

made all changes, including a few others for linting purposes

ryanmats · 2016-12-13T21:06:08Z

appengine/standard/django/CONTRIBUTING.md

@@ -0,0 +1,35 @@
+# How to become a contributor and submit your own code


ryanmats · 2016-12-13T21:06:14Z

appengine/standard/django/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) Waldemar Kornewald, Thomas Wanschik, and all contributors.


ryanmats · 2016-12-13T21:07:00Z

appengine/standard/django/README.md

+See our [Running Django in the App Engine Standard Environment](https://cloud.google.com/python/django/appengine) tutorial for instructions for setting up and deploying this sample application.
+
+
+## Contributing changes


ryanmats · 2016-12-13T21:08:46Z

appengine/standard/django/app.yaml

@@ -0,0 +1,43 @@
+# Copyright 2015 Google Inc.


ryanmats · 2016-12-13T21:23:41Z

appengine/standard/django/app.yaml

+
+# Only pure Python libraries can be vendored
+# Python libraries that use C extensions can
+# only be included if they are part of the App Engine SDK 


ryanmats · 2016-12-13T21:30:47Z

appengine/standard/django/mysite/settings.py

+# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
+
+# [START db_setup]
+import os


done - looks like os was already imported up top

ryanmats · 2016-12-13T21:32:13Z

appengine/standard/django/mysite/settings.py

+# [START db_setup]
+import os
+if os.getenv('SERVER_SOFTWARE', '').startswith('Google App Engine'):
+    # Running on production App Engine, so use a Google Cloud SQL database.


ryanmats · 2016-12-13T21:33:34Z

appengine/standard/django/mysite/settings.py

+        }
+    }
+else:
+    DATABASES = {


ryanmats · 2016-12-13T21:34:19Z

appengine/standard/django/requirements.txt

+# only install locally since GAE has its own version
+MySQL-python==1.2.5
+Django==1.10.3
+mysqlclient==1.3.9


ryanmats · 2016-12-13T21:34:24Z

appengine/standard/django/requirements.txt

+MySQL-python==1.2.5
+Django==1.10.3
+mysqlclient==1.3.9
+wheel==0.30.0a0


theacodes · 2016-12-13T21:45:38Z

appengine/standard/django/mysite/settings.py

+    }
+else:
+    # Running locally so connect to either a local MySQL instance or connect to
+    # Cloud SQL via the proxy. To start the proxy:


You didn't add the code to start the proxy! Also, why not go ahead and link to the documentation for the proxy.

ryanmats added 3 commits December 12, 2016 18:54

Updated GAE Standard Django App for CloudSQL v2 and moved it to repo

429ce18

Removed gitignore file from commit

2348ab7

Added note about security of ALLOWED_HOSTS

569094f

ryanmats requested review from theacodes and waprin December 13, 2016 03:03

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Dec 13, 2016

waprin approved these changes Dec 13, 2016

View reviewed changes

theacodes suggested changes Dec 13, 2016

View reviewed changes

ryanmats added 2 commits December 13, 2016 13:04

Merge branch 'master' of https://github.com/GoogleCloudPlatform/pytho…

372a69a

…n-docs-samples into django-standard-sample

Revised Django GAE Standard code based on Jons comments

9ffcdb1

ryanmats commented Dec 13, 2016

View reviewed changes

theacodes suggested changes Dec 13, 2016

View reviewed changes

ryanmats and others added 3 commits December 13, 2016 14:00

Added comment about starting proxy from command line

53050d2

Added link to proxy doc

505c42a

Fix some minor issues

0d7e33c

theacodes approved these changes Dec 13, 2016

View reviewed changes

theacodes merged commit 37a606c into master Dec 13, 2016

theacodes deleted the django-standard-sample branch December 13, 2016 22:12

		@@ -0,0 +1,35 @@
		# How to become a contributor and submit your own code

		@@ -0,0 +1,27 @@
		Copyright (c) Waldemar Kornewald, Thomas Wanschik, and all contributors.

		See our [Running Django in the App Engine Standard Environment](https://cloud.google.com/python/django/appengine) tutorial for instructions for setting up and deploying this sample application.


		## Contributing changes

Updated Django GAE Standard Sample to CloudSQL v2 and Django 1.10 #714

Updated Django GAE Standard Sample to CloudSQL v2 and Django 1.10 #714

Uh oh!

Conversation

ryanmats commented Dec 13, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ryanmats left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!