Merge pull request #76 from GoogleCloudPlatform/appengine-consolidation

Organizing all app engine samples under appengine
GoogleCloudPlatform · Sep 2, 2015 · 89880d7 · 89880d7
2 parents 2d363d5 + 0fa8780
commit 89880d7
Show file tree

Hide file tree

Showing 57 changed files with 28 additions and 25 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -2,10 +2,11 @@
 include =
     appengine/*
     bigquery/*
+    blog/*
+    compute/*
     datastore/*
-    localtesting/*
+    monitoring/*
     storage/*
-    blog/*
 [report]
 exclude_lines =
     pragma: NO COVER
diff --git a/bigquery/samples/appengine_auth/README.md → appengine/bigquery/README.md b/bigquery/samples/appengine_auth/README.md → appengine/bigquery/README.md
diff --git a/bigquery/samples/appengine_auth/__init__.py → appengine/bigquery/__init__.py b/bigquery/samples/appengine_auth/__init__.py → appengine/bigquery/__init__.py
diff --git a/bigquery/samples/appengine_auth/app.yaml → appengine/bigquery/app.yaml b/bigquery/samples/appengine_auth/app.yaml → appengine/bigquery/app.yaml
diff --git a/...amples/appengine_auth/appengine_config.py → appengine/bigquery/appengine_config.py b/...amples/appengine_auth/appengine_config.py → appengine/bigquery/appengine_config.py
diff --git a/...amples/appengine_auth/client_secrets.json → appengine/bigquery/client_secrets.json b/...amples/appengine_auth/client_secrets.json → appengine/bigquery/client_secrets.json
diff --git a/bigquery/samples/appengine_auth/main.py → appengine/bigquery/main.py b/bigquery/samples/appengine_auth/main.py → appengine/bigquery/main.py
diff --git a/...y/samples/appengine_auth/requirements.txt → appengine/bigquery/requirements.txt b/...y/samples/appengine_auth/requirements.txt → appengine/bigquery/requirements.txt
diff --git a/bigquery/tests/appengine/__init__.py → appengine/bigquery/tests/__init__.py b/bigquery/tests/appengine/__init__.py → appengine/bigquery/tests/__init__.py
diff --git a/...ry/tests/appengine/test_appengine_auth.py → ...ine/bigquery/tests/test_appengine_auth.py b/...ry/tests/appengine/test_appengine_auth.py → ...ine/bigquery/tests/test_appengine_auth.py
@@ -17,7 +17,7 @@
 
 from apiclient.http import HttpMock
 
-from bigquery.samples.appengine_auth import main
+from appengine.bigquery import main
 
 import mock
 
@@ -26,10 +26,6 @@
 import webapp2
 
 
-RESOURCE_PATH = os.path.join(
-    os.path.abspath(os.path.dirname(__file__)), '..', 'resources')
-
-
 class TestAuthSample(tests.DatastoreTestbedCase, tests.CloudBaseTest):
 
     def setUp(self):
@@ -71,7 +67,7 @@ def test_oauthed_get(self, *args):
         request = webapp2.Request.blank('/')
 
         mock_http = HttpMock(
-            os.path.join(RESOURCE_PATH, 'datasets-list.json'),
+            os.path.join(self.resource_path, 'datasets-list.json'),
             {'status': '200'})
         with mock.patch.object(main.decorator, 'http', return_value=mock_http):
             original_projectid = main.PROJECTID

diff --git a/datastore/__init__.py → appengine/localtesting/__init__.py b/datastore/__init__.py → appengine/localtesting/__init__.py
diff --git a/localtesting/queue.yaml → appengine/localtesting/queue.yaml b/localtesting/queue.yaml → appengine/localtesting/queue.yaml
diff --git a/localtesting/runner.py → appengine/localtesting/runner.py b/localtesting/runner.py → appengine/localtesting/runner.py
diff --git a/localtesting/test_datastore.py → appengine/localtesting/test_datastore.py b/localtesting/test_datastore.py → appengine/localtesting/test_datastore.py
diff --git a/localtesting/test_env_vars.py → appengine/localtesting/test_env_vars.py b/localtesting/test_env_vars.py → appengine/localtesting/test_env_vars.py
diff --git a/localtesting/test_login.py → appengine/localtesting/test_login.py b/localtesting/test_login.py → appengine/localtesting/test_login.py
diff --git a/localtesting/test_mail.py → appengine/localtesting/test_mail.py b/localtesting/test_mail.py → appengine/localtesting/test_mail.py
diff --git a/localtesting/test_task_queue.py → appengine/localtesting/test_task_queue.py b/localtesting/test_task_queue.py → appengine/localtesting/test_task_queue.py
diff --git a/datastore/ndb/README.md → appengine/ndb/README.md b/datastore/ndb/README.md → appengine/ndb/README.md
diff --git a/datastore/ndb/__init__.py → appengine/ndb/__init__.py b/datastore/ndb/__init__.py → appengine/ndb/__init__.py
diff --git a/datastore/ndb/modeling/README.md → appengine/ndb/modeling/README.md b/datastore/ndb/modeling/README.md → appengine/ndb/modeling/README.md
diff --git a/datastore/ndb/modeling/__init__.py → appengine/ndb/modeling/__init__.py b/datastore/ndb/modeling/__init__.py → appengine/ndb/modeling/__init__.py
diff --git a/...ndb/modeling/contact_with_group_models.py → ...ndb/modeling/contact_with_group_models.py b/...ndb/modeling/contact_with_group_models.py → ...ndb/modeling/contact_with_group_models.py
diff --git a/datastore/ndb/modeling/keyproperty_models.py → appengine/ndb/modeling/keyproperty_models.py b/datastore/ndb/modeling/keyproperty_models.py → appengine/ndb/modeling/keyproperty_models.py
diff --git a/datastore/ndb/modeling/naive_models.py → appengine/ndb/modeling/naive_models.py b/datastore/ndb/modeling/naive_models.py → appengine/ndb/modeling/naive_models.py
diff --git a/...store/ndb/modeling/parent_child_models.py → ...ngine/ndb/modeling/parent_child_models.py b/...store/ndb/modeling/parent_child_models.py → ...ngine/ndb/modeling/parent_child_models.py
diff --git a/...ore/ndb/modeling/relation_model_models.py → ...ine/ndb/modeling/relation_model_models.py b/...ore/ndb/modeling/relation_model_models.py → ...ine/ndb/modeling/relation_model_models.py
diff --git a/...db/modeling/structured_property_models.py → ...db/modeling/structured_property_models.py b/...db/modeling/structured_property_models.py → ...db/modeling/structured_property_models.py
diff --git a/datastore/ndb/modeling/tests/__init__.py → appengine/ndb/modeling/tests/__init__.py b/datastore/ndb/modeling/tests/__init__.py → appengine/ndb/modeling/tests/__init__.py
diff --git a/...g/tests/test_contact_with_group_models.py → ...g/tests/test_contact_with_group_models.py b/...g/tests/test_contact_with_group_models.py → ...g/tests/test_contact_with_group_models.py
@@ -14,7 +14,7 @@
 
 """Test classes for code snippet for modeling article."""
 
-from datastore.ndb.modeling import contact_with_group_models as models
+from appengine.ndb.modeling import contact_with_group_models as models
 
 from google.appengine.ext import ndb
 

diff --git a/...modeling/tests/test_keyproperty_models.py → ...modeling/tests/test_keyproperty_models.py b/...modeling/tests/test_keyproperty_models.py → ...modeling/tests/test_keyproperty_models.py
@@ -16,7 +16,7 @@
 
 import unittest
 
-from datastore.ndb.modeling import keyproperty_models as models
+from appengine.ndb.modeling import keyproperty_models as models
 
 from tests import DatastoreTestbedCase
 

diff --git a/...e/ndb/modeling/tests/test_naive_models.py → ...e/ndb/modeling/tests/test_naive_models.py b/...e/ndb/modeling/tests/test_naive_models.py → ...e/ndb/modeling/tests/test_naive_models.py
@@ -14,7 +14,7 @@
 
 """Test classes for code snippet for modeling article."""
 
-from datastore.ndb.modeling import naive_models as models
+from appengine.ndb.modeling import naive_models as models
 
 from tests import DatastoreTestbedCase
 

diff --git a/...odeling/tests/test_parent_child_models.py → ...odeling/tests/test_parent_child_models.py b/...odeling/tests/test_parent_child_models.py → ...odeling/tests/test_parent_child_models.py
@@ -14,7 +14,7 @@
 
 """Test classes for code snippet for modeling article."""
 
-from datastore.ndb.modeling import parent_child_models as models
+from appengine.ndb.modeling import parent_child_models as models
 
 from google.appengine.ext import ndb
 

diff --git a/...eling/tests/test_relation_model_models.py → ...eling/tests/test_relation_model_models.py b/...eling/tests/test_relation_model_models.py → ...eling/tests/test_relation_model_models.py
@@ -14,7 +14,7 @@
 
 """Test classes for code snippet for modeling article."""
 
-from datastore.ndb.modeling import relation_model_models as models
+from appengine.ndb.modeling import relation_model_models as models
 
 from google.appengine.ext import ndb
 

diff --git a/.../tests/test_structured_property_models.py → .../tests/test_structured_property_models.py b/.../tests/test_structured_property_models.py → .../tests/test_structured_property_models.py
@@ -14,7 +14,7 @@
 
 """Test classes for code snippet for modeling article."""
 
-from datastore.ndb.modeling import structured_property_models as models
+from appengine.ndb.modeling import structured_property_models as models
 
 from tests import DatastoreTestbedCase
 

diff --git a/datastore/ndb/overview/README.md → appengine/ndb/overview/README.md b/datastore/ndb/overview/README.md → appengine/ndb/overview/README.md
diff --git a/datastore/ndb/overview/__init__.py → appengine/ndb/overview/__init__.py b/datastore/ndb/overview/__init__.py → appengine/ndb/overview/__init__.py
diff --git a/datastore/ndb/overview/app.yaml → appengine/ndb/overview/app.yaml b/datastore/ndb/overview/app.yaml → appengine/ndb/overview/app.yaml
diff --git a/datastore/ndb/overview/favicon.ico → appengine/ndb/overview/favicon.ico b/datastore/ndb/overview/favicon.ico → appengine/ndb/overview/favicon.ico
diff --git a/datastore/ndb/overview/index.yaml → appengine/ndb/overview/index.yaml b/datastore/ndb/overview/index.yaml → appengine/ndb/overview/index.yaml
diff --git a/datastore/ndb/overview/main.py → appengine/ndb/overview/main.py b/datastore/ndb/overview/main.py → appengine/ndb/overview/main.py
diff --git a/datastore/ndb/overview/tests/__init__.py → appengine/ndb/overview/tests/__init__.py b/datastore/ndb/overview/tests/__init__.py → appengine/ndb/overview/tests/__init__.py
diff --git a/...store/ndb/overview/tests/test_overview.py → ...ngine/ndb/overview/tests/test_overview.py b/...store/ndb/overview/tests/test_overview.py → ...ngine/ndb/overview/tests/test_overview.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # from the app main.py
-from datastore.ndb.overview import main
+from appengine.ndb.overview import main
 
 from tests import DatastoreTestbedCase
 

diff --git a/datastore/ndb/transactions/README.md → appengine/ndb/transactions/README.md b/datastore/ndb/transactions/README.md → appengine/ndb/transactions/README.md
diff --git a/datastore/ndb/transactions/__init__.py → appengine/ndb/transactions/__init__.py b/datastore/ndb/transactions/__init__.py → appengine/ndb/transactions/__init__.py
diff --git a/datastore/ndb/transactions/app.yaml → appengine/ndb/transactions/app.yaml b/datastore/ndb/transactions/app.yaml → appengine/ndb/transactions/app.yaml
diff --git a/...tore/ndb/transactions/appengine_config.py → ...gine/ndb/transactions/appengine_config.py b/...tore/ndb/transactions/appengine_config.py → ...gine/ndb/transactions/appengine_config.py
diff --git a/datastore/ndb/transactions/favicon.ico → appengine/ndb/transactions/favicon.ico b/datastore/ndb/transactions/favicon.ico → appengine/ndb/transactions/favicon.ico
diff --git a/datastore/ndb/transactions/main.py → appengine/ndb/transactions/main.py b/datastore/ndb/transactions/main.py → appengine/ndb/transactions/main.py
diff --git a/datastore/ndb/transactions/requirements.txt → appengine/ndb/transactions/requirements.txt b/datastore/ndb/transactions/requirements.txt → appengine/ndb/transactions/requirements.txt
diff --git a/datastore/ndb/transactions/tests/__init__.py → appengine/ndb/transactions/tests/__init__.py b/datastore/ndb/transactions/tests/__init__.py → appengine/ndb/transactions/tests/__init__.py
diff --git a/...b/transactions/tests/test_transactions.py → ...b/transactions/tests/test_transactions.py b/...b/transactions/tests/test_transactions.py → ...b/transactions/tests/test_transactions.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # from the app main.py
-from datastore.ndb.transactions import main
+from appengine.ndb.transactions import main
 
 from tests import DatastoreTestbedCase
 

diff --git a/bigquery/README.md b/bigquery/README.md
@@ -0,0 +1,7 @@
+# Google BigQuery Samples
+
+This section contains samples for [Google BigQuery](https://cloud.google.com/bigquery).
+
+## Other Samples
+
+* [Using BigQuery from Google App Engine](../appengine/bigquery).
diff --git a/datastore/README.md b/datastore/README.md
@@ -0,0 +1,7 @@
+# Google Cloud Datastore Samples
+
+This section contains samples for [Google Cloud Datastore](https://cloud.google.com/datastore).
+
+## Other Samples
+
+* [Google App Engine & NDB](../appengine/ndb).
diff --git a/localtesting/__init__.py b/localtesting/__init__.py
diff --git a/bigquery/tests/resources/datasets-list.json → tests/resources/datasets-list.json b/bigquery/tests/resources/datasets-list.json → tests/resources/datasets-list.json
diff --git a/tox.ini b/tox.ini
@@ -26,12 +26,8 @@ deps =
 commands = 
     nosetests --with-gae \
         --logging-level=INFO \
-        appengine \
-        datastore/ndb \
-        localtesting \
-        bigquery/tests/appengine \
         {[testenv]coverargs} \
-        {posargs}
+        {posargs:appengine}
 setenv =
     PYTHONPATH={env:GAE_PYTHONPATH:}
 
@@ -41,11 +37,7 @@ deps =
     gcloud
 commands = 
     nosetests \
-        --exclude-dir=bigquery/tests/appengine \
-        --exclude-dir=bigquery/samples/appengine_auth \
         --exclude-dir=appengine \
-        --exclude-dir=datastore/ndb \
-        --exclude-dir=localtesting \
         {[testenv]coverargs} \
         {posargs}