Skip to content

Commit 821618f

Browse files
authored
Merge pull request #1468 from Priyankasaggu11929/drop-python-2-support
drop python 2 support
2 parents a126ab0 + 6f09733 commit 821618f

File tree

8 files changed

+16
-25
lines changed

8 files changed

+16
-25
lines changed

.github/workflows/test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
11+
python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
1212

1313
steps:
1414
- uses: actions/checkout@v2

.travis.yml

+6-16
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,12 @@ jobs:
2424
[[ "${TRAVIS_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(([ab]|dev|rc)[0-9]+)?$ ]]
2525
2626
- stage: test
27-
python: 2.7
28-
env: TOXENV=update-pycodestyle
27+
python: 3.9
28+
env: TOXENV=update-pycodestyle
29+
- python: 3.9
30+
env: TOXENV=coverage,codecov
2931
- python: 3.7
3032
env: TOXENV=docs
31-
- python: 2.7
32-
env: TOXENV=coverage,codecov
33-
- python: 2.7
34-
env: TOXENV=py27
35-
- python: 2.7
36-
env: TOXENV=py27-functional
3733
- python: 3.5
3834
env: TOXENV=py35
3935
- python: 3.5
@@ -68,18 +64,12 @@ jobs:
6864
distributions: sdist bdist_wheel
6965

7066
- stage: test
71-
python: 2.7
67+
python: 3.9
7268
env: TOXENV=update-pycodestyle
73-
arch: ppc64le
69+
arch: ppc64le
7470
- python: 3.7
7571
env: TOXENV=docs
7672
arch: ppc64le
77-
- python: 2.7
78-
env: TOXENV=coverage,codecov
79-
arch: ppc64le
80-
- python: 2.7
81-
env: TOXENV=py27
82-
arch: ppc64le
8373
- python: 3.5
8474
env: TOXENV=py35
8575
arch: ppc64le

examples/multiple_clusters.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
Please install the pick library before running this example.
1919
"""
2020

21+
from pick import pick # install pick using `pip install pick`
22+
2123
from kubernetes import client, config
2224
from kubernetes.client import configuration
23-
from pick import pick # install pick using `pip install pick`
2425

2526

2627
def main():

examples/pick_kube_config_context.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
Please install the pick library before running this example.
1919
"""
2020

21+
from pick import pick # install pick using `pip install pick`
22+
2123
from kubernetes import client, config
2224
from kubernetes.client import configuration
23-
from pick import pick # install pick using `pip install pick`
2425

2526

2627
def main():

examples/pod_config_list.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
Please install the pick library before running this example.
2020
"""
2121

22+
from pick import pick # install pick using `pip install pick`
23+
2224
from kubernetes import client, config
2325
from kubernetes.client import configuration
24-
from pick import pick # install pick using `pip install pick`
2526

2627

2728
def main():

scripts/update-pycodestyle.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ done
6767

6868
echo "--- applying isort"
6969
for SOURCE in $SOURCES; do
70-
isort -y $SOURCE
70+
isort $SOURCE
7171
done
7272

7373
echo "--- check pycodestyle (all need to be fixed manually)"

setup.py

-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@
7272
"License :: OSI Approved :: Apache Software License",
7373
"Operating System :: OS Independent",
7474
"Programming Language :: Python",
75-
"Programming Language :: Python :: 2",
76-
"Programming Language :: Python :: 2.7",
7775
"Programming Language :: Python :: 3",
7876
"Programming Language :: Python :: 3.5",
7977
"Programming Language :: Python :: 3.6",

tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
3-
py27, py3{5,6,7,8,9}
4-
py27-functional, py3{5,6,7,8,9}-functional
3+
py3{5,6,7,8,9}
4+
py3{5,6,7,8,9}-functional
55

66
[testenv]
77
passenv = TOXENV CI TRAVIS TRAVIS_*

0 commit comments

Comments
 (0)