Skip to content

Add ipaddress as a dependency. #43

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 23, 2016
Merged

Add ipaddress as a dependency. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2f2f5a
Update formatting with scripts/update-pep8.sh
mbohlool Nov 23, 2016
f6e417d
Add ipaddress as a dependency. urllib3 will fix ssl ipaddress hostnam…
mbohlool Nov 23, 2016
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
1 change: 1 addition & 0 deletions kubernetes/config/incluster_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class ConfigException(Exception):


class InClusterConfigLoader(object):

def __init__(self, host_env_name, port_env_name, token_filename,
cert_filename, environ=os.environ):
self._host_env_name = host_env_name
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/config/incluster_config_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

from kubernetes.client import configuration

from .incluster_config import (ConfigException, InClusterConfigLoader,
_SERVICE_HOST_ENV_NAME, _SERVICE_PORT_ENV_NAME)
from .incluster_config import (_SERVICE_HOST_ENV_NAME, _SERVICE_PORT_ENV_NAME,
ConfigException, InClusterConfigLoader)

_TEST_TOKEN = "temp_token"
_TEST_HOST = "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ setuptools >= 21.0.0
urllib3 >= 1.19.1
pyyaml >= 3.12
oauth2client >= 4.0.0
ipaddress >= 1.0.17

1 change: 0 additions & 1 deletion scripts/preprocess_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import sys
from collections import OrderedDict


# these four constants are shown as part of this example in []:
# "[watch]Pod[List]" is the deprecated version of "[list]Pod?[watch]=True"
WATCH_OP_PREFIX = "watch"
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-pep8.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ SAVEIFS=$IFS
trap "IFS=$SAVEIFS" EXIT SIGINT
IFS=,

SOURCES="${CLIENT_ROOT}/util/*.py,${SCRIPT_ROOT}/*.py,${CLIENT_ROOT}/examples/*.py"
SOURCES="${SCRIPT_ROOT}/../setup.py,${CLIENT_ROOT}/config/*.py,${CLIENT_ROOT}/watch/*.py,${SCRIPT_ROOT}/*.py,${CLIENT_ROOT}/../examples/*.py"

echo "--- Updating tools"
pip install --upgrade pep8
Expand Down
14 changes: 11 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
# limitations under the License.

import sys
from setuptools import setup, find_packages

from setuptools import find_packages, setup

NAME = "kubernetes"
VERSION = "1.0.0-alpha.1"
Expand All @@ -25,7 +26,14 @@
# prerequisite: setuptools
# http://pypi.python.org/pypi/setuptools

REQUIRES = ["urllib3 >= 1.19", "six >= 1.10", "certifi", "python-dateutil", "pyyaml", "oauth2client"]
REQUIRES = [
"urllib3 >= 1.19",
"six >= 1.10",
"certifi",
"python-dateutil",
"pyyaml",
"oauth2client",
"ipaddress"]

setup(
name=NAME,
Expand All @@ -38,7 +46,7 @@
keywords=["Swagger", "OpenAPI", "Kubernetes"],
install_requires=REQUIRES,
packages=['kubernetes', 'kubernetes.client', 'kubernetes.config',
'kubernetes.watch', 'kubernetes.client.apis',
'kubernetes.watch', 'kubernetes.client.apis',
'kubernetes.client.models'],
include_package_data=True,
long_description="""\
Expand Down