Merge pull request #76 from GoogleCloudPlatform/appengine-consolidation

Organizing all app engine samples under appengine

Author: Jonathan Wayne Parrott

.coveragerc

@@ -2,10 +2,11 @@
 include =
     appengine/*
     bigquery/*
+    blog/*
+    compute/*
     datastore/*
-    localtesting/*
+    monitoring/*
     storage/*
-    blog/*
 [report]
 exclude_lines =
     pragma: NO COVER

bigquery/samples/appengine_auth/README.md renamed to appengine/bigquery/README.md

@@ -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

bigquery/samples/appengine_auth/__init__.py renamed to appengine/bigquery/__init__.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
 

bigquery/samples/appengine_auth/app.yaml renamed to appengine/bigquery/app.yaml

@@ -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
 

bigquery/samples/appengine_auth/appengine_config.py renamed to appengine/bigquery/appengine_config.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
 

bigquery/samples/appengine_auth/client_secrets.json renamed to appengine/bigquery/client_secrets.json

@@ -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
 

bigquery/samples/appengine_auth/main.py renamed to appengine/bigquery/main.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
 

bigquery/samples/appengine_auth/requirements.txt renamed to appengine/bigquery/requirements.txt

@@ -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
 

bigquery/tests/appengine/__init__.py renamed to appengine/bigquery/tests/__init__.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
 

bigquery/tests/appengine/test_appengine_auth.py renamed to appengine/bigquery/tests/test_appengine_auth.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
 

datastore/__init__.py renamed to appengine/localtesting/__init__.py

@@ -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}