From 07013a0722b8fd30016f00343d8c5d2a01eaa7ef Mon Sep 17 00:00:00 2001 From: mbohlool Date: Tue, 25 Apr 2017 10:42:08 -0700 Subject: [PATCH] Remove Spec Version constant as the main spec is versioned now --- devel/release.md | 3 --- scripts/constants.py | 7 +------ scripts/preprocess_spec.py | 6 +----- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/devel/release.md b/devel/release.md index 3dde2a5bb..48f0d0f59 100644 --- a/devel/release.md +++ b/devel/release.md @@ -48,9 +48,6 @@ 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. -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). diff --git a/scripts/constants.py b/scripts/constants.py index d32f554f0..fa57e8e3f 100644 --- a/scripts/constants.py +++ b/scripts/constants.py @@ -17,12 +17,7 @@ import sys # Kubernetes branch to get the OpenAPI spec from. KUBERNETES_BRANCH = "release-1.6" -# Spec version will be set in downloaded spec and all -# generated code will refer to it. -SPEC_VERSION = "v1.6.1" - -# client version for packaging and releasing. It can -# be different than SPEC_VERSION. +# client version for packaging and releasing. CLIENT_VERSION = "2.0.0-snapshot" # Name of the release package diff --git a/scripts/preprocess_spec.py b/scripts/preprocess_spec.py index b3316276d..618b34122 100644 --- a/scripts/preprocess_spec.py +++ b/scripts/preprocess_spec.py @@ -20,7 +20,7 @@ from collections import OrderedDict import urllib3 -from constants import KUBERNETES_BRANCH, SPEC_VERSION +from constants import KUBERNETES_BRANCH # these four constants are shown as part of this example in []: # "[watch]Pod[List]" is the deprecated version of "[list]Pod?[watch]=True" @@ -119,10 +119,6 @@ def process_swagger(spec): inline_primitive_models(spec) - # TODO: Kubernetes does not set a version for OpenAPI spec yet, - # remove this when that is fixed. - spec['info']['version'] = SPEC_VERSION - return spec