Skip to content

Commit

Permalink
Update testing to use Python 3.6 (#1111)
Browse files Browse the repository at this point in the history
Change-Id: I33e152ff826cd2fac966e420d8251f4c43cc3648
  • Loading branch information
Jon Wayne Parrott authored Sep 13, 2017
1 parent 9752362 commit ec5bbad
Show file tree
Hide file tree
Showing 29 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .kokoro/system_tests_appengine_flexible.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "py35 and flexible"
value: "py36 and flexible"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_auth.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "auth and py35 and not appengine"
value: "auth and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_bigquery.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "bigquery and py35 and not appengine"
value: "bigquery and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_bigtable.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "bigtable and py35 and not appengine"
value: "bigtable and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_compute.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "compute and py35 and not appengine"
value: "compute and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_container_engine.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "container_engine and py35 and not appengine"
value: "container_engine and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_dataproc.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "dataproc and py35 and not appengine"
value: "dataproc and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_datastore.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "datastore and py35 and not appengine"
value: "datastore and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_dns.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "dns and py35 and not appengine"
value: "dns and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_endpoints.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "endpoints and py35 and not appengine"
value: "endpoints and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_error_reporting.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "error_reporting and py35 and not appengine"
value: "error_reporting and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_iap.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "iap and py35 and not appengine"
value: "iap and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_iot.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "iot and py35 and not appengine"
value: "iot and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_kms.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "kms and py35 and not appengine"
value: "kms and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_language.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "language and py35 and not appengine"
value: "language and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_logging.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "logging and py35 and not appengine"
value: "logging and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_ml_engine.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "ml_engine and py35 and not appengine"
value: "ml_engine and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_monitoring.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "monitoring and py35 and not appengine"
value: "monitoring and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_pubsub.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "pubsub and py35 and not appengine"
value: "pubsub and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_spanner.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "spanner and py35 and not appengine"
value: "spanner and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_speech.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "speech and py35 and not appengine"
value: "speech and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_storage.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "storage and py35 and not appengine"
value: "storage and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_testing.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "testing and py35 and not appengine"
value: "testing and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_translate.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "translate and py35 and not appengine"
value: "translate and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_video.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "video and py35 and not appengine"
value: "video and py36 and not appengine"
}
2 changes: 1 addition & 1 deletion .kokoro/system_tests_vision.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ env_vars: {

env_vars: {
key: "NOX_SESSION"
value: "vision and py35 and not appengine"
value: "vision and py36 and not appengine"
}
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ addons:
- deadsnakes
packages:
- portaudio19-dev
- python3.5
- python3.5-dev
- python3.6
- python3.6-dev
install:
- pip install --upgrade pip wheel virtualenv
- pip install --upgrade nox-automation coverage
- pip install --upgrade nox-automation
- pip install --upgrade git+https://github.com/dhermes/ci-diff-helper.git
script:
- ./scripts/travis.sh
6 changes: 3 additions & 3 deletions nox.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,9 @@ def session_py27(session, sample):


@nox.parametrize('sample', NON_GAE_STANDARD_SAMPLES)
def session_py35(session, sample):
"""Runs py.test for a sample using Python 3.5"""
session.interpreter = 'python3.5'
def session_py36(session, sample):
"""Runs py.test for a sample using Python 3.6"""
session.interpreter = 'python3.6'
_session_tests(session, sample)


Expand Down
2 changes: 1 addition & 1 deletion scripts/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if [[ $TRAVIS_SECURE_ENV_VARS == "true" ]]; then
source ${TRAVIS_BUILD_DIR}/testing/test-env.sh;
export GOOGLE_APPLICATION_CREDENTIALS=${TRAVIS_BUILD_DIR}/testing/service-account.json
export GOOGLE_CLIENT_SECRETS=${TRAVIS_BUILD_DIR}/testing/client-secrets.json
nox --envdir /tmp --stop-on-first-error -s lint gae py35 -- -m "not slow";
nox --envdir /tmp --stop-on-first-error -s lint gae py36 -- -m "not slow";
else
# only run lint on external PRs
echo 'External PR: only running lint.'
Expand Down

0 comments on commit ec5bbad

Please sign in to comment.