diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5813b7dac..e64fb1a38 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9] + python-version: [3.5, 3.6, 3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 diff --git a/.travis.yml b/.travis.yml index a218cc4c2..1f0629796 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,16 +24,12 @@ jobs: [[ "${TRAVIS_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(([ab]|dev|rc)[0-9]+)?$ ]] - stage: test - python: 2.7 - env: TOXENV=update-pycodestyle + python: 3.9 + env: TOXENV=update-pycodestyle + - python: 3.9 + env: TOXENV=coverage,codecov - python: 3.7 env: TOXENV=docs - - python: 2.7 - env: TOXENV=coverage,codecov - - python: 2.7 - env: TOXENV=py27 - - python: 2.7 - env: TOXENV=py27-functional - python: 3.5 env: TOXENV=py35 - python: 3.5 @@ -68,18 +64,12 @@ jobs: distributions: sdist bdist_wheel - stage: test - python: 2.7 + python: 3.9 env: TOXENV=update-pycodestyle - arch: ppc64le + arch: ppc64le - python: 3.7 env: TOXENV=docs arch: ppc64le - - python: 2.7 - env: TOXENV=coverage,codecov - arch: ppc64le - - python: 2.7 - env: TOXENV=py27 - arch: ppc64le - python: 3.5 env: TOXENV=py35 arch: ppc64le diff --git a/examples/multiple_clusters.py b/examples/multiple_clusters.py index 94b0458cd..910859647 100644 --- a/examples/multiple_clusters.py +++ b/examples/multiple_clusters.py @@ -18,9 +18,10 @@ Allows you to pick a context and then lists all pods in the chosen context. Please install the pick library before running this example. """ +from pick import pick # install pick using `pip install pick` + from kubernetes import client, config from kubernetes.client import configuration -from pick import pick # install pick using `pip install pick` def main(): diff --git a/examples/pick_kube_config_context.py b/examples/pick_kube_config_context.py index 962639669..d0e26d62e 100644 --- a/examples/pick_kube_config_context.py +++ b/examples/pick_kube_config_context.py @@ -18,9 +18,10 @@ Allows you to pick a context and then lists all pods in the chosen context. Please install the pick library before running this example. """ +from pick import pick # install pick using `pip install pick` + from kubernetes import client, config from kubernetes.client import configuration -from pick import pick # install pick using `pip install pick` def main(): diff --git a/examples/pod_config_list.py b/examples/pod_config_list.py index 09bbde9b6..882b13c59 100644 --- a/examples/pod_config_list.py +++ b/examples/pod_config_list.py @@ -19,9 +19,10 @@ context includes a cluster, a user, and a namespace. Please install the pick library before running this example. """ +from pick import pick # install pick using `pip install pick` + from kubernetes import client, config from kubernetes.client import configuration -from pick import pick # install pick using `pip install pick` def main(): diff --git a/scripts/update-pycodestyle.sh b/scripts/update-pycodestyle.sh index c84c9825c..b6075d375 100755 --- a/scripts/update-pycodestyle.sh +++ b/scripts/update-pycodestyle.sh @@ -67,7 +67,7 @@ done echo "--- applying isort" for SOURCE in $SOURCES; do - isort -y $SOURCE + isort $SOURCE done echo "--- check pycodestyle (all need to be fixed manually)" diff --git a/setup.py b/setup.py index e5bafcf8f..2398d0197 100644 --- a/setup.py +++ b/setup.py @@ -72,8 +72,6 @@ setup( "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", diff --git a/tox.ini b/tox.ini index 8ba4c3dd8..93685c74e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = - py27, py3{5,6,7,8,9} - py27-functional, py3{5,6,7,8,9}-functional + py3{5,6,7,8,9} + py3{5,6,7,8,9}-functional [testenv] passenv = TOXENV CI TRAVIS TRAVIS_*