From cd3e68483d2094ef7f7b98e114692ecd12b4e491 Mon Sep 17 00:00:00 2001 From: Mehdy Bohlool Date: Tue, 21 Feb 2017 14:18:34 -0800 Subject: [PATCH 1/4] Update release.md --- devel/release.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/devel/release.md b/devel/release.md index 091717d6d..4ebf9fdc8 100644 --- a/devel/release.md +++ b/devel/release.md @@ -18,8 +18,7 @@ should be on the same branch. To update an existing branch: export RELEASE_BRANCH=release-x.x git checkout RELEASE_BRANCH git fetch upstream -git pull upstream/master -git push origin RELEASE_BRANCH +git pull upstream master ``` You may need to fix some conflicts. For auto-generated files, you can commit @@ -46,9 +45,11 @@ need to update: CLIENT_VERSION: Client version should follow x.y.zDn where x,y,z are version numbers (integers) and D is one of "a" for alpha or "b" for beta and n is the pre-release number. For a final release, "Dn" part should be omitted. Examples: -1.0.0a1, 2.0.1b2, 1.5.1 +1.0.0a1, 2.0.1b2, 1.5.1. + SPEC_VERSION: This would be the kubernetes OpenAPI spec version. It should be deprecated after kubernetes/kubernetes#37055 takes effect. + DEVELOPMENT_STATUS: Update it to one of the values of "Development Status" in [this list](https://pypi.python.org/pypi?%3Aaction=list_classifiers). @@ -106,7 +107,7 @@ python setup.py bdist_wheel --universal ls dist/ ``` -You should see two files in dist folder. kubernetes*.whl and kubernetes*.tar.gz. +You should see two files in dist folder. kubernetes\*.whl and kubernetes\*.tar.gz. TODO: We need a dry-run option an some way to test package upload process to pypi. @@ -119,13 +120,12 @@ twine upload dist/* ## Create github release Create a gihub release by starting from -[this page(https://github.com/kubernetes-incubator/client-python/releases). +[this page](https://github.com/kubernetes-incubator/client-python/releases). Click Deaft new release button. Name the tag the same as CLIENT_VERSION. Change -the target branch to "release-x.y" +the target branch to "release-x.y". If the release is a pre-release, check the +`This is a pre-release` option. -ref: https://packaging.python.org/distributing/ - ## Cleanup ```bash @@ -134,3 +134,6 @@ rm -rf .release ``` TODO: Convert steps in this document to an (semi-) automated script. + + +ref: https://packaging.python.org/distributing/ From 8ac42541163435b915d396622665fb0a834c4c2a Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 22 Feb 2017 06:56:29 -0500 Subject: [PATCH 2/4] Sync requirements and add license info Follow guidelines in: https://packaging.python.org/requirements/ * Make sure the same list of packages are in setup.cfg and requirements.txt * install_requires reqs in setup.cfg should be "Abstract" with no version information * Add License information for each package Fixes #131 --- requirements.txt | 18 +++++++++--------- setup.py | 11 +++++++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2674d78ff..6bcba8b1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ -certifi >= 14.05.14 -six>=1.9.0 -python_dateutil >= 2.5.3 -setuptools >= 21.0.0 -urllib3 >= 1.19.1 -pyyaml >= 3.12 -oauth2client >= 4.0.0 -ipaddress >= 1.0.17 -websocket-client>=0.32.0 +certifi>=14.05.14 # MPL +six>=1.9.0 # MIT +python-dateutil>=2.5.3 # BSD +setuptools>=21.0.0 # PSF/ZPL +urllib3>=1.19.1 # MIT +pyyaml>=3.12 # MIT +oauth2client>=4.0.0 # Apache-2.0 +ipaddress>=1.0.17 # PSF +websocket-client>=0.32.0 # LGPLv2+ diff --git a/setup.py b/setup.py index d20b068d5..eeea40c15 100644 --- a/setup.py +++ b/setup.py @@ -28,13 +28,16 @@ DEVELOPMENT_STATUS = "3 - Alpha" # http://pypi.python.org/pypi/setuptools REQUIRES = [ - "urllib3 >= 1.19", - "six >= 1.10", "certifi", + "ipaddress", + "oauth2client", + "setuptools", + "six", + "urllib3", "python-dateutil", "pyyaml", - "oauth2client", - "ipaddress"] + "websocket-client", +] setup( name=PACKAGE_NAME, From 6eecfc22150a485b86c595118e8b3d552f716221 Mon Sep 17 00:00:00 2001 From: mbohlool Date: Wed, 22 Feb 2017 14:23:00 -0800 Subject: [PATCH 3/4] Update CHANGELOG [ci skip] --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ded7b71c..9f1b25727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# v1.0.0b3 +- Bugfix: Missing websocket dependency #131 + # v1.0.0b2 - Support exec calls in both interactive and non-interactive mode #58 From 8dc85df3e5d69c674b72069707a43fdab34a300d Mon Sep 17 00:00:00 2001 From: mbohlool Date: Wed, 22 Feb 2017 14:36:58 -0800 Subject: [PATCH 4/4] update CHANGELOG [skip ci] --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f1b25727..b91478536 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v1.0.0b3 -- Bugfix: Missing websocket dependency #131 +- Bugfix: Missing websocket-client dependency #131 # v1.0.0b2 - Support exec calls in both interactive and non-interactive mode #58