Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop python 2 support #1468

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 6 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks there are extra spaces at the end, please remove them

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed the spaces. Thanks!

- 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
Expand Down
3 changes: 2 additions & 1 deletion examples/multiple_clusters.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
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():
Expand Down
3 changes: 2 additions & 1 deletion examples/pick_kube_config_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
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():
Expand Down
3 changes: 2 additions & 1 deletion examples/pod_config_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
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():
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-pycodestyle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ done

echo "--- applying isort"
for SOURCE in $SOURCES; do
isort -y $SOURCE
isort $SOURCE
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should have been called before with python3, not sure why there was no errors before

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to confirm, there is no action required here, right?

Thank you!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no action, just wondering if you know why there was no error before

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were no previous test running update-pycodestyle.sh script with python3.x versions.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, that explains it.

done

echo "--- check pycodestyle (all need to be fixed manually)"
Expand Down
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@
"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",
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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_*
Expand Down