From 7e9ea28681ea3b80f81e696cd6d1dcd4ad37578b Mon Sep 17 00:00:00 2001 From: Ahmet Altay Date: Mon, 5 Mar 2018 16:07:44 -0800 Subject: [PATCH 1/2] Enable py3 lint --- sdks/python/tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini index 857e7b0e571f..a54f1f539563 100644 --- a/sdks/python/tox.ini +++ b/sdks/python/tox.ini @@ -17,8 +17,7 @@ [tox] # new environments will be excluded by default unless explicitly added to envlist. -# TODO (after BEAM-3671) add lint_py3 back in. -envlist = py27,py27gcp,py27cython,lint_py2,docs +envlist = py27,py27gcp,py27cython,lint_py2,lint_py3,docs toxworkdir = {toxinidir}/target/.tox [pycodestyle] From bad4a3c2bed70e4af273d3a403fc985753e16c66 Mon Sep 17 00:00:00 2001 From: Ahmet Altay Date: Tue, 6 Mar 2018 19:17:13 -0800 Subject: [PATCH 2/2] Update tox.ini for lint py3 --- sdks/python/setup.py | 1 - sdks/python/tox.ini | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sdks/python/setup.py b/sdks/python/setup.py index 5ed623b2293d..5ef1683e81bd 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -204,7 +204,6 @@ def generate_common_urns(): ]), setup_requires=REQUIRED_SETUP_PACKAGES, install_requires=REQUIRED_PACKAGES, - python_requires='>=2.7,<3.0', test_suite='nose.collector', tests_require=REQUIRED_TEST_PACKAGES, extras_require={ diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini index a54f1f539563..7d4152602f84 100644 --- a/sdks/python/tox.ini +++ b/sdks/python/tox.ini @@ -102,7 +102,6 @@ whitelist_externals=time commands = python --version pip --version - time pip install -e .[test] time {toxinidir}/run_pylint.sh passenv = TRAVIS* @@ -115,12 +114,13 @@ deps= isort==4.2.15 flake8==3.5.0 whitelist_externals=time +basepython=python3 commands = - time pip install -e .[test] + python --version + pip --version time {toxinidir}/run_mini_py3lint.sh passenv = TRAVIS* - [testenv:docs] deps= nose==1.3.7