Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Organizing all app engine samples under appengine #76

Merged
merged 1 commit into from
Sep 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
include =
appengine/*
bigquery/*
blog/*
compute/*
datastore/*
localtesting/*
monitoring/*
storage/*
blog/*
[report]
exclude_lines =
pragma: NO COVER
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from apiclient.http import HttpMock

from bigquery.samples.appengine_auth import main
from appengine.bigquery import main

import mock

Expand All @@ -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):
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 7 additions & 0 deletions bigquery/README.md
Original file line number Diff line number Diff line change
@@ -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).
7 changes: 7 additions & 0 deletions datastore/README.md
Original file line number Diff line number Diff line change
@@ -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).
Empty file removed localtesting/__init__.py
Empty file.
10 changes: 1 addition & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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:}

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

Expand Down