summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-06-29 16:56:59 -0400
committerScott Moser <smoser@brickies.net>2017-06-29 17:23:11 -0400
commit68edc96ee3c4431106c229702c8f91a126d542f2 (patch)
treec60c411e360fc43b0ba28bc71dd783fa3b4cd63e
parent55c4159a5a6683ba180b2c106c97e81c272410c0 (diff)
downloadcloud-init-git-68edc96ee3c4431106c229702c8f91a126d542f2.tar.gz
Remove the optional dependency on jsonschema for stable release.
To make this acceptable as a SRU we keep the same dependencies as are in the stable release. The '${python3:Depends}' in debian/control would automatically add the dependency if it is seen in requirements.txt. Add a patch stable-release-no-jsonschema-dep.patch to fix.
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/stable-release-no-jsonschema-dep.patch21
2 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series
index 632e5464..e5208df9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
azure-use-walinux-agent.patch
ds-identify-behavior-yakkety.patch
+stable-release-no-jsonschema-dep.patch
diff --git a/debian/patches/stable-release-no-jsonschema-dep.patch b/debian/patches/stable-release-no-jsonschema-dep.patch
new file mode 100644
index 00000000..f8a11334
--- /dev/null
+++ b/debian/patches/stable-release-no-jsonschema-dep.patch
@@ -0,0 +1,21 @@
+Description: Remove the optional dependency on jsonschema for stable release.
+ To make this acceptable as a SRU we keep the same dependencies as are
+ in the stable release.
+ .
+ The '${python3:Depends}' in debian/control would automatically add the
+ dependency if it is seen in requirements.txt.
+Forwarded: not-needed
+Author: Scott Moser <smoser@ubuntu.com>
+
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -34,7 +34,8 @@ requests
+ jsonpatch
+
+ # For validating cloud-config sections per schema definitions
+-jsonschema
++## Do not add dependencies to a stable release (SRU).
++#jsonschema
+
+ # For Python 2/3 compatibility
+ six