diff --git a/.coveragerc b/.coveragerc index 33ced9c65df..d312cd95450 100644 --- 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 b/appengine/bigquery/README.md similarity index 100% rename from bigquery/samples/appengine_auth/README.md rename to appengine/bigquery/README.md diff --git a/bigquery/samples/appengine_auth/__init__.py b/appengine/bigquery/__init__.py similarity index 100% rename from bigquery/samples/appengine_auth/__init__.py rename to appengine/bigquery/__init__.py diff --git a/bigquery/samples/appengine_auth/app.yaml b/appengine/bigquery/app.yaml similarity index 100% rename from bigquery/samples/appengine_auth/app.yaml rename to appengine/bigquery/app.yaml diff --git a/bigquery/samples/appengine_auth/appengine_config.py b/appengine/bigquery/appengine_config.py similarity index 100% rename from bigquery/samples/appengine_auth/appengine_config.py rename to appengine/bigquery/appengine_config.py diff --git a/bigquery/samples/appengine_auth/client_secrets.json b/appengine/bigquery/client_secrets.json similarity index 100% rename from bigquery/samples/appengine_auth/client_secrets.json rename to appengine/bigquery/client_secrets.json diff --git a/bigquery/samples/appengine_auth/main.py b/appengine/bigquery/main.py similarity index 100% rename from bigquery/samples/appengine_auth/main.py rename to appengine/bigquery/main.py diff --git a/bigquery/samples/appengine_auth/requirements.txt b/appengine/bigquery/requirements.txt similarity index 100% rename from bigquery/samples/appengine_auth/requirements.txt rename to appengine/bigquery/requirements.txt diff --git a/bigquery/tests/appengine/__init__.py b/appengine/bigquery/tests/__init__.py similarity index 100% rename from bigquery/tests/appengine/__init__.py rename to appengine/bigquery/tests/__init__.py diff --git a/bigquery/tests/appengine/test_appengine_auth.py b/appengine/bigquery/tests/test_appengine_auth.py similarity index 92% rename from bigquery/tests/appengine/test_appengine_auth.py rename to appengine/bigquery/tests/test_appengine_auth.py index b776c9aa40f..59669166959 100644 --- a/bigquery/tests/appengine/test_appengine_auth.py +++ b/appengine/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 b/appengine/localtesting/__init__.py similarity index 100% rename from datastore/__init__.py rename to appengine/localtesting/__init__.py diff --git a/localtesting/queue.yaml b/appengine/localtesting/queue.yaml similarity index 100% rename from localtesting/queue.yaml rename to appengine/localtesting/queue.yaml diff --git a/localtesting/runner.py b/appengine/localtesting/runner.py similarity index 100% rename from localtesting/runner.py rename to appengine/localtesting/runner.py diff --git a/localtesting/test_datastore.py b/appengine/localtesting/test_datastore.py similarity index 100% rename from localtesting/test_datastore.py rename to appengine/localtesting/test_datastore.py diff --git a/localtesting/test_env_vars.py b/appengine/localtesting/test_env_vars.py similarity index 100% rename from localtesting/test_env_vars.py rename to appengine/localtesting/test_env_vars.py diff --git a/localtesting/test_login.py b/appengine/localtesting/test_login.py similarity index 100% rename from localtesting/test_login.py rename to appengine/localtesting/test_login.py diff --git a/localtesting/test_mail.py b/appengine/localtesting/test_mail.py similarity index 100% rename from localtesting/test_mail.py rename to appengine/localtesting/test_mail.py diff --git a/localtesting/test_task_queue.py b/appengine/localtesting/test_task_queue.py similarity index 100% rename from localtesting/test_task_queue.py rename to appengine/localtesting/test_task_queue.py diff --git a/datastore/ndb/README.md b/appengine/ndb/README.md similarity index 100% rename from datastore/ndb/README.md rename to appengine/ndb/README.md diff --git a/datastore/ndb/__init__.py b/appengine/ndb/__init__.py similarity index 100% rename from datastore/ndb/__init__.py rename to appengine/ndb/__init__.py diff --git a/datastore/ndb/modeling/README.md b/appengine/ndb/modeling/README.md similarity index 100% rename from datastore/ndb/modeling/README.md rename to appengine/ndb/modeling/README.md diff --git a/datastore/ndb/modeling/__init__.py b/appengine/ndb/modeling/__init__.py similarity index 100% rename from datastore/ndb/modeling/__init__.py rename to appengine/ndb/modeling/__init__.py diff --git a/datastore/ndb/modeling/contact_with_group_models.py b/appengine/ndb/modeling/contact_with_group_models.py similarity index 100% rename from datastore/ndb/modeling/contact_with_group_models.py rename to appengine/ndb/modeling/contact_with_group_models.py diff --git a/datastore/ndb/modeling/keyproperty_models.py b/appengine/ndb/modeling/keyproperty_models.py similarity index 100% rename from datastore/ndb/modeling/keyproperty_models.py rename to appengine/ndb/modeling/keyproperty_models.py diff --git a/datastore/ndb/modeling/naive_models.py b/appengine/ndb/modeling/naive_models.py similarity index 100% rename from datastore/ndb/modeling/naive_models.py rename to appengine/ndb/modeling/naive_models.py diff --git a/datastore/ndb/modeling/parent_child_models.py b/appengine/ndb/modeling/parent_child_models.py similarity index 100% rename from datastore/ndb/modeling/parent_child_models.py rename to appengine/ndb/modeling/parent_child_models.py diff --git a/datastore/ndb/modeling/relation_model_models.py b/appengine/ndb/modeling/relation_model_models.py similarity index 100% rename from datastore/ndb/modeling/relation_model_models.py rename to appengine/ndb/modeling/relation_model_models.py diff --git a/datastore/ndb/modeling/structured_property_models.py b/appengine/ndb/modeling/structured_property_models.py similarity index 100% rename from datastore/ndb/modeling/structured_property_models.py rename to appengine/ndb/modeling/structured_property_models.py diff --git a/datastore/ndb/modeling/tests/__init__.py b/appengine/ndb/modeling/tests/__init__.py similarity index 100% rename from datastore/ndb/modeling/tests/__init__.py rename to appengine/ndb/modeling/tests/__init__.py diff --git a/datastore/ndb/modeling/tests/test_contact_with_group_models.py b/appengine/ndb/modeling/tests/test_contact_with_group_models.py similarity index 96% rename from datastore/ndb/modeling/tests/test_contact_with_group_models.py rename to appengine/ndb/modeling/tests/test_contact_with_group_models.py index c73bd964b93..b20e6b8485a 100644 --- a/datastore/ndb/modeling/tests/test_contact_with_group_models.py +++ b/appengine/ndb/modeling/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/datastore/ndb/modeling/tests/test_keyproperty_models.py b/appengine/ndb/modeling/tests/test_keyproperty_models.py similarity index 96% rename from datastore/ndb/modeling/tests/test_keyproperty_models.py rename to appengine/ndb/modeling/tests/test_keyproperty_models.py index 66940badef1..febee712714 100644 --- a/datastore/ndb/modeling/tests/test_keyproperty_models.py +++ b/appengine/ndb/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/datastore/ndb/modeling/tests/test_naive_models.py b/appengine/ndb/modeling/tests/test_naive_models.py similarity index 95% rename from datastore/ndb/modeling/tests/test_naive_models.py rename to appengine/ndb/modeling/tests/test_naive_models.py index b62189f881a..383a3636540 100644 --- a/datastore/ndb/modeling/tests/test_naive_models.py +++ b/appengine/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/datastore/ndb/modeling/tests/test_parent_child_models.py b/appengine/ndb/modeling/tests/test_parent_child_models.py similarity index 97% rename from datastore/ndb/modeling/tests/test_parent_child_models.py rename to appengine/ndb/modeling/tests/test_parent_child_models.py index a8c7b718769..0dcd6b0aba1 100644 --- a/datastore/ndb/modeling/tests/test_parent_child_models.py +++ b/appengine/ndb/modeling/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/datastore/ndb/modeling/tests/test_relation_model_models.py b/appengine/ndb/modeling/tests/test_relation_model_models.py similarity index 97% rename from datastore/ndb/modeling/tests/test_relation_model_models.py rename to appengine/ndb/modeling/tests/test_relation_model_models.py index 19b4b4486bc..d470c113a5d 100644 --- a/datastore/ndb/modeling/tests/test_relation_model_models.py +++ b/appengine/ndb/modeling/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/datastore/ndb/modeling/tests/test_structured_property_models.py b/appengine/ndb/modeling/tests/test_structured_property_models.py similarity index 97% rename from datastore/ndb/modeling/tests/test_structured_property_models.py rename to appengine/ndb/modeling/tests/test_structured_property_models.py index 92c6706cf4e..0869a62611a 100644 --- a/datastore/ndb/modeling/tests/test_structured_property_models.py +++ b/appengine/ndb/modeling/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 b/appengine/ndb/overview/README.md similarity index 100% rename from datastore/ndb/overview/README.md rename to appengine/ndb/overview/README.md diff --git a/datastore/ndb/overview/__init__.py b/appengine/ndb/overview/__init__.py similarity index 100% rename from datastore/ndb/overview/__init__.py rename to appengine/ndb/overview/__init__.py diff --git a/datastore/ndb/overview/app.yaml b/appengine/ndb/overview/app.yaml similarity index 100% rename from datastore/ndb/overview/app.yaml rename to appengine/ndb/overview/app.yaml diff --git a/datastore/ndb/overview/favicon.ico b/appengine/ndb/overview/favicon.ico similarity index 100% rename from datastore/ndb/overview/favicon.ico rename to appengine/ndb/overview/favicon.ico diff --git a/datastore/ndb/overview/index.yaml b/appengine/ndb/overview/index.yaml similarity index 100% rename from datastore/ndb/overview/index.yaml rename to appengine/ndb/overview/index.yaml diff --git a/datastore/ndb/overview/main.py b/appengine/ndb/overview/main.py similarity index 100% rename from datastore/ndb/overview/main.py rename to appengine/ndb/overview/main.py diff --git a/datastore/ndb/overview/tests/__init__.py b/appengine/ndb/overview/tests/__init__.py similarity index 100% rename from datastore/ndb/overview/tests/__init__.py rename to appengine/ndb/overview/tests/__init__.py diff --git a/datastore/ndb/overview/tests/test_overview.py b/appengine/ndb/overview/tests/test_overview.py similarity index 96% rename from datastore/ndb/overview/tests/test_overview.py rename to appengine/ndb/overview/tests/test_overview.py index 152b68dbc69..3b8e6dcc6ad 100644 --- a/datastore/ndb/overview/tests/test_overview.py +++ b/appengine/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 b/appengine/ndb/transactions/README.md similarity index 100% rename from datastore/ndb/transactions/README.md rename to appengine/ndb/transactions/README.md diff --git a/datastore/ndb/transactions/__init__.py b/appengine/ndb/transactions/__init__.py similarity index 100% rename from datastore/ndb/transactions/__init__.py rename to appengine/ndb/transactions/__init__.py diff --git a/datastore/ndb/transactions/app.yaml b/appengine/ndb/transactions/app.yaml similarity index 100% rename from datastore/ndb/transactions/app.yaml rename to appengine/ndb/transactions/app.yaml diff --git a/datastore/ndb/transactions/appengine_config.py b/appengine/ndb/transactions/appengine_config.py similarity index 100% rename from datastore/ndb/transactions/appengine_config.py rename to appengine/ndb/transactions/appengine_config.py diff --git a/datastore/ndb/transactions/favicon.ico b/appengine/ndb/transactions/favicon.ico similarity index 100% rename from datastore/ndb/transactions/favicon.ico rename to appengine/ndb/transactions/favicon.ico diff --git a/datastore/ndb/transactions/main.py b/appengine/ndb/transactions/main.py similarity index 100% rename from datastore/ndb/transactions/main.py rename to appengine/ndb/transactions/main.py diff --git a/datastore/ndb/transactions/requirements.txt b/appengine/ndb/transactions/requirements.txt similarity index 100% rename from datastore/ndb/transactions/requirements.txt rename to appengine/ndb/transactions/requirements.txt diff --git a/datastore/ndb/transactions/tests/__init__.py b/appengine/ndb/transactions/tests/__init__.py similarity index 100% rename from datastore/ndb/transactions/tests/__init__.py rename to appengine/ndb/transactions/tests/__init__.py diff --git a/datastore/ndb/transactions/tests/test_transactions.py b/appengine/ndb/transactions/tests/test_transactions.py similarity index 97% rename from datastore/ndb/transactions/tests/test_transactions.py rename to appengine/ndb/transactions/tests/test_transactions.py index 4b39afdbc7c..de53389fc40 100644 --- a/datastore/ndb/transactions/tests/test_transactions.py +++ b/appengine/ndb/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 new file mode 100644 index 00000000000..75f7b9a6897 --- /dev/null +++ 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 new file mode 100644 index 00000000000..53711bb146e --- /dev/null +++ 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 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/bigquery/tests/resources/datasets-list.json b/tests/resources/datasets-list.json similarity index 100% rename from bigquery/tests/resources/datasets-list.json rename to tests/resources/datasets-list.json diff --git a/tox.ini b/tox.ini index f04e19d8168..6d65976e791 100644 --- 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}