Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Commit

Permalink
Update testing to use gcp-devrel-py-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
Jon Wayne Parrott committed Jun 20, 2017
1 parent 16c69d5 commit 270149b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 1 addition & 5 deletions nox.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion requirements-dev-gaesdk.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
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
# Test dependencies.
pytest==2.9.1
pytest-cov==2.2.1
mock==2.0.0
gcp-devrel-py-tools==0.0.8
3 changes: 3 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/gae/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import os
import sys

from gcp.testing import appengine
from gcp_devrel.testing import appengine
import six


Expand Down

0 comments on commit 270149b

Please sign in to comment.