diff --git a/.travis.yml b/.travis.yml index a9546b88..9de96ad4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,16 @@ matrix: - os: linux python: 3.5 env: PYTHON=3.5 PANDAS=0.18.1 COVERAGE='true' LINT='false' + # TODO: fix conda issues around namespace packages # https://github.com/pydata/pandas-gbq/issues/189 # - os: linux # python: 3.6 # env: PYTHON=3.6 PANDAS=0.20.1 COVERAGE='false' LINT='false' - os: linux - python: 3.6 - env: PYTHON=3.6 PANDAS=MASTER COVERAGE='false' LINT='true' + python: 3.7 + dist: xenial + sudo: true + env: PYTHON=3.7 PANDAS=MASTER COVERAGE='false' LINT='true' env: before_install: @@ -51,7 +54,7 @@ install: script: - if [[ $PYTHON == '2.7' ]]; then nox -s test27 ; fi - if [[ $PYTHON == '3.5' ]]; then nox -s test35 ; fi - - if [[ $PYTHON == '3.6' ]] && [[ "$PANDAS" == "MASTER" ]]; then nox -s test36master ; fi + - if [[ $PYTHON == '3.7' ]] && [[ "$PANDAS" == "MASTER" ]]; then nox -s test37master ; fi - REQ="ci/requirements-${PYTHON}-${PANDAS}" ; if [ -f "$REQ.conda" ]; then pytest --quiet -m 'not local_auth' -v tests ; diff --git a/ci/requirements-3.6-MASTER.pip b/ci/requirements-3.7-MASTER.pip similarity index 100% rename from ci/requirements-3.6-MASTER.pip rename to ci/requirements-3.7-MASTER.pip diff --git a/nox.py b/nox.py index 9731e438..2ab1314f 100644 --- a/nox.py +++ b/nox.py @@ -19,9 +19,11 @@ def default(session): session.install("mock", "pytest", "pytest-cov") session.install("-e", ".") - # Skip local auth tests on Travis. + # Skip local auth tests on Travis + # ref https://github.com/pydata/pandas-gbq/issues/189 additional_args = list(session.posargs) if "TRAVIS_BUILD_DIR" in os.environ: + additional_args = additional_args + ["-m", "not local_auth"] session.run( @@ -70,7 +72,6 @@ def test35(session): default(session) -@nox.session def test36(session): session.interpreter = "python3.6" session.install( @@ -80,13 +81,13 @@ def test36(session): @nox.session -def test36master(session): - session.interpreter = "python3.6" +def test37master(session): + session.interpreter = "python3.7" session.install( "--pre", "--upgrade", "--timeout=60", "-f", PANDAS_PRE_WHEELS, "pandas" ) session.install( - "-r", os.path.join(".", "ci", "requirements-3.6-MASTER.pip") + "-r", os.path.join(".", "ci", "requirements-3.7-MASTER.pip") ) default(session)