diff --git a/nox.py b/nox.py index b68672e..05dfe34 100644 --- a/nox.py +++ b/nox.py @@ -16,9 +16,6 @@ import os from tempfile import gettempdir -GCP_REPO_TOOLS_REQ = ( - 'git+https://github.com/GoogleCloudPlatform/python-repo-tools') - def session_lint(session): session.install('flake8', 'flake8-import-order') @@ -29,13 +26,12 @@ def session_lint(session): def run_tests(session, requirements, gae=False): - session.install(GCP_REPO_TOOLS_REQ) session.install('-r', requirements) session.install('-e', '.') if gae: tmpdir = gettempdir() - session.run('gcprepotools', 'download-appengine-sdk', tmpdir) + session.run('gcp-devrel-py-tools', 'download-appengine-sdk', tmpdir) session.env['GAE_SDK_PATH'] = os.path.join(tmpdir, 'google_appengine') session.run( diff --git a/requirements-dev-gaesdk.txt b/requirements-dev-gaesdk.txt index 68bc778..f2bfad1 100644 --- a/requirements-dev-gaesdk.txt +++ b/requirements-dev-gaesdk.txt @@ -2,8 +2,8 @@ WebOb==1.2.3 Jinja2==2.6.0 # The remaining requirements are defined by webapp2. These are the versions -six==1.10.0 # that were used with release 2.5.2, except for babel. +six==1.10.0 Mako==0.4.1 Babel==2.2 gaepytz==2011h @@ -11,3 +11,4 @@ gaepytz==2011h pytest==2.9.1 pytest-cov==2.2.1 mock==2.0.0 +gcp-devrel-py-tools==0.0.8 diff --git a/requirements-dev.txt b/requirements-dev.txt index 1cc921b..648d555 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,9 +1,12 @@ +# These dependencies match App Engine SDK versions. WebOb==1.6.1 Jinja2==2.8 Mako==1.0.4 Babel==2.3.4 pytz==2016.6.1 +# These are test dependencies pytest==2.9.1 pytest-cov==2.2.1 mock==2.0.0 six==1.10.0 +gcp-devrel-py-tools==0.0.8 diff --git a/tests/gae/conftest.py b/tests/gae/conftest.py index facdc94..58ad205 100644 --- a/tests/gae/conftest.py +++ b/tests/gae/conftest.py @@ -15,7 +15,7 @@ import os import sys -from gcp.testing import appengine +from gcp_devrel.testing import appengine import six