From 3c80310af3a5e821a0213781cd029fa728f8af68 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 31 Jan 2013 23:27:07 +0800 Subject: [PATCH 01/79] Added initial debian folder. --- debian/changelog | 33 ++++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 27 ++++++++++++++++++++++++++ debian/copyright | 45 ++++++++++++++++++++++++++++++++++++++++++++ debian/docs | 1 + debian/gbp.conf | 8 ++++++++ debian/rules | 15 +++++++++++++++ debian/source/format | 1 + debian/watch | 2 ++ jsonschema.py | 2 +- 10 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100644 debian/gbp.conf create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..13810169 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,33 @@ +python-jsonschema (0.8.0-1) experimental; urgency=low + + * New upstream release. + * Team maintains the package in pkg-openstack. + * Fixed debian/copyright format URL. + * Added Ghe and myself in debian/copyright. + * Bumped debhelper and compat to >= 9. + * Bumped Standards-Version to 3.9.4 + * Added VCS and Homepage fields. + * Now using openstack-pkg-tools. + * Pre-Depends: dpkg (>= 1.15.6~) because of xz compression. + * Added a watch file. + + -- Thomas Goirand Thu, 31 Jan 2013 23:12:17 +0800 + +python-jsonschema (0.2-1) unstable; urgency=low + + * First Debian Packaging + + -- Ghe Rivero Wed, 30 May 2012 14:43:07 +0200 + +python-jsonschema (0.2-0ubuntu2) quantal; urgency=low + + * debian/control: Add python-nose as a build dependency. + * debian/rules: Run testsuite during build. + + -- Chuck Short Wed, 23 May 2012 20:02:47 -0400 + +python-jsonschema (0.2-0ubuntu1) quantal; urgency=low + + * Initial release. + + -- Chuck Short Wed, 02 May 2012 08:46:39 -0400 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..e1cab576 --- /dev/null +++ b/debian/control @@ -0,0 +1,27 @@ +Source: python-jsonschema +Section: python +Priority: optional +Maintainer: PKG OpenStack +Uploaders: Loic Dachary (OuoU) , + Julien Danjou , + Thomas Goirand , + Ghe Rivero , + Mehdi Abaakouk +Build-Depends: debhelper (>= 9), python-setuptools (>= 0.6b3), + python-all (>= 2.6.6-3~), python-nose, openstack-pkg-tools +Standards-Version: 3.9.4 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git +Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git +Homepage: https://github.com/Julian/jsonschema + +Package: python-jsonschema +Architecture: all +Pre-Depends: dpkg (>= 1.15.6~) +Depends: ${python:Depends}, ${misc:Depends} +Description: An(other) implementation of JSON Schema (Draft 3) for Python + JSON Schema is a specification for a JSON-based format for defining + the structure of JSON data. JSON Schema provides a contract for what + JSON data is required for a given application and how it can be + modified, much like what XML Schema provides for XML. JSON Schema is + intended to provide validation, documentation, and interaction control + of JSON data diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..5a983559 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,45 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: jsonschema +Source: https://github.com/Julian/jsonschema + +Files: * +Copyright: (c) 2011 Julian Berman +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +Files: debian/* +Copyright: 2012 Chuck Short + 2012, Ghe Rivero + 2013, Thomas Goirand +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..a1320b1b --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.rst diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 00000000..f9f4b788 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,8 @@ +[DEFAULT] +upstream-branch = master +debian-branch = debian/experimental +upstream-tag = v%(version)s +compression = xz + +[git-buildpackage] +export-dir = ../build-area/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..24da8ee6 --- /dev/null +++ b/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +UPSTREAM_GIT = git://github.com/Julian/jsonschema.git + +include /usr/share/openstack-pkg-tools/pkgos.make + +%: + dh $@ --with python2 + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + nosetests tests.py +endif diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..d536b4fe --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://github.com/Julian/jsonschema/tags .*(\d[\d\.]+)\.tar\.gz diff --git a/jsonschema.py b/jsonschema.py index 7e021400..0732f0a2 100644 --- a/jsonschema.py +++ b/jsonschema.py @@ -19,7 +19,7 @@ import re import sys -__version__ = "1.0.0-dev" +__version__ = "0.8.0" PY3 = sys.version_info[0] >= 3 -- GitLab From 3e3bcbacefedb9b2d8adef2c76de0de418d100fa Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 1 Feb 2013 04:54:36 +0000 Subject: [PATCH 02/79] Updated upstream changelog --- debian/CHANGELOG | 1931 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1931 insertions(+) create mode 100644 debian/CHANGELOG diff --git a/debian/CHANGELOG b/debian/CHANGELOG new file mode 100644 index 00000000..6aa33193 --- /dev/null +++ b/debian/CHANGELOG @@ -0,0 +1,1931 @@ +commit 3a158e4e4d1df62ce9a553ff3bd6a564c686b0f6 +Author: Julian Berman +Date: Sun Jan 13 23:33:08 2013 -0500 + + Release 0.8.0 + +commit e10247e6b6b5bacb7f7366c226b29f085862780b +Author: Julian Berman +Date: Sun Jan 13 23:29:40 2013 -0500 + + ...to the right one + +commit e392c6ce49fd3025114a6c9a2f41fede0ece38f9 +Author: Julian Berman +Date: Sun Jan 13 23:28:45 2013 -0500 + + Update link + +commit fc4ff2105a9199a4784f1c72a4ab66513243270b +Author: Julian Berman +Date: Sun Jan 13 23:27:38 2013 -0500 + + Update readme and changelog + +commit b06b6a8f35473fe30811ade863887f16f219b44f +Author: Julian Berman +Date: Sun Jan 13 23:19:29 2013 -0500 + + Cleanup 123 + +commit 2e3550b7223aa6aa48290c64355740738972606b +Author: Julian Berman +Date: Sun Jan 13 23:11:34 2013 -0500 + + C o m p r ess + +commit 9c7e5c6d870a8da438bf65025d74162a0d1c738f +Author: Julian Berman +Date: Sun Jan 13 23:02:33 2013 -0500 + + Not meant to be doctested. + +commit 95c25330d67cb2ca9d7b86547d0d50250b5ac083 +Author: Julian Berman +Date: Sun Jan 13 22:52:21 2013 -0500 + + Finish additional types section. + +commit 31acb8f9a1336b6748ebebade0937f60761fd810 +Author: Julian Berman +Date: Sun Jan 13 21:52:07 2013 -0500 + + Finish IValidator + +commit 2cc1e91327036f90ec3d68678ce4ab8da6eb35a2 +Author: Julian Berman +Date: Sun Jan 13 20:10:43 2013 -0500 + + More docs. Start documenting IValidator. + +commit 1c39393e0e6685c4ce6707b617e1bfd55852393a +Author: Julian Berman +Date: Sun Jan 13 19:23:35 2013 -0500 + + More tiny cleanups in docstrings and such. + +commit 08c289ec7c0697f59eca65952d8d31418e7d3d6e +Author: Julian Berman +Date: Sat Jan 12 23:20:30 2013 -0500 + + Autofind version + +commit ef3d0134d12fd94004e655274394a69b8d0f161f +Author: Julian Berman +Date: Sat Jan 12 23:15:29 2013 -0500 + + validator -> validates + +commit 1b1f747c368207c3f1f93d1f783dc7cbe3ab5de3 +Author: Julian Berman +Date: Sat Jan 12 23:15:22 2013 -0500 + + Sphinx doctest + +commit 7e29d364811a3bf714f2ae39a9cdee380f1b32c0 +Author: Julian Berman +Date: Sat Jan 12 23:14:18 2013 -0500 + + Rename folder + +commit 69025fda786e6d0a4af2c224153c88e10292b666 +Author: Julian Berman +Date: Sat Jan 12 22:32:18 2013 -0500 + + More docstring updates + +commit cbeec6b8c562c35d1e6bd78e6d2b9d679bff0040 +Author: Julian Berman +Date: Sun Dec 30 14:46:02 2012 -0500 + + Add some arg types to docstrings + +commit f571a54f7319b535f40dc50d42e26900e625a238 +Author: Julian Berman +Date: Sat Dec 29 23:55:57 2012 -0500 + + Fixed any to accept any type, including unknown ones. + + Closes #47 + +commit 59cfa1922986203318d4a81ddee7e7568b619f96 +Author: Julian Berman +Date: Sat Dec 29 21:39:27 2012 -0500 + + Semantic versioning + release 0.8.0-b1 + +commit 8f66819ed3a18e8e8e4f1986e5901d42eb144f59 +Author: Julian Berman +Date: Sat Dec 29 20:50:57 2012 -0500 + + Revamp RefResolver. + + Now properly should resolve both local and remote uris and fragments within + them. + +commit 2b48e71dc2fd9abc70e4c068ead4139a044f33a8 +Author: Julian Berman +Date: Thu Dec 27 09:35:34 2012 -0500 + + Ignore non-objects in patternProperties. + + Closes #49 + +commit dbb71ca0f511e963dfc62ad53313cd1d1e4c96b9 +Author: Julian Berman +Date: Thu Dec 27 09:34:41 2012 -0500 + + Update suite + +commit dcc4e55c4ca25d9edd352a93a4a97df9128d846f +Author: Julian Berman +Date: Mon Dec 24 19:54:31 2012 -0500 + + Remove duplication. + +commit c41787bf3897ae903c4d1fa03d7b94f65e445552 +Author: Julian Berman +Date: Mon Dec 24 19:53:41 2012 -0500 + + OK, let's see if this worked. Updated test suite. + + Squashed commit of the following: + + commit b255d27aeca09583415fca8616e68eeaa2fd3eeb + Author: Julian Berman + Date: Mon Dec 24 19:41:09 2012 -0500 + + Add tests for ignoring irrelevant types. + + commit 71a0d30e0cafce6876f23ab6cf25365d1244e0cd + Merge: 2262a91 082e844 + Author: Julian Berman + Date: Sun Dec 23 21:14:38 2012 -0500 + + Tag version 1.0.0. + + Closes #13 + + commit 082e8440ccbf29181b8ba6f440d89f4723b841df + Author: Julian Berman + Date: Sun Dec 23 00:28:48 2012 -0500 + + Cleanup + + * Make errors in the tests be failures + * Removed use of ErrorTree + * Added another helper fn + * Use fnmatch instead of glob + + commit e39d53703cbf4047b4fcd864dc55ad412c4c9d1d + Author: Julian Berman + Date: Fri Dec 21 14:52:16 2012 -0500 + + Added tests differentiating between lexical and mathematical integers. + + Integer literals should be considered integers, while mathematical integers can + be specified with divisibleBy. + + See: https://github.com/json-schema/json-schema/issues/27 + + Closes #2 + + commit 44540b712d330625379ab3a85fa33aca044b29cd + Author: Julian Berman + Date: Fri Dec 21 14:47:26 2012 -0500 + + Added name to license. + + commit 646a9810aa69ca3a1fd14dc4282d4191cc222436 + Author: Julian Berman + Date: Fri Dec 21 14:31:47 2012 -0500 + + Add a test for BigNum integers. + + Closes #12 + + commit d22c24ea996491f839f5f5c8447ad30f2087eebb + Merge: e8bcd5a c0dbbb5 + Author: Julian Berman + Date: Wed Dec 19 10:57:03 2012 -0800 + + Merge pull request #17 from gazpachoking/validate_suite_content + + Add sanity checks for actual format of test suites + + commit c0dbbb5320d33763b186ff40aa0292c6170588ef + Author: Chase Sterling + Date: Wed Dec 19 10:53:57 2012 -0500 + + Add back executable bit to suite_sanity_check + + commit 86f348605b35b9777691a0498f720c9dba2fb500 + Author: Chase Sterling + Date: Wed Dec 19 00:49:20 2012 -0500 + + Add sanity check to validate all suites against suite schema. + Make sure optional test suites don't skip the sanity checks. + + commit e8bcd5a1f064eadd4acf4be16bf92412f9fd0e54 + Author: Nick Lombard + Date: Wed Dec 19 06:38:00 2012 +0200 + + Update README.md + + Travis status for develop branch + + commit ca8f1071db80ce5f256927d3cad8af8404c768b9 + Author: Nick Lombard + Date: Wed Dec 19 06:36:03 2012 +0200 + + Update README.md + + Added travis status image + + commit cf4597e140d1f713f9f7f34c2cb03da869a3224e + Author: Julian Berman + Date: Tue Dec 18 23:27:13 2012 -0500 + + Minor formatting (and get travis to build) + + commit 5cb630c9ee5c8eecb06332d65f784538e451bc31 + Author: Julian Berman + Date: Tue Dec 18 23:12:42 2012 -0500 + + Show number of tests found + + commit 7baea07ecbb64edf7bd4dab6f11139672298d3fd + Author: Julian Berman + Date: Tue Dec 18 23:11:33 2012 -0500 + + Travis + + commit 2f320bb1c0e7514e7e03fe6049413c974fc844ec + Author: Julian Berman + Date: Tue Dec 18 23:07:23 2012 -0500 + + Add sanity checker. + + commit 2262a9141c1f147c237adbeea540f66018349c5f + Merge: 9cda89e a1ec588 + Author: Julian Berman + Date: Tue Dec 18 13:22:23 2012 -0800 + + Merge pull request #15 from tdegrunt/patch-1 + + Update README.md + + commit a1ec58862c20ea4c98d5c6a26024e83145453b03 + Author: Tom de Grunt + Date: Tue Dec 18 22:10:48 2012 +0100 + + Update README.md + + Added node.js module jsonschema. + + commit 9cda89ee01a4cc9e86a215b3b9ff0468b59714a0 + Author: Julian Berman + Date: Tue Dec 18 14:35:19 2012 -0500 + + Update README.md + + commit b22d795b9863d02e9fd4891ffde153ad41c4f1cb + Author: Julian Berman + Date: Sat Nov 17 19:26:21 2012 -0500 + + Ignore TODO + + commit 330fd4864fa55b3b6bed8287cf3bdcbc2c639798 + Author: Julian Berman + Date: Sat Nov 17 19:25:27 2012 -0500 + + Merge into properties tests. + + commit c7c2338380efebf6b89c9b81552962736fcf0b84 + Author: Julian Berman + Date: Sat Nov 17 19:20:25 2012 -0500 + + Remove duplicate tests. + + commit 281c28be60f87fe231815b8faebc1e6169233be5 + Merge: 6f55ff5 6c28d7c + Author: Julian Berman + Date: Sat Nov 17 19:14:19 2012 -0500 + + Merge git://github.com/IreneKnapp/JSON-Schema-Test-Suite + + commit 6c28d7cb5fce73dd2cea792c151bb002501aa6ed + Author: Irene Knapp + Date: Fri Nov 16 08:33:30 2012 -0500 + + Fix a test that should actually be invalid. Remove some unnecessary tests. + + commit b7858cc3584ce8a8886a7edde3866f9776505b6f + Author: Irene Knapp + Date: Thu Nov 15 22:48:09 2012 -0500 + + Port over the rest of the stuff from jsonschema (the Python project). + + commit fa666236d2d4386ff3f17589d3f5f9416f3280df + Author: Irene Knapp + Date: Thu Nov 15 16:37:56 2012 -0500 + + Port roughly the first third of jsonschema (the Python project)'s tests.py. + + commit 6f55ff5138a561999df5b8ee27324856466eca6e + Author: Julian Berman + Date: Thu Nov 15 14:46:48 2012 -0500 + + Add the haskell thing that was using us. + + commit 756c8257ca5a9e4de08a27f716844d24ee99432f + Merge: d735a8a 459dd98 + Author: Julian Berman + Date: Thu Nov 15 11:44:08 2012 -0800 + + Merge pull request #6 from IreneKnapp/master + + Add direct-schema to list of clients + + commit 459dd98563fbeb840ce8202a1ce72a24199a87c7 + Author: Irene Knapp + Date: Thu Nov 15 14:40:41 2012 -0500 + + Adding direct-schema to list of clients. + + commit d735a8a9de59e1ed7e0bf660b7aba0925c0f1cfa + Author: Julian Berman + Date: Thu Nov 15 09:37:03 2012 -0500 + + Add call to action. + + commit ca78ea844e6ca0d4d43885630d122687982d4746 + Author: Julian Berman + Date: Thu Nov 1 08:58:50 2012 -0400 + + Add heterogeneous types unique test. + + commit 4ab01de94340e6baed2344f0b949043ca35ddfaa + Author: Julian Berman + Date: Wed Oct 31 20:12:53 2012 -0400 + + Add specific test for bool and int. + + commit 6a52026b0d5f1b687d5a995a1591b99d30240280 + Author: Julian Berman + Date: Wed Oct 31 20:12:38 2012 -0400 + + Simplify test to remove also testing integers and booleans. + + commit 3871deac9d5cbc50635533736b68da2feaac0a1d + Merge: fefa4dc 6f18358 + Author: Julian Berman + Date: Wed Oct 10 17:39:19 2012 -0400 + + Merge branch 'render' + + commit 6f18358cc498bb0ed5dfcef08bca52408bf717e9 + Author: Julian Berman + Date: Wed Oct 10 17:37:54 2012 -0400 + + Fix README example. + + commit fefa4dc1c72f75c605aeb8138c39468e8240e724 + Merge: 189e231 295d43a + Author: Julian Berman + Date: Wed Oct 10 12:47:28 2012 -0700 + + Merge pull request #5 from timjb/master + + Added tests for divisibleBy, format: "regex" + + commit 295d43a61daf4098864137c71b652c3d18ee33f3 + Author: Tim Baumann + Date: Wed Oct 10 21:27:32 2012 +0200 + + Move format.json to folder for optional tests + + commit 8f5d9e281b18296baa6440a8caa8955cf5eaec5e + Author: Tim Baumann + Date: Wed Oct 10 21:06:08 2012 +0200 + + regex validation + + commit f11ddc3615460fa4fc9a0e2de8efde856d138f2f + Author: Tim Baumann + Date: Wed Oct 10 20:59:55 2012 +0200 + + divisibleBy tests + + commit 189e231e65d2f25f722fa362cb770ef1c264f7a2 + Author: Julian Berman + Date: Wed Oct 10 10:00:42 2012 -0400 + + Fix the additionalItems tests. + + Closes #4 + + commit a0a6e71207e4cf2c2821370320cc8e158cd70f4c + Author: Julian Berman + Date: Wed Oct 10 09:54:52 2012 -0400 + + Fix nil. + + Closes #3 + + commit 8dbaf210b8430c8cd1058b22cc2bfc639bcbbf8b + Author: Julian Berman + Date: Tue Oct 9 20:28:09 2012 -0400 + + Fix line endings and add invalid test case. + + commit 7829853a2fffa508557c1e21613709417e603f09 + Author: Julian Berman + Date: Sun Oct 7 10:33:14 2012 -0400 + + required + + commit 91e57ae1dc09d75c3885bb8124213f5e67bf2275 + Author: Julian Berman + Date: Sun Oct 7 10:24:35 2012 -0400 + + Pattern + + commit 49af2ebc9a02584fe84ee8b414930b70af24637e + Author: Julian Berman + Date: Sat Oct 6 20:50:59 2012 -0400 + + uniqueItems + + commit 089ed8e819d598125bbac985aa292f78be1e1547 + Author: Julian Berman + Date: Sat Oct 6 20:50:23 2012 -0400 + + Enum + + commit 7e4b937146d92a8612e9b95074daf7582f6ace65 + Author: Julian Berman + Date: Sat Oct 6 20:40:53 2012 -0400 + + max/min Items/Length + + commit 5c27f85a33bc75a8cfddf3b66d2bae91eac9b21e + Author: Julian Berman + Date: Sat Oct 6 20:34:21 2012 -0400 + + Minimum and maximum + + commit 9e24adbd197dddd31d74743bbc203534eda07e9e + Merge: 3649b58 3498f34 + Author: Julian Berman + Date: Wed Sep 26 17:16:27 2012 -0700 + + Merge pull request #1 from gazpachoking/clean + + Add some more tests + + commit 3498f34e94db6e20f8202c0638005d2f62931ab7 + Author: Chase Sterling + Date: Wed Sep 26 20:02:58 2012 -0400 + + Fix an improper additionalItems test. + + commit 26a3873400e6c644cbe22842565624b40c410f1e + Merge: baf0502 3649b58 + Author: Chase Sterling + Date: Tue Sep 25 16:48:39 2012 -0400 + + Merge branch 'master' into clean + + commit baf050206e12334dfe158390a9d8f8d5525b3d6d + Author: Chase Sterling + Date: Tue Sep 25 16:48:30 2012 -0400 + + Added items tests. + + commit cb6dfb2f040c1cc581128a0fbd2a40cfa44fb994 + Author: Chase Sterling + Date: Tue Sep 25 16:11:21 2012 -0400 + + Add cleaned up additionalItems + + commit 3649b58a5ce8fefc77ee1cfaaaeaf68df278ebd6 + Author: Julian Berman + Date: Tue Sep 25 15:28:13 2012 -0400 + + Would be nice if I'd have properly run lint. + + commit e6a270f18c77a1218abc3a7137a093a757b071db + Author: Julian Berman + Date: Tue Sep 25 15:00:57 2012 -0400 + + Properties. + + commit 2192a637eff388a4ee666b07635922281e78539f + Author: Julian Berman + Date: Tue Sep 25 12:40:31 2012 -0400 + + Clarify test reqs. + + commit ff746d00529dd7df0e56329223a8f16933aff9d1 + Author: Julian Berman + Date: Tue Sep 25 12:34:22 2012 -0400 + + Add MIT License. + + commit 9271ce51a4e053fe40985b17c1f88715bd859eb6 + Author: Julian Berman + Date: Tue Sep 25 12:29:00 2012 -0400 + + A basic readme. + + commit 530a0f33201ce4d718d5859f4856a65bbbcdcc73 + Author: Julian Berman + Date: Tue Sep 25 12:12:43 2012 -0400 + + Finish type tests. + + commit 4f9cd46dd9f73a1903452b1a9f4ea99c1938fb50 + Author: Julian Berman + Date: Tue Sep 25 11:49:34 2012 -0400 + + Initial commit. Basic type tests. + +commit 898ebd9ac665eff1d736db2c71a1e7dccf76954c +Author: Julian Berman +Date: Sun Dec 2 14:12:51 2012 -0500 + + Think travis has 3.3 now. + +commit 6d5a088b220fff883f424cc518c325eb4fb3cdb9 +Author: Julian Berman +Date: Sun Dec 2 14:02:29 2012 -0500 + + Move ValidationError to errors page. + +commit c5473b8e386551aa4dcc663c96d4fdda118173c7 +Author: Julian Berman +Date: Sun Dec 2 13:58:51 2012 -0500 + + Copy basic example to docs. Move validation to its own page + +commit d9a0ac110c26eea92fe6559321335a51d1c86ab7 +Author: Julian Berman +Date: Sun Dec 2 13:58:06 2012 -0500 + + Wrong directive. + +commit 1c8c13c11850356b1fcd891599393c53cb3802ac +Author: Julian Berman +Date: Sat Dec 1 23:01:11 2012 -0500 + + Let's call it resolve_relative. + +commit 870869b4e6b210fac66823bd2c1ca103dc9eb9d9 +Author: Julian Berman +Date: Sat Dec 1 21:54:10 2012 -0500 + + Typoed the link. + +commit 6943d5de197e2543e29b12c43035e13e297eb33a +Author: Julian Berman +Date: Sat Dec 1 21:32:49 2012 -0500 + + Whoops. + +commit 2be54ec63c5ccf81956ca936e3da6b8e41f41f28 +Author: Julian Berman +Date: Sat Dec 1 21:25:52 2012 -0500 + + Link to the Draft3Validator + +commit 54a603118123c6ed749906788c3e19d2ea56f3a8 +Author: Julian Berman +Date: Sat Dec 1 21:23:48 2012 -0500 + + Link to more docs, so move the example into the docstring. + +commit 3fbe95d3a2c2ce597f2e50e916f8cea4798dcd72 +Author: Julian Berman +Date: Sat Dec 1 21:12:39 2012 -0500 + + Link to docs + +commit 9a6e4e52e4bc35587a66893a614b8629899f8d49 +Author: Julian Berman +Date: Sat Dec 1 21:10:41 2012 -0500 + + Add some documentation on ErrorTrees + +commit ac034f9ced9e1c7eb8c5c2ac7a5bd70107b497f6 +Author: Julian Berman +Date: Fri Nov 30 12:27:44 2012 -0500 + + Build docs in tox + +commit b1a1a5b5252e950150d5ae194dcda7715933f29a +Author: Julian Berman +Date: Fri Nov 30 10:42:24 2012 -0500 + + Update trove classifiers. + +commit a3e18b0ae6c247d5594177826b1eef3b684cc235 +Author: Julian Berman +Date: Thu Nov 29 21:07:25 2012 -0500 + + Minor cleanup. + +commit 84db74338e9102cd1d4886b3844fb413608d3b96 +Author: Julian Berman +Date: Thu Nov 29 17:51:16 2012 -0500 + + Add params to __init__ for Validation and SchemaError + + Also break out the ErrorTree test into separate unit tests. + +commit 5c1f34d0427e63a12fdf466c99fc49822a0f82ec +Author: Julian Berman +Date: Sat Nov 17 21:40:15 2012 -0500 + + Fix sorted_errors. + + Closes #39 + +commit 34ea55d6b8fbdde74698098c51037a44a23eeba2 +Author: Julian Berman +Date: Sat Nov 17 21:40:10 2012 -0500 + + Remove dead imports. + +commit 3ca9e34a49d64acd37ac8842c0eed3a00e48e187 +Author: Julian Berman +Date: Sat Nov 17 21:39:40 2012 -0500 + + Stupid nose. + +commit 7a5b8a66da9ef646ffd1b5534926aab160c3dcbb +Author: Julian Berman +Date: Sat Nov 17 21:29:53 2012 -0500 + + Never mind, this isn't necessary at all anymore. + +commit 1000836e4b6bc6049937b8e1d3ffa4db49f62c55 +Author: Julian Berman +Date: Sat Nov 17 20:16:50 2012 -0500 + + Silence coverage. + +commit 3b34727463afc55f1ad757ddc0094eb0ffa046e0 +Author: Julian Berman +Date: Sat Nov 17 20:16:16 2012 -0500 + + Be gone! + +commit 5a9f05ef05c897cee4aa64a936cc962823f51f05 +Author: Julian Berman +Date: Sat Nov 17 19:55:27 2012 -0500 + + Remove duplicated tests. + +commit 920f580dffd5522ee27c1bc454f4f22ef3da055d +Author: Julian Berman +Date: Sat Nov 17 19:52:58 2012 -0500 + + Update json schema test suite + +commit fb711b14672893782bb8bad31150849bd8283bd5 +Author: Julian Berman +Date: Wed Nov 7 00:51:27 2012 -0500 + + Update readme. + +commit e8b2b4e9016fca34ce2676b2f20e1140870f0f79 +Author: Julian Berman +Date: Wed Nov 7 00:35:18 2012 -0500 + + Fewer times + +commit fe5d9ff6aa1eff0af303eb4405278b44456d15e1 +Author: Julian Berman +Date: Wed Nov 7 00:08:38 2012 -0500 + + Non local refs. + +commit de3a3b6130537764dff67f6276178f477746fca4 +Author: Julian Berman +Date: Tue Nov 6 20:16:34 2012 -0500 + + Update docs. + +commit 880800a2efb5340474fcdb43f658b7117b286d58 +Author: Julian Berman +Date: Tue Nov 6 20:15:49 2012 -0500 + + Ref store + +commit 2690f948bb238cccedd1ce8278257003fc18f642 +Author: Julian Berman +Date: Tue Nov 6 20:06:46 2012 -0500 + + RefResolver + +commit 505bf3ac0f87a777e4a0827746e5f6156ebbbb56 +Author: Julian Berman +Date: Tue Nov 6 18:41:04 2012 -0500 + + Trim heading + +commit 5618b4526f85fb8e04f9938cd052035e9aa6742b +Author: Julian Berman +Date: Thu Nov 1 09:35:56 2012 -0400 + + Fix a directive + +commit a6501d53bfbf7f01b4df4d3a03c0375b926d257d +Author: Julian Berman +Date: Thu Nov 1 09:35:50 2012 -0400 + + Start on Sphinx docs. + +commit c58cc1855588c2e0c69345ee80801c63d282874d +Author: Julian Berman +Date: Thu Nov 1 09:01:03 2012 -0400 + + Still no idea why these extra commits are showing up. + +commit a83d398067e97f195bdf3ee4c0666f87abc99301 +Author: Julian Berman +Date: Thu Nov 1 08:56:36 2012 -0400 + + Fix #43 for homogeneous uniqueItems too. + +commit fe0d6471a669beee78cc26a1d27718f0994346c5 +Author: Julian Berman +Date: Wed Oct 31 22:28:26 2012 -0400 + + Add tox and JSON tests. + +commit db4f74befebd90a03f830bf6fe576a91c70fef93 +Author: Julian Berman +Date: Wed Oct 31 20:39:51 2012 -0400 + + Begrudgingly make 1 and True unique (and 0 and False). + + Closes: #43 + +commit 3b3bd00fef8547e4a96669f121ab76d31f0cfba0 +Author: Julian Berman +Date: Wed Oct 31 20:27:21 2012 -0400 + + Remove path from test name + +commit 897f198f311bd1cd41f0762f1b97dba05f1c0064 +Author: Julian Berman +Date: Wed Oct 31 20:17:44 2012 -0400 + + Git I don't even begin to understand you. + +commit 88937bd9021e1456dd432bc602206ea314a78c4d +Author: Julian Berman +Date: Tue Oct 30 21:21:45 2012 -0400 + + Use proper relative paths. + +commit 42d694b5584362e7ae05fde51e2173a3f4fb331e +Author: Julian Berman +Date: Tue Oct 30 21:11:17 2012 -0400 + + Use git subtree for JSON Test Suite + +commit 80939b83eb5eb7d5c375ecb13cec5d9f80edc18c +Author: Julian Berman +Date: Tue Oct 30 09:08:13 2012 -0400 + + Remove test duplication. + +commit 4c8c8ad4f6beb260c509d07e91b6f1ea64b6e3b0 +Author: Chase Sterling +Date: Sun Oct 28 23:36:05 2012 -0400 + + Disable some tests due to issue #43 + +commit 92646368385e34ee1db58a26b11bdc59d1ab605b +Merge: ceae60c 654896d +Author: Chase Sterling +Date: Sun Oct 28 23:21:31 2012 -0400 + + Merge branch 'master' into json-test-suite + +commit 654896dcfaff8190a929d199be28c30002b87665 +Merge: 42ec737 faabedc +Author: Chase Sterling +Date: Sun Oct 28 20:18:27 2012 -0700 + + Merge pull request #44 from gazpachoking/unique_fix + + A fix for identifying unique items. refs #43 + +commit faabedcfd9f00ca9b3d485530b39e17ebea30fde +Author: Chase Sterling +Date: Sun Oct 28 22:58:50 2012 -0400 + + A fix for identifying unique items. refs #34 + +commit ceae60c8f79ef88edd11e18265cb57aaca3f62ff +Author: Chase Sterling +Date: Sun Oct 28 21:53:31 2012 -0400 + + Make test method names into valid identifiers. + +commit 42ec73739e930c9f43ce00eee2bc24414951648e +Author: Julian Berman +Date: Sun Oct 28 21:06:24 2012 -0400 + + Remove deprecations. + +commit 6a6c166a75206d18e69c7c3bf0f48b649f2498e9 +Author: Chase Sterling +Date: Sun Oct 28 20:47:26 2012 -0400 + + Fix nose trying to run helper functions as tests. + Fix json test case runner on python 3. + Refactor loading test cases to be a class decorator. + Prevent test cases from swallowing ValidationErrors. + Test method names are now based on filename and test description. + +commit 3ddd80543bd6da56eeea84b2f364febaeadf31b9 +Author: Julian Berman +Date: Sun Oct 28 19:44:10 2012 -0400 + + Update features + +commit eed1d26c98810d00e8f117af82719d6956a0cd33 +Author: Julian Berman +Date: Sun Oct 28 19:43:02 2012 -0400 + + Clarify release note. + +commit 79e0c64c13c5aa98ab4800bf24a3f51abd5ad963 +Author: Julian Berman +Date: Sun Oct 28 19:41:36 2012 -0400 + + Prep for 0.7 release + +commit 253d39484769f064657a1284677c0627d5ed10ff +Author: Julian Berman +Date: Sun Oct 28 19:41:20 2012 -0400 + + Update release notes. + +commit 774bf9dccb902335b0bc1870bb62e304289dba31 +Author: Julian Berman +Date: Sun Oct 28 19:32:35 2012 -0400 + + Privatize _schema as an arg to Draft3Validator functions. + +commit 311e2a0b7c38146161c0e0288b06463c36546219 +Author: Julian Berman +Date: Sun Oct 28 19:27:05 2012 -0400 + + Rename -> resolve_json_pointer + +commit ffeeaf305445281fdc0b086f1d83bc7e4e880b64 +Author: Chase Sterling +Date: Sun Oct 28 19:18:29 2012 -0400 + + Add json based test cases, and a test runner for them. + +commit a8656b8d75944a0029376a0ed78f91c0cb7c886f +Author: Chase Sterling +Date: Fri Oct 26 18:50:25 2012 -0400 + + Add support and test for decoding percent encoded characters in json pointer references. + refs #37 + +commit cdced0f4a028d26f9a713bfb8706a7a8828c1e65 +Author: Chase Sterling +Date: Fri Oct 26 16:57:52 2012 -0400 + + Add test cases for encoded ~ and / in $ref values. + Add back support for decoding them. + refs #37 + +commit 942acd2f7a03134322ce82dfc753438165706a01 +Author: Julian Berman +Date: Fri Oct 26 13:45:48 2012 -0400 + + Cleanup + +commit dc4a02cf79a531cec7b35535d28c453d401f9f9d +Merge: 0e87ffa 64c0d2e +Author: Julian Berman +Date: Fri Oct 26 13:12:54 2012 -0400 + + Merge branch 'json-ref' of http://github.com/redpie/jsonschema + + Closes #37 + + Credit: Chase Sterling & Kiall Mac Innes + + Conflicts: + jsonschema.py + +commit 0e87ffafc8c2bd54eed9827ee50400449f97c98c +Author: Julian Berman +Date: Fri Oct 26 13:02:56 2012 -0400 + + Make check_schema a classmethod. + + meta_validate is deprecated in validate() + +commit e4e08ea2466266c6866d1bb7213bfff92094ce3a +Author: Julian Berman +Date: Mon Oct 22 15:14:13 2012 -0400 + + Add Python 3.3 + +commit 64c0d2e900e929b2fbd91163a8d6c52f6c94a851 +Author: Kiall Mac Innes +Date: Mon Oct 22 11:14:42 2012 +0100 + + Add support for json-pointer references based on Chase Sterling's code. + + Source: https://github.com/gazpachoking/jsonschema/commit/423499e18e64ca7765a03949805b053147a7b5f4 + +commit 0ccbf6f70d978323ae0a57aa0f3c1d73b41cfa97 +Author: Julian Berman +Date: Sun Oct 7 17:58:55 2012 -0400 + + Fix syntax highlighting in readme. + +commit c5a94e7528af88e7aad882323b9a481ea0343115 +Author: Julian Berman +Date: Fri Sep 28 14:42:15 2012 -0400 + + Update readme to use Draft3Validator + +commit da0b82da8f8bc020ee89ce825e94c1ab8e5cc4b5 +Author: Julian Berman +Date: Fri Sep 28 14:39:09 2012 -0400 + + Deprecate meta_validate too. + +commit c99486f0c9d553bc8f964273dda160dd5cb8ceda +Author: Julian Berman +Date: Fri Sep 28 14:07:06 2012 -0400 + + Add schema as a parameter to init for Draft3Validators. + +commit 84113d633521aa7c6784897e39ac1a7b19fe5b6d +Author: Julian Berman +Date: Fri Sep 28 13:36:27 2012 -0400 + + Fix docstring. + +commit d0ce604257cd1d3b0f82661cf90f504a4de6547f +Author: Julian Berman +Date: Fri Sep 28 13:12:20 2012 -0400 + + Add deprecation warning. + +commit 6e752ec1599369ba7bc31f9fe3185aecb775ef4a +Author: Julian Berman +Date: Fri Sep 28 12:54:59 2012 -0400 + + Reorderering functions. + +commit b8837568e3b8370a2665270121937c0447d152bb +Author: Julian Berman +Date: Fri Sep 28 12:52:01 2012 -0400 + + Cleanup. No need to stick these no_ops on for no reason. + +commit 5fc1f09afd3b4c5e916b9c726efd6c20e2eef8a3 +Author: Julian Berman +Date: Fri Sep 28 12:49:58 2012 -0400 + + Fix unvalidated properties. + +commit 4f372ff4249a7c867c2e3fc8b430a0b378f2eb63 +Author: Julian Berman +Date: Fri Sep 28 12:45:47 2012 -0400 + + Introduce check_schema. + +commit 74696988bcf286da6796594bad75e725dc1fc58b +Author: Julian Berman +Date: Fri Sep 28 11:40:51 2012 -0400 + + Test is_valid + +commit 0c1e3023c5485706c8c37c6470ef589c809ecc19 +Author: Julian Berman +Date: Fri Sep 28 11:31:07 2012 -0400 + + Refactor is_type. + +commit 968de69370647459a13c32a3431ca40ceeff888e +Author: Julian Berman +Date: Fri Sep 28 11:30:51 2012 -0400 + + Add mock. + +commit 3c3cf4f850765f5e1825f45767fb6aa7b1317ccf +Author: Julian Berman +Date: Fri Sep 28 11:30:37 2012 -0400 + + Update imports. + +commit 911e14897e1398b8946a96f5a760e3f995a3175d +Author: Julian Berman +Date: Fri Sep 28 10:45:00 2012 -0400 + + Create Draft3Validator class. + +commit dbb298069c8d04a51ce3f47f90226bdb91e292c7 +Author: Julian Berman +Date: Thu Sep 27 14:49:10 2012 -0400 + + Add number arg to perftest. + +commit c626b4b0771a40dc80682ac44263c83e7bd6101f +Author: Julian Berman +Date: Thu Sep 27 14:04:57 2012 -0400 + + More minor duplication removal. + +commit 7921c3c6320480a7a0f6bab26b9474ea6b7fdf85 +Author: Julian Berman +Date: Thu Sep 27 14:03:15 2012 -0400 + + Grouped the iter_errors tests. + +commit 52bec28ae638e79d08737d657de4c3d14e4cc3ad +Author: Julian Berman +Date: Thu Sep 27 14:00:03 2012 -0400 + + From import. + +commit ee0b6928f4112ac905f38e604495329c8b301d70 +Author: Julian Berman +Date: Thu Sep 27 10:23:58 2012 -0400 + + Move out tests into new test cases. + +commit 1d0fcda65261f36f6f141b2fc99509b516e0f1b4 +Author: Julian Berman +Date: Thu Sep 27 10:23:02 2012 -0400 + + Cleanup a test + +commit 207138a1a62e0cc4b87a3485005bdf1d2a508d0a +Author: Julian Berman +Date: Thu Sep 27 09:11:33 2012 -0400 + + Didn't like how this reads. + +commit 43b99fae5af42689989f5429e10e5082d2cd2fdb +Author: Julian Berman +Date: Thu Sep 27 09:10:04 2012 -0400 + + Module docstring update + +commit e47a081bb3396d9b99335e7484a3a161c47fe437 +Author: Julian Berman +Date: Wed Sep 26 21:00:44 2012 -0400 + + Minor formatting. + +commit 2d4a16b8cd5bbe1ea014b2fe7b9f6aa1c9cb5508 +Author: Chase Sterling +Date: Wed Sep 26 20:54:08 2012 -0400 + + Fix another merge problem. + +commit 0522f9112a5bd07148622c617ea178e54ff1b538 +Author: Chase Sterling +Date: Wed Sep 26 20:49:49 2012 -0400 + + Fix bad merge. + +commit 688420f719bd8ba4f8a9e500be3348a1c17c2f8e +Merge: 9a4a4ef e44b0b2 +Author: Chase Sterling +Date: Wed Sep 26 20:40:15 2012 -0400 + + Merge branch 'master' into additionalItems_fix + + Conflicts: + tests.py + +commit 9a4a4ef512cba056a8d6ae6e68be7f92806295b5 +Author: Chase Sterling +Date: Wed Sep 26 20:21:53 2012 -0400 + + Fix additionalItems behavior when items is not in tuple form. + +commit e44b0b29e38a09e0b244db7e1aade2127ab89913 +Author: Julian Berman +Date: Mon Sep 24 18:22:33 2012 -0400 + + Don't recommend using version. + + It is imminently going to be deprecated. + +commit 6615916ffc1cea2bca2dc60e0509ed1242ac02c4 +Author: Julian Berman +Date: Mon Sep 24 15:10:57 2012 -0400 + + Fix additionalProperties with patternProperties present. + + Closes #24. + +commit 69dc5c134e497ac003f071f7841f108d897c263c +Author: Julian Berman +Date: Mon Sep 24 14:17:32 2012 -0400 + + Centralize irrelevant types tests. + +commit 01de645e86e725c420e1b05b32fa38597cd7abab +Author: Julian Berman +Date: Sun Sep 23 15:24:21 2012 -0400 + + Never mind, travis is annoying. + +commit 885db7a26bebed11a312c73ac0495c002c5f7dcd +Author: Julian Berman +Date: Sun Sep 23 15:21:49 2012 -0400 + + Unittest2 dep. + +commit 65a0c6905e7ceb73dbae35a6e31b4e1150e437fd +Author: Julian Berman +Date: Sun Sep 23 15:18:12 2012 -0400 + + Really basic perf test. + +commit 8d308daec7dfcefa21f990ca69ca23b0b8f6b280 +Author: Julian Berman +Date: Sun Sep 23 15:17:38 2012 -0400 + + Version bump. + +commit 0b4b381ac4e4f766116d3114bf83ee09ef513590 +Author: Julian Berman +Date: Sun Sep 23 14:44:09 2012 -0400 + + Travis + +commit 638809ad7f8374d7bb480ed633708817ba847b75 +Author: Julian Berman +Date: Sun Sep 23 14:38:51 2012 -0400 + + Centralize rest of error message tests. + +commit 9709948ba6e577874677fabc861b67f3b168377d +Author: Julian Berman +Date: Sun Sep 23 14:22:00 2012 -0400 + + Show `name` in type validation error if present. + + This is mostly just a convenience to make debugging error messages for + object types easier, since as-is, they can span many lines if an object + type is really complicated. + + Closes: #25, #26 + +commit 75cca40af6e1f6bf29088707064fa36212237fff +Author: Julian Berman +Date: Sun Sep 23 00:04:30 2012 -0400 + + This can just be a regular test. + +commit 98c8a4fcb9adea08c53fbe020bba5b882ac18b82 +Author: Julian Berman +Date: Sun Sep 23 00:04:23 2012 -0400 + + Spacing. + +commit 652698bef1a5109bdbf9f30c660e753ea1f999bf +Merge: 1e47794 33bb92f +Author: Julian Berman +Date: Sun Sep 23 00:01:10 2012 -0400 + + Merge remote-tracking branch 'gazpachoking/dependencies_fix2' + +commit 33bb92fa31d2bd51a46e59af3a59390a0fa6dc07 +Author: Chase Sterling +Date: Sun Sep 23 00:01:25 2012 -0400 + + Add a unit test for dependencies validaton on non-objects. + +commit 663ddba17f3178efc3282f376289d5b0748a6330 +Author: Chase Sterling +Date: Sat Sep 22 23:53:50 2012 -0400 + + Fix dependencies behavior when instance is not of type object. refs #30 + +commit 1e47794fb0bec5830646d2004ed9eebed48c5ca1 +Author: Julian Berman +Date: Fri Sep 21 09:56:28 2012 -0400 + + Release v0.6 + +commit 80472b89f932572399c293985f50ea26f348908c +Author: Julian Berman +Date: Thu Sep 20 21:15:20 2012 -0400 + + Restore proper error message for dependencies. + + With a test to back it up. + +commit 5c6cadfc1c4af2d75897d4d972d21d2dc4c7cbdd +Author: Julian Berman +Date: Thu Sep 20 21:14:38 2012 -0400 + + Move out the sad path to clean out the conditional. + +commit 0a4421e5f990d9359346ffc0bb24a4a40b5c3d90 +Author: Chase Sterling +Date: Thu Sep 20 20:38:28 2012 -0400 + + Refactor 'dependencies' to work how I understand it in the spec. + + Fixed 3.x incompatibility. + + Closes #30 + +commit e6eff879eca4071fd3a2e92291a0cd12350ba8bf +Author: Julian Berman +Date: Sun Aug 12 12:04:42 2012 -0400 + + Minor style fixes. + +commit 2f17868c4862f5b57822678406f6e49fed81b20b +Author: Julian Berman +Date: Mon Jul 30 19:21:12 2012 -0400 + + Fix a bytestring test that was mis-written + +commit 9d8b6b38daad10025fcc3656c36ab7ad6e8b2ebd +Author: Julian Berman +Date: Mon Jul 30 14:08:06 2012 -0400 + + Typo + +commit 1685cdcaea5b25cc453306ce5e5ff50dae1a0956 +Author: Julian Berman +Date: Mon Jul 30 14:06:29 2012 -0400 + + Added a note on running the test suite. + +commit c882db9d760c63228f487240f96f45f034217816 +Author: Julian Berman +Date: Tue Jul 17 15:33:02 2012 -0400 + + Relese v0.5 + + Closes: #19 + +commit b04c608c708dd8a7226baa13e815da249ebf7453 +Author: Julian Berman +Date: Mon Jul 9 19:55:36 2012 -0400 + + Multiple types now validate correctly even for non-objects. + + Closes #18. + +commit 9e4571442f1f194ea6c47e502a81613b48b13cd4 +Author: Julian Berman +Date: Sun Jul 8 15:04:44 2012 +0000 + + Revert "Putting the license in the readme." + + This reverts commit a5e7964b4622142d3c15c6c057e62efebc36229c. + +commit 2472c3c7f137788c1441e892bf8aba651a0a4d7d +Author: Julian Berman +Date: Thu Jul 5 22:23:38 2012 -0400 + + Fixed the two failing tests. + +commit cce27c083046a3967d0fdfb6438954888ee91a87 +Author: Federico Mora +Date: Thu Jun 28 12:10:58 2012 -0400 + + Added path of require to ValidationError + +commit 7dfabf8d8022a297619b7fd120cfe48d67e9afb0 +Author: Julian Berman +Date: Tue Jun 19 13:26:57 2012 -0400 + + Forgot to actually remove the args. + +commit 766cc164b56c1d790397b337a04ee64bad9d44b6 +Author: Julian Berman +Date: Tue Jun 19 13:16:17 2012 -0400 + + Remove all the deprecations. + +commit b8b43a4544a529814ae0d7f5b5e065b974cc0b5f +Author: Julian Berman +Date: Tue Jun 19 10:13:27 2012 -0400 + + Lets wrestle with reSt shall we. + +commit 6afe17703e9c6834ab6e23c3ca4002ea8a59b6ee +Author: Julian Berman +Date: Tue Jun 19 09:57:43 2012 -0400 + + Release 0.4 + +commit d8d813c9a1ce24e8da84490f455e0f84bc71a13b +Author: Julian Berman +Date: Tue Jun 19 09:57:04 2012 -0400 + + Update release notes. + +commit a5e7964b4622142d3c15c6c057e62efebc36229c +Author: Julian Berman +Date: Tue Jun 19 09:49:16 2012 -0400 + + Putting the license in the readme. + +commit ca2ce055ae90c8d71d13eac51b5cbb85c34c9505 +Author: Julian Berman +Date: Tue Jun 19 09:46:35 2012 -0400 + + Clarify a deprecation message. + +commit dee2e14a5817853cdd1d28b8349cf5b15f2a7bd3 +Author: Julian Berman +Date: Tue Jun 19 09:44:41 2012 -0400 + + Deprecate meta_validate + +commit 0b0d59b12f3641c74a3efb0973eca85b2eb57c07 +Author: Julian Berman +Date: Tue Jun 19 09:25:53 2012 -0400 + + ErrorTree.__repr__ + +commit 69faf9185c2607dadc68ca96b57578cba2adcc94 +Author: Julian Berman +Date: Mon Jun 18 23:17:13 2012 -0400 + + Added an example of ErrorTree to the README. + +commit 4837056c3868eac6c0970bb8dbe10355d51164d1 +Author: Julian Berman +Date: Mon Jun 18 23:05:25 2012 -0400 + + ErrorTrees, to make programmatic poking at validation easier. + +commit 00a6128b28af8a61e14ca566433305031278049b +Author: Julian Berman +Date: Mon Jun 18 14:58:19 2012 -0400 + + Forgot to bump the version number. + +commit 87ac636ef345f841d44f32accfc4a836c98d91b2 +Author: Julian Berman +Date: Mon Jun 18 14:56:53 2012 -0400 + + With the validation detail, the reraise stuff should be unnecessary. + +commit cbb37aad7e5bafa8c5339885c5dd95390d463e1b +Author: Julian Berman +Date: Mon Jun 18 14:54:34 2012 -0400 + + Typo + +commit b1d7464cddabaa8fab11113537328cd286768496 +Author: Julian Berman +Date: Mon Jun 18 14:52:12 2012 -0400 + + Provide error details for each ValidationError. + + Closes #5. + + To make this work, raising errors from validators is now deprecated. + Instead, each validator needs to yield each error it wishes to signal. + + This was probably broken before anyhow with stop_on_error but there + wasn't a covering unit test at the time for it. + +commit eb026bd526132b113fec719ecf00532b15f9a38c +Author: Julian Berman +Date: Sun Jun 10 13:53:37 2012 -0400 + + Split off deprecation tests. + +commit 07697625e8d52996c90c080d8d4e8ad1c03fb273 +Author: Julian Berman +Date: Sun Jun 10 13:46:12 2012 -0400 + + Clarify the line about iter_errors. + +commit 3916c23f70b36542434e55e6a93776586981daca +Author: Julian Berman +Date: Sun Jun 10 13:44:06 2012 -0400 + + Reimplement deprecated stop_on_error + +commit 221c653478a8c2fd7f6190e8e50236d8d5849e81 +Author: Julian Berman +Date: Fri Jun 8 19:20:50 2012 -0400 + + Deprecate stop_on_error in favor of iter_errors. + + Temporarily reimplementing stop_on_error is not done yet. + + Also fix a small dependencies bug in the meta schema. + +commit 4d6598b98024ccb94cb15d0b6d4fe6443d65818a +Author: Julian Berman +Date: Thu Jun 7 19:56:59 2012 -0400 + + Fixed a bug caused by implementation of _SKIPPED + + Failing to be able to subclass Validator and implement additional validation + for one of the properties that the Validator happens to not validate (like + format). + +commit 23da7cedc58103d8dd037d6b9144c4e90532037e +Author: Julian Berman +Date: Thu Jun 7 14:58:38 2012 -0400 + + Minor style changes + +commit 5780369c57882c84070cbd20a6cd96f121352990 +Author: Julian Berman +Date: Thu Jun 7 14:44:54 2012 -0400 + + Fix reraising with the stack for Py3 + + The extra modules were not being installed, and even installing them + would be quite dirty without turning into a package. Just borrow six.py's + solution. + +commit f195a3f20c036cde5042b45adb33e30c010d2af1 +Author: Glenn Maynard +Date: Thu Jun 7 16:18:03 2012 +0000 + + Rename property in test schema. + + This test has nothing to do with additionalProperties; this is just a + property name. + +commit 5b0e318ad44fb3b79e6ced3c022721655b778f31 +Author: Glenn Maynard +Date: Thu Jun 7 16:10:15 2012 +0000 + + Test .errors propagation for SchemaError. + +commit 770c0a0f2878ef64d402ca99951b5f27b5e53439 +Author: Glenn Maynard +Date: Thu Jun 7 16:04:26 2012 +0000 + + Preserve .errors in SchemaError. + + When meta-validation exceptions are translated from ValidationError to + SchemaError, propagate the .errors attribute to SchemaError. + +commit 5dcb87b6f33beec067d3e4e35634bcb14cef282b +Author: Glenn Maynard +Date: Thu Jun 7 15:27:03 2012 +0000 + + Python3-compatible fix: don't discard exception backtraces. + + This is important; it's next to impossible to debug problems when backtraces are lost. + +commit ef233ae41387598978a19afd16f0296ad200bfdf +Author: Glenn Maynard +Date: Wed Jun 6 22:08:16 2012 +0000 + + Fix an exception when a "properties" value is not an object. + + This is fixed by checking for it in the metaschema, which means it can still + happen if meta_validate is false. I'm not sure if it should try to always + behave for any arbitrary input, even if it fails against the metaschema; I've + done it this way for now since I suspect there's a lot of broken behavior + if metaschema checks are disabled. + + Note that I havn't tried to fix all possible gaps in the metaschema; for example, + additionalProperties should probably also require this. I'm only fixing the ones + that actually cause runtime exceptions (for now). + +commit 46e0910765182c494bdda7020658860604727731 +Author: Julian Berman +Date: Tue Jun 5 23:25:03 2012 -0400 + + Deprecate {string,number}_types for a more robust thing. + +commit deb1648ac91f16d3388c8273777edac32908a586 +Author: Julian Berman +Date: Tue Jun 5 19:27:26 2012 -0400 + + Release notes & version bump for v0.3 + +commit 7de543262710dc23ff71e45f30541505dc7562b0 +Author: Julian Berman +Date: Sun Jun 3 10:00:50 2012 -0400 + + Removed two more stale 2.5 things. + +commit 3032b97c93d0364241582595c561cced53a72fa5 +Author: Julian Berman +Date: Sun Jun 3 09:57:48 2012 -0400 + + Comment cleanup. + +commit 5e1f54f61eda289201abc6e11369691d3dc88f8a +Author: Julian Berman +Date: Sun Jun 3 09:55:22 2012 -0400 + + Moved irrelevant type tests to test_ methods. + +commit baef48e7c1b79188071e7695c44daeb6c5cb6b75 +Author: Julian Berman +Date: Sun Jun 3 09:50:33 2012 -0400 + + Revert "Fix the stack for ValidationErrors being lost." + + This is a small pain to do in a PY3 compatible way. Delaying for now. + + This reverts commit ee1855f55cc42fb9272ae061592feb3187e31b34. + +commit ee1855f55cc42fb9272ae061592feb3187e31b34 +Author: Glenn Maynard +Date: Thu May 31 16:58:09 2012 +0000 + + Fix the stack for ValidationErrors being lost. + +commit caf0d6334adea122a9e28180ecbab4a1affdcf77 +Author: Glenn Maynard +Date: Thu May 31 16:52:38 2012 +0000 + + Fix divisibleBy when the item isn't a number. + + The spec doesn't actually say this one--there's no "when the type is a + number", but that seems like an oversight, since it doesn't otherwise + specify what should happen and that's how all other number-based + constraints work. + +commit 09b36567dd1f0da38f7086a20286322cbf513142 +Author: Glenn Maynard +Date: Thu May 31 16:51:03 2012 +0000 + + Replace multiple_types_with_properties and multiple_types_with_items with + simpler regression tests. + +commit 23e16ca5001186c9827e06f03f4c7e0afd0ecd8d +Author: Glenn Maynard +Date: Thu May 31 16:49:06 2012 +0000 + + Fix verification for minimum and maximum. + +commit ca301e70873358c9d6238dff020e676d058b5b3f +Author: Glenn Maynard +Date: Thu May 31 16:42:33 2012 +0000 + + Fix quotes (for consistency). + +commit 716d797a69385095b02c2f81bf652ebe7d8025de +Author: Glenn Maynard +Date: Thu May 31 16:42:01 2012 +0000 + + Fix "items" verification. + + Like "properties", "items" was failing: + + jsonschema.validate(1, {'type': ['number', 'array'], 'items': {'type': 'string'}}) + + (The regression tests I'm adding for these can probably be done more concisely.) + +commit 2c0ff4f0d2f4accc6589d9bfb5bcbdc02fcfc2d3 +Author: Glenn Maynard +Date: Wed May 30 22:04:49 2012 +0000 + + Fix "properties" verification. + + This fixes the following: + + jsonschema.validate(1, {'type': ['number', 'object'], 'properties': {'x': {}}}) + + raising an error at 'instance[property]' when instance isn't actually an object. "properties" + only has any effect when the instance value is an object. + +commit abe593d6d0f4a83f1fab62fe5af6d05f82118d2b +Author: Julian Berman +Date: Wed May 23 19:12:39 2012 -0400 + + Fixed docstring for updated unknown_* default. + +commit ed54b2a0ee0538e4bcd2c917114044767f073a72 +Author: Julian Berman +Date: Sun Apr 29 21:51:59 2012 -0400 + + Stale future import from 2.5. + +commit ee75ae845cdace66b6a1d166b0b55b289e9081b7 +Author: Julian Berman +Date: Sun Apr 29 21:47:58 2012 -0400 + + Fixed classifiers for py3. + +commit 5afe2146767b9a5a4857a28d8189f4c549fd7521 +Author: Michael Droettboom +Date: Mon Apr 23 15:34:52 2012 -0400 + + Clarify the ``string_types`` parameter for Python 2.x vs. Python 3.x + +commit e54568dd929735ba8d6bf4c03fd1c1dd4738350b +Author: Michael Droettboom +Date: Mon Apr 23 15:34:21 2012 -0400 + + Remove Python 2.5 "next" backward compatibility, since this code no longer works on Python 2.6 anyway. + +commit 1532b6ba22b2e219a264a573857bb9b206be9a54 +Author: Julian Berman +Date: Fri Apr 20 18:38:10 2012 -0400 + + Minor formatting and cleanup. + +commit 5510597e44b7a4758972fa7ebec1055db8880b1d +Author: Julian Berman +Date: Fri Apr 20 18:08:00 2012 -0400 + + Fix a doctest for py3, which includes modules in tracebacks. + +commit 267a9152c6340546ba7eba8049e8659cf50804fb +Author: Michael Droettboom +Date: Fri Apr 20 15:22:23 2012 -0400 + + An initial stab at making jsonschema Python 3.x compatible. + + This takes the approach of being Python 2.6, 2.7, 3.1 and 3.2 + compatible from an identical code base, i.e. not by requiring an + explicit 2to3 step. With this approach it is almost impossible to + also support Python 2.5, though that can be investigated if that is a + hard requirement. + + The testing framework was changed from Twisted.trial to nosetests, + since Twisted does not yet have Python 3.x support. Alternatively, + pytest could be used. + + Most changes are related to adding "from __future__ import + unicode_literals" and removing all of the "u" prefixes on string + literals. + + Since 3.x drops renames dict.iteritems to dict.items, a function + "iteritems" was added to handle either case. + + Likewise, itertools.izip was dropped in favor of just using zip. + + Comparisions of strings and numbers no longer works, so the string is + forcibly converted to a float before doing a numeric comparison. + + Updated "try .. except" to use the new "Exception as e" syntax. + + Python 3 changed the way metaclasses are handled. The metaclass in + tests.py (there are none in the library proper) now uses a crazy + inscrutable syntax that is Python 2.x and 3.x compatible. See + http://mikewatkins.ca/2008/11/29/python-2-and-3-metaclasses/ + + There is one doctest failing on Python 3.x that fails due to the fact + that in Python 3 the full path to the Exception object is shown in + tracebacks, i.e. jsonschema.ValidationError vs. ValidationError. I'm + not sure how to resolve this in a way that is both Python 2 and 3 + compatible. We may just want to skip the doctests on Python 3. + +commit f72f335455a029d9e07f415c46483cc5b00c2d25 +Author: Julian Berman +Date: Thu Apr 19 14:39:50 2012 -0400 + + Removed the securetypes stuff. + The hash fix has been released, so this can all go away. + +commit b202cfd22e69e97dfbc7c714c3d0bf85beab5e92 +Author: Julian Berman +Date: Thu Apr 19 14:07:38 2012 -0400 + + Change defaults for unknown type and unknown property + +commit 6bc1587dca6441e96c27b5f8e4e2ef3774936167 +Author: Julian Berman +Date: Fri Feb 24 11:12:55 2012 -0500 + + Updating the README + +commit f84bc39658d0464fc36d3d2cc97a0c4ab4bf0f25 +Author: Julian Berman +Date: Sun Feb 19 20:16:58 2012 -0500 + + Fixed a typo and elaborated a tiny bit. + +commit 425243d0162b7f019e70ab1ccf0638cc62ee2627 +Author: Julian Berman +Date: Sun Feb 19 19:53:53 2012 -0500 + + Stale import + +commit 35aeb624de72ef81dc6f8978053edcebe1cee40f +Author: Julian Berman +Date: Sun Feb 19 19:48:16 2012 -0500 + + Upping the epsilon for checking floats' divisibleBy + +commit 1206175b307f58ac3747696965cdba2fa0c239da +Author: Julian Berman +Date: Sun Feb 12 15:37:10 2012 -0500 + + Expose .is_type, .error, .schema_error + +commit b5c159bf702ed78a5002e8fac06cbf744bea2737 +Author: Julian Berman +Date: Fri Feb 10 15:25:39 2012 -0500 + + Minor style fix + +commit 6555eb0cfc31800ae6fa76f7f344dd904262f71e +Author: Julian Berman +Date: Fri Feb 10 15:22:12 2012 -0500 + + Fixing a docstring + +commit add00db44d7822370b176acddd617040e117cd6b +Author: Julian Berman +Date: Fri Feb 10 15:20:52 2012 -0500 + + Meta schema validation + +commit 1537b5fcf68a642caaa1d60a88d2cf74dee440b8 +Author: Julian Berman +Date: Thu Feb 9 14:16:32 2012 -0500 + + Some more documentation + +commit b79320fa77e17b9e710f736c5b88ffd64e805c18 +Author: Julian Berman +Date: Mon Jan 30 22:55:56 2012 -0500 + + Ignore TODO scribbles. + +commit 7030485561ea6ca8ed557e47117a57033b4aac5f +Author: Julian Berman +Date: Mon Jan 30 22:41:13 2012 -0500 + + Added basic extends support. forthcoming (I hope) + +commit e169504250e709ae9e45a6afa1eb09af8f593011 +Author: Julian Berman +Date: Mon Jan 30 22:03:42 2012 -0500 + + Make the error message for additionals prettier + + Also fixes an unexpected bug in additionalItems. + +commit c205e546f550bb7d1d0c92f880e19796661ab955 +Author: Julian Berman +Date: Sun Jan 29 19:53:55 2012 -0500 + + Fixed additional{Properties,Items} to appropriately typecheck. + +commit 0fd249c320b971920407a1d4f2382c2552aed6d3 +Author: Julian Berman +Date: Fri Jan 20 00:30:40 2012 -0500 + + Minor cleanup + 'privatize' of _uniq + +commit b3ae1de431b2df4f9918c2029c5b51afcfb114d2 +Author: Julian Berman +Date: Wed Jan 18 19:29:09 2012 -0500 + + Adding uniqueItems with optional (recommended) dep on securetypes. + +commit 2a409776e2370e562851d1f01f22055b823e1d1d +Author: Julian Berman +Date: Mon Jan 16 19:04:38 2012 -0500 + + Being less clever. Github and PyPI don't like this directive. + +commit 54e5ae2af7ed40cc52cc6e319bd46015bbca6d73 +Author: Julian Berman +Date: Mon Jan 16 15:10:50 2012 -0500 + + Adding a basic readme, some classifiers, and bumped the version. + +commit a1db2118b25fd450e1ca34a8174005a5a194fa65 +Author: Julian Berman +Date: Mon Jan 16 15:07:13 2012 -0500 + + Minor: Changed a few errant %s's to %r's. + +commit 5d6910d544991eef9210ab2573b797add4b6cb73 +Author: Julian Berman +Date: Sun Jan 15 20:54:14 2012 -0500 + + Decimal test. + +commit ce63985a3d854c016985923d55e8716d5aa579c5 +Author: Julian Berman +Date: Sun Jan 15 20:42:51 2012 -0500 + + Make {max,min}{Items,Length} stricter, and 'clean up' type checking. + +commit 0500c5069db7e997bb71cdab497e6b8e8a17d5b2 +Author: Julian Berman +Date: Sun Jan 15 20:08:03 2012 -0500 + + Docstring + +commit c54d30f61e3dea2f5fd7b6eb9ace8ee2c0662a0b +Author: Julian Berman +Date: Sun Jan 1 21:49:14 2012 -0500 + + MANIFEST + +commit 1f0e66bf614fda68d0809b9fd7fae8e240cff618 +Author: Julian Berman +Date: Sun Jan 1 21:42:40 2012 -0500 + + Fixed setup.py + +commit b44a6c98f4853bb573c964f3e7a5fe694e95e7e8 +Author: Julian Berman +Date: Sun Jan 1 21:42:19 2012 -0500 + + __version__ bump + +commit e8b741e6a2f19c767d00db87b730ed7ae9d39ee5 +Author: Julian Berman +Date: Sun Jan 1 21:26:46 2012 -0500 + + Broke 2.5 test support. + +commit bb69bdded671a589f8ad0390db735570c1fe0105 +Author: Julian Berman +Date: Sun Jan 1 21:22:31 2012 -0500 + + A docstring, and unknown_type/unknown_property. + +commit f09af6c2a2300b76dbbf975074e0ce4922c24acc +Author: Julian Berman +Date: Sun Jan 1 20:47:29 2012 -0500 + + Parametrized Tests, Or, How I Learned To Stop Worrying and Make My Tests Look Like C + +commit 3f0ec54ad37282079e10c9d30071ed8fe89d4d24 +Author: Julian Berman +Date: Sat Dec 31 20:45:58 2011 -0500 + + Hey. Let's try not stopping on errors too. + +commit 34ff653e3b3a0eea199299a12b18f5faa4c7508b +Author: Julian Berman +Date: Sat Dec 31 19:47:08 2011 -0500 + + disallowed + +commit 49d3bb3dc015fe0cc231e5a15efa777571716b55 +Author: Julian Berman +Date: Fri Dec 30 15:28:21 2011 -0500 + + A few docstrings. + +commit 31bbe94cca31cfee4630ef3a7506e184c7bebf7e +Author: Julian Berman +Date: Fri Dec 30 15:10:10 2011 -0500 + + Missed a dep. + +commit 008e747fb8067edb5bec4ce80c1c2eda5fc71dad +Author: Julian Berman +Date: Fri Dec 30 14:03:11 2011 -0500 + + setup.py and tox + +commit 5d68fa84ee198942100579707b9929436475681d +Author: Julian Berman +Date: Fri Dec 30 14:03:01 2011 -0500 + + Py2.5+ Support. + +commit b18bb96b9bd74a1e52c607bd4ae6dcf924e7caf1 +Author: Julian Berman +Date: Fri Dec 30 12:45:45 2011 -0500 + + Renaming to jsonschema + +commit 75e9a5bf24c63911c58d6f3e320ea1e1b15d2034 +Author: Julian Berman +Date: Fri Dec 30 12:44:00 2011 -0500 + + enum, pattern, and divisibleBy + +commit 2c25dc77051fbdb10b7e5552f317edb72bb6bcc4 +Author: Julian Berman +Date: Thu Dec 29 22:36:53 2011 -0500 + + Initial commit -- GitLab From b788bd803788e569060dbe7f180f5d8b0897cd21 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 2 Feb 2013 03:58:23 +0000 Subject: [PATCH 03/79] Fixed watch file. --- debian/watch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index d536b4fe..0a21c7f3 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -https://github.com/Julian/jsonschema/tags .*(\d[\d\.]+)\.tar\.gz +https://github.com/Julian/jsonschema/tags .*v(\d[\d\.]+)\.tar\.gz -- GitLab From edf58dd70fe4c93a4ae028e06bc3935db27f1498 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 5 Feb 2013 13:15:20 +0000 Subject: [PATCH 04/79] Missing (build-)depends: python-mock --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index e1cab576..e9af5717 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Loic Dachary (OuoU) , Ghe Rivero , Mehdi Abaakouk Build-Depends: debhelper (>= 9), python-setuptools (>= 0.6b3), - python-all (>= 2.6.6-3~), python-nose, openstack-pkg-tools + python-all (>= 2.6.6-3~), python-nose, python-mock, openstack-pkg-tools Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git @@ -17,7 +17,7 @@ Homepage: https://github.com/Julian/jsonschema Package: python-jsonschema Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${python:Depends}, ${misc:Depends} +Depends: ${python:Depends}, ${misc:Depends}, python-mock Description: An(other) implementation of JSON Schema (Draft 3) for Python JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what -- GitLab From 490aa8b731b13f1f66164555670c10467a0d3d89 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 11 Feb 2013 02:21:01 +0000 Subject: [PATCH 05/79] Edit debian/changelog and releasing (Missing (build-)depends: python-mock). --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 13810169..27633276 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (0.8.0-2) experimental; urgency=low + + * Missing build-dependency: python-mock (Closes: #700283). + + -- Thomas Goirand Mon, 11 Feb 2013 02:19:29 +0000 + python-jsonschema (0.8.0-1) experimental; urgency=low * New upstream release. -- GitLab From 8bf7a3628d68baf5012c5d93e585bbae98424666 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 11 May 2013 07:31:22 +0000 Subject: [PATCH 06/79] Releasing upstream 1.1.0 to unstable. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 27633276..effa70c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-jsonschema (1.1.0-1) unstable; urgency=low + + * Uploading to unstable. + * New upstream release. + + -- Thomas Goirand Sat, 11 May 2013 07:30:18 +0000 + python-jsonschema (0.8.0-2) experimental; urgency=low * Missing build-dependency: python-mock (Closes: #700283). -- GitLab From 65ec358213d09f866b1e57eee75262bcbb6ece0b Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 17 May 2013 16:11:03 +0000 Subject: [PATCH 07/79] Fixed debian/gbp.conf to match the unstable branch. --- debian/gbp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index f9f4b788..a80d315c 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,6 @@ [DEFAULT] upstream-branch = master -debian-branch = debian/experimental +debian-branch = debian/unstable upstream-tag = v%(version)s compression = xz -- GitLab From 60231128b466a8c915868684bc6a65d875b37e9a Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 30 May 2013 14:04:32 +0800 Subject: [PATCH 08/79] Ran wrap-and-sort. --- debian/changelog | 6 ++++++ debian/control | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index effa70c0..9be08d25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (1.1.0-2) UNRELEASED; urgency=low + + * Ran wrap-and-sort. + + -- Thomas Goirand Thu, 30 May 2013 14:04:07 +0800 + python-jsonschema (1.1.0-1) unstable; urgency=low * Uploading to unstable. diff --git a/debian/control b/debian/control index e9af5717..c8309ce3 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,12 @@ Uploaders: Loic Dachary (OuoU) , Thomas Goirand , Ghe Rivero , Mehdi Abaakouk -Build-Depends: debhelper (>= 9), python-setuptools (>= 0.6b3), - python-all (>= 2.6.6-3~), python-nose, python-mock, openstack-pkg-tools +Build-Depends: debhelper (>= 9), + openstack-pkg-tools, + python-all (>= 2.6.6-3~), + python-mock, + python-nose, + python-setuptools (>= 0.6b3) Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git @@ -17,7 +21,7 @@ Homepage: https://github.com/Julian/jsonschema Package: python-jsonschema Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${python:Depends}, ${misc:Depends}, python-mock +Depends: python-mock, ${misc:Depends}, ${python:Depends} Description: An(other) implementation of JSON Schema (Draft 3) for Python JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what -- GitLab From 45eb94624cbaedad0cdf21d12b84501431c702e7 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 11 Jun 2013 16:58:22 +0800 Subject: [PATCH 09/79] Builds the python3 package (thanks to Dmitrijs Ledkovs). --- debian/changelog | 4 ++++ debian/control | 23 +++++++++++++++++++++-- debian/patches/fix-pyhashrandom.patch | 23 +++++++++++++++++++++++ debian/patches/series | 1 + debian/python-jsonschema.install | 2 ++ debian/python3-jsonschema.install | 1 + debian/rules | 19 ++++++++++++++++++- 7 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 debian/patches/fix-pyhashrandom.patch create mode 100644 debian/patches/series create mode 100644 debian/python-jsonschema.install create mode 100644 debian/python3-jsonschema.install diff --git a/debian/changelog b/debian/changelog index 9be08d25..76034f3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ python-jsonschema (1.1.0-2) UNRELEASED; urgency=low + [ Thomas Goirand ] * Ran wrap-and-sort. + [ Dmitrijs Ledkovs ] + * Builds the python3 package. + -- Thomas Goirand Thu, 30 May 2013 14:04:07 +0800 python-jsonschema (1.1.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index c8309ce3..46ac1e97 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,11 @@ Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~), python-mock, python-nose, - python-setuptools (>= 0.6b3) + python-setuptools (>= 0.6b3), + python3-all, + python3-mock, + python3-nose, + python3-setuptools Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git @@ -28,4 +32,19 @@ Description: An(other) implementation of JSON Schema (Draft 3) for Python JSON data is required for a given application and how it can be modified, much like what XML Schema provides for XML. JSON Schema is intended to provide validation, documentation, and interaction control - of JSON data + of JSON data. + . + This package contains the Python 2.x module. + +Package: python3-jsonschema +Architecture: all +Depends: ${misc:Depends}, ${python3:Depends} +Description: An(other) implementation of JSON Schema (Draft 3) for Python 3 + JSON Schema is a specification for a JSON-based format for defining + the structure of JSON data. JSON Schema provides a contract for what + JSON data is required for a given application and how it can be + modified, much like what XML Schema provides for XML. JSON Schema is + intended to provide validation, documentation, and interaction control + of JSON data. + . + This package contains the Python 3.x module. diff --git a/debian/patches/fix-pyhashrandom.patch b/debian/patches/fix-pyhashrandom.patch new file mode 100644 index 00000000..1bd90d53 --- /dev/null +++ b/debian/patches/fix-pyhashrandom.patch @@ -0,0 +1,23 @@ +Description: resolve pyhashrandom test suite failure. +Author: Dmitrijs Ledkovs +Forwarded: no +Last-Update: 20120-12-06 + +--- a/tests.py ++++ b/tests.py +@@ -370,6 +370,15 @@ + } + + errors = self.validator.iter_errors(instance, schema) ++ if sys.version_info > (3, 2): ++ all_errors = [(list(e.path), e.validator) for e in errors] ++ self.assertCountEqual(all_errors, ++ [(['baz'], 'enum'), ++ (['baz'], 'maximum'), ++ (['foo'], 'type'), ++ (['bar'], 'minItems')]) ++ return ++ + e1, e2, e3, e4 = sorted_errors(errors) + + self.assertEqual(list(e1.path), ["bar"]) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..d240c672 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-pyhashrandom.patch diff --git a/debian/python-jsonschema.install b/debian/python-jsonschema.install new file mode 100644 index 00000000..948618a8 --- /dev/null +++ b/debian/python-jsonschema.install @@ -0,0 +1,2 @@ +usr/lib/python2*/ + diff --git a/debian/python3-jsonschema.install b/debian/python3-jsonschema.install new file mode 100644 index 00000000..eae3930a --- /dev/null +++ b/debian/python3-jsonschema.install @@ -0,0 +1 @@ +usr/lib/python3/ diff --git a/debian/rules b/debian/rules index 24da8ee6..53482a2e 100755 --- a/debian/rules +++ b/debian/rules @@ -2,14 +2,31 @@ #export DH_VERBOSE=1 +PYTHON3:=$(shell py3versions -r) +py3sdo=set -ex; $(foreach py, $(PYTHON3), $(py) $(1);) + UPSTREAM_GIT = git://github.com/Julian/jsonschema.git include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --with python2 + dh $@ --with python2,python3 override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) nosetests tests.py + nosetests3 tests.py endif + +override_dh_auto_build: + dh_auto_build + $(call py3sdo, setup.py build) + +override_dh_auto_install: + dh_auto_install + $(call py3sdo, setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb) + +override_dh_auto_clean: + dh_auto_clean + rm -rf build + rm -rf *.egg-info __pycache__ -- GitLab From c0fef515571d092f9ae8709a9e8485fc5fc0ecb0 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 11 Jun 2013 14:52:56 +0000 Subject: [PATCH 10/79] Releasing 1.1.0-2 to unstable. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 76034f3f..e010d93a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-jsonschema (1.1.0-2) UNRELEASED; urgency=low +python-jsonschema (1.1.0-2) unstable; urgency=low [ Thomas Goirand ] * Ran wrap-and-sort. -- GitLab From a83cd34f3eb2c345ea8da694feeb0199453f0404 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 11 Jun 2013 14:59:16 +0000 Subject: [PATCH 11/79] Changelog closes #710898 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e010d93a..80ef7e76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ python-jsonschema (1.1.0-2) unstable; urgency=low * Ran wrap-and-sort. [ Dmitrijs Ledkovs ] - * Builds the python3 package. + * Builds the python3 package (Closes: #710898). -- Thomas Goirand Thu, 30 May 2013 14:04:07 +0800 -- GitLab From 0ec83d31679b62ac497b650fa9b209fb29847043 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 24 Jul 2013 15:11:49 +0800 Subject: [PATCH 12/79] Added missing Pre-Depends: dpkg (>= 1.15.6~) for the python3 package. --- debian/changelog | 6 ++++++ debian/control | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 80ef7e76..570fa36a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (1.1.0-3) UNRELEASE; urgency=low + + * Added Pre-Depends dpkg (>= 1.15.6~) missing for the python3 package. + + -- Thomas Goirand Wed, 24 Jul 2013 15:11:14 +0800 + python-jsonschema (1.1.0-2) unstable; urgency=low [ Thomas Goirand ] diff --git a/debian/control b/debian/control index 46ac1e97..1a466b0d 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,7 @@ Description: An(other) implementation of JSON Schema (Draft 3) for Python Package: python3-jsonschema Architecture: all +Pre-Depends: dpkg (>= 1.15.6~) Depends: ${misc:Depends}, ${python3:Depends} Description: An(other) implementation of JSON Schema (Draft 3) for Python 3 JSON Schema is a specification for a JSON-based format for defining -- GitLab From 6f16d38d451bbed1fac8afbe765f7334bfe9d22d Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 9 Sep 2013 15:56:39 +0800 Subject: [PATCH 13/79] Now packaging new upstream release 2.0.0 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 570fa36a..5eacbe54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -python-jsonschema (1.1.0-3) UNRELEASE; urgency=low +python-jsonschema (2.0.0-1) unstable; urgency=low + * New upstream release. * Added Pre-Depends dpkg (>= 1.15.6~) missing for the python3 package. -- Thomas Goirand Wed, 24 Jul 2013 15:11:14 +0800 -- GitLab From b1f276f43281172722876ac67b4ebee43caff598 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 9 Sep 2013 16:02:54 +0800 Subject: [PATCH 14/79] Removes now obsolete debian/patches folder. --- debian/changelog | 1 + debian/patches/fix-pyhashrandom.patch | 23 ----------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 debian/patches/fix-pyhashrandom.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 5eacbe54..0979cacc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-jsonschema (2.0.0-1) unstable; urgency=low * New upstream release. * Added Pre-Depends dpkg (>= 1.15.6~) missing for the python3 package. + * Removes now obsolete debian/patches folder. -- Thomas Goirand Wed, 24 Jul 2013 15:11:14 +0800 diff --git a/debian/patches/fix-pyhashrandom.patch b/debian/patches/fix-pyhashrandom.patch deleted file mode 100644 index 1bd90d53..00000000 --- a/debian/patches/fix-pyhashrandom.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: resolve pyhashrandom test suite failure. -Author: Dmitrijs Ledkovs -Forwarded: no -Last-Update: 20120-12-06 - ---- a/tests.py -+++ b/tests.py -@@ -370,6 +370,15 @@ - } - - errors = self.validator.iter_errors(instance, schema) -+ if sys.version_info > (3, 2): -+ all_errors = [(list(e.path), e.validator) for e in errors] -+ self.assertCountEqual(all_errors, -+ [(['baz'], 'enum'), -+ (['baz'], 'maximum'), -+ (['foo'], 'type'), -+ (['bar'], 'minItems')]) -+ return -+ - e1, e2, e3, e4 = sorted_errors(errors) - - self.assertEqual(list(e1.path), ["bar"]) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index d240c672..00000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-pyhashrandom.patch -- GitLab From 32c585ec80ddf5dfc55dae25361b34aa55854f84 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 9 Sep 2013 16:09:05 +0800 Subject: [PATCH 15/79] Fixes nosetests calls (removes test.py as arg). --- debian/changelog | 1 + debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0979cacc..f55edcc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-jsonschema (2.0.0-1) unstable; urgency=low * New upstream release. * Added Pre-Depends dpkg (>= 1.15.6~) missing for the python3 package. * Removes now obsolete debian/patches folder. + * Fixes nosetests calls (removes test.py as arg). -- Thomas Goirand Wed, 24 Jul 2013 15:11:14 +0800 diff --git a/debian/rules b/debian/rules index 53482a2e..463b49ad 100755 --- a/debian/rules +++ b/debian/rules @@ -14,8 +14,8 @@ include /usr/share/openstack-pkg-tools/pkgos.make override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - nosetests tests.py - nosetests3 tests.py + nosetests + nosetests3 endif override_dh_auto_build: -- GitLab From 2638c80ea28c328e9c19d6b7f6f3507421ca6676 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 26 Sep 2013 17:49:52 +0800 Subject: [PATCH 16/79] Hardcoded python3 depends version to 3.2.3 (and not -3~, since that is a pb with Ubuntu) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 1a466b0d..08f936fd 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Description: An(other) implementation of JSON Schema (Draft 3) for Python Package: python3-jsonschema Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${misc:Depends}, ${python3:Depends} +Depends: ${misc:Depends}, python3 (>= 3.2.3) Description: An(other) implementation of JSON Schema (Draft 3) for Python 3 JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what -- GitLab From e78d71737661e470ede9b710c4add74f249358f9 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sun, 8 Dec 2013 11:39:27 +0800 Subject: [PATCH 17/79] [ Thomas Goirand ] * New upstream release. * Do not depend on openstack-pkg-tools anymore. [ Jean-Baptiste Lallement ] * Add autopkgtest that runs the upstream test suite against the installed package (Closes: #729467) --- debian/changelog | 12 ++++++++++++ debian/control | 6 ++---- debian/rules | 3 +-- debian/tests/control | 2 ++ debian/tests/upstream-py2 | 5 +++++ debian/tests/upstream-py3 | 5 +++++ 6 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 debian/tests/control create mode 100644 debian/tests/upstream-py2 create mode 100644 debian/tests/upstream-py3 diff --git a/debian/changelog b/debian/changelog index f55edcc4..e94b1ef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +python-jsonschema (2.3.0-1) unstable; urgency=low + + [ Thomas Goirand ] + * New upstream release. + * Do not depend on openstack-pkg-tools anymore. + + [ Jean-Baptiste Lallement ] + * Add autopkgtest that runs the upstream test suite against the installed + package (Closes: #729467) + + -- Thomas Goirand Sun, 08 Dec 2013 11:37:07 +0800 + python-jsonschema (2.0.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 08f936fd..3e03fcec 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,10 @@ Source: python-jsonschema Section: python Priority: optional Maintainer: PKG OpenStack -Uploaders: Loic Dachary (OuoU) , - Julien Danjou , +Uploaders: Julien Danjou , Thomas Goirand , - Ghe Rivero , Mehdi Abaakouk Build-Depends: debhelper (>= 9), - openstack-pkg-tools, python-all (>= 2.6.6-3~), python-mock, python-nose, @@ -21,6 +18,7 @@ Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git Homepage: https://github.com/Julian/jsonschema +XS-Testsuite: autopkgtest Package: python-jsonschema Architecture: all diff --git a/debian/rules b/debian/rules index 463b49ad..98389009 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,7 @@ PYTHON3:=$(shell py3versions -r) py3sdo=set -ex; $(foreach py, $(PYTHON3), $(py) $(1);) UPSTREAM_GIT = git://github.com/Julian/jsonschema.git - -include /usr/share/openstack-pkg-tools/pkgos.make +-include /usr/share/openstack-pkg-tools/pkgos.make %: dh $@ --with python2,python3 diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 00000000..574c44b9 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,2 @@ +Tests: upstream-py2 upstream-py3 +Depends: @, python-pytest, python3-pytest diff --git a/debian/tests/upstream-py2 b/debian/tests/upstream-py2 new file mode 100644 index 00000000..ec011e4b --- /dev/null +++ b/debian/tests/upstream-py2 @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +py.test -v -s jsonschema diff --git a/debian/tests/upstream-py3 b/debian/tests/upstream-py3 new file mode 100644 index 00000000..bc2ebf83 --- /dev/null +++ b/debian/tests/upstream-py3 @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +py.test-3 -v -s jsonschema -- GitLab From f61b47b3c7b76995188282bb4b94b622c1ee635b Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sun, 8 Dec 2013 11:43:03 +0800 Subject: [PATCH 18/79] Build-Depends on autopkgtest and python{3,}-pytest. --- debian/changelog | 1 + debian/control | 15 +++++++++------ debian/python-jsonschema.install | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index e94b1ef5..2a3a25a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-jsonschema (2.3.0-1) unstable; urgency=low [ Thomas Goirand ] * New upstream release. * Do not depend on openstack-pkg-tools anymore. + * Build-Depends on autopkgtest and python{3,}-pytest. [ Jean-Baptiste Lallement ] * Add autopkgtest that runs the upstream test suite against the installed diff --git a/debian/control b/debian/control index 3e03fcec..49e5a040 100644 --- a/debian/control +++ b/debian/control @@ -5,15 +5,18 @@ Maintainer: PKG OpenStack Uploaders: Julien Danjou , Thomas Goirand , Mehdi Abaakouk -Build-Depends: debhelper (>= 9), +Build-Depends: autopkgtest, + debhelper (>= 9), python-all (>= 2.6.6-3~), - python-mock, - python-nose, python-setuptools (>= 0.6b3), python3-all, - python3-mock, - python3-nose, python3-setuptools +Build-Depends-Indep: python-mock, + python-nose, + python-pytest, + python3-mock, + python3-nose, + python3-pytest Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git @@ -37,7 +40,7 @@ Description: An(other) implementation of JSON Schema (Draft 3) for Python Package: python3-jsonschema Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${misc:Depends}, python3 (>= 3.2.3) +Depends: python3 (>= 3.2.3), ${misc:Depends} Description: An(other) implementation of JSON Schema (Draft 3) for Python 3 JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what diff --git a/debian/python-jsonschema.install b/debian/python-jsonschema.install index 948618a8..e6cad156 100644 --- a/debian/python-jsonschema.install +++ b/debian/python-jsonschema.install @@ -1,2 +1,2 @@ -usr/lib/python2*/ +usr/lib/python2*/ -- GitLab From 58811ec2878c08285ecc735152b9cbf940368990 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 15 Apr 2015 09:44:27 +0200 Subject: [PATCH 19/79] Now packaging 2.4.0 --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2a3a25a9..67f2b5c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (2.4.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Thomas Goirand Wed, 15 Apr 2015 09:44:16 +0200 + python-jsonschema (2.3.0-1) unstable; urgency=low [ Thomas Goirand ] diff --git a/debian/control b/debian/control index 49e5a040..48f96e87 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends-Indep: python-mock, python3-mock, python3-nose, python3-pytest -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git Homepage: https://github.com/Julian/jsonschema -- GitLab From f1c82aae0ead1273f4e8ef540a0e1e785b70823f Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 15 Apr 2015 09:46:35 +0200 Subject: [PATCH 20/79] Added -v when running nose. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 98389009..cce50955 100755 --- a/debian/rules +++ b/debian/rules @@ -13,8 +13,8 @@ UPSTREAM_GIT = git://github.com/Julian/jsonschema.git override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - nosetests - nosetests3 + nosetests -v + nosetests3 -v endif override_dh_auto_build: -- GitLab From c0e0393a04bf7cba172b38a438d4af31f259207d Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 28 Apr 2015 21:49:11 +0000 Subject: [PATCH 21/79] Uploading to unstable. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 67f2b5c8..dddff123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-jsonschema (2.4.0-1) UNRELEASED; urgency=medium +python-jsonschema (2.4.0-1) unstable; urgency=medium * New upstream release. -- GitLab From 84d8e7ba687d73111dfa4e0904aeeee02fa6ec18 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 29 Jul 2015 23:19:10 +0200 Subject: [PATCH 22/79] Packaging 2.5.1 from debian/experimental branch. --- debian/changelog | 6 ++++++ debian/gbp.conf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dddff123..e98ed9fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (2.5.1-1) experimental; urgency=medium + + * New upstream release. + + -- Thomas Goirand Wed, 29 Jul 2015 23:18:54 +0200 + python-jsonschema (2.4.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/gbp.conf b/debian/gbp.conf index a80d315c..f9f4b788 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,6 @@ [DEFAULT] upstream-branch = master -debian-branch = debian/unstable +debian-branch = debian/experimental upstream-tag = v%(version)s compression = xz -- GitLab From ceec9c81afa8e5d0aff0ae1c8b678156fb7f7c53 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 29 Jul 2015 21:58:31 +0000 Subject: [PATCH 23/79] Usual debian/control clean-up. --- debian/changelog | 1 + debian/control | 11 ++++------- debian/rules | 2 -- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index e98ed9fd..4fb76ef7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-jsonschema (2.5.1-1) experimental; urgency=medium * New upstream release. + * Usual debian/control clean-up. -- Thomas Goirand Wed, 29 Jul 2015 23:18:54 +0200 diff --git a/debian/control b/debian/control index 48f96e87..ebf2a548 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,12 @@ Source: python-jsonschema Section: python Priority: optional Maintainer: PKG OpenStack -Uploaders: Julien Danjou , - Thomas Goirand , - Mehdi Abaakouk +Uploaders: Thomas Goirand Build-Depends: autopkgtest, debhelper (>= 9), - python-all (>= 2.6.6-3~), - python-setuptools (>= 0.6b3), + dh-python, + python-all, + python-setuptools, python3-all, python3-setuptools Build-Depends-Indep: python-mock, @@ -25,7 +24,6 @@ XS-Testsuite: autopkgtest Package: python-jsonschema Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) Depends: python-mock, ${misc:Depends}, ${python:Depends} Description: An(other) implementation of JSON Schema (Draft 3) for Python JSON Schema is a specification for a JSON-based format for defining @@ -39,7 +37,6 @@ Description: An(other) implementation of JSON Schema (Draft 3) for Python Package: python3-jsonschema Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) Depends: python3 (>= 3.2.3), ${misc:Depends} Description: An(other) implementation of JSON Schema (Draft 3) for Python 3 JSON Schema is a specification for a JSON-based format for defining diff --git a/debian/rules b/debian/rules index cce50955..55bc8d47 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 - PYTHON3:=$(shell py3versions -r) py3sdo=set -ex; $(foreach py, $(PYTHON3), $(py) $(1);) -- GitLab From 0ce3ed3830d1872a907fd9bc646f61fe28465506 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 29 Jul 2015 21:58:56 +0000 Subject: [PATCH 24/79] Fixed gpb.conf --- debian/gbp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index f9f4b788..2835ee5a 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -4,5 +4,5 @@ debian-branch = debian/experimental upstream-tag = v%(version)s compression = xz -[git-buildpackage] +[buildpackage] export-dir = ../build-area/ -- GitLab From cb1b8afa54d17e74fa57b5c786056fb6895ecf6a Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 29 Jul 2015 22:07:56 +0000 Subject: [PATCH 25/79] Added python{3,}-vcversioner as build-depends. --- debian/changelog | 1 + debian/control | 14 +++++++++----- debian/python-jsonschema.install | 1 - 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4fb76ef7..f4ae0beb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-jsonschema (2.5.1-1) experimental; urgency=medium * New upstream release. * Usual debian/control clean-up. + * Added python{3,}-vcversioner as build-depends. -- Thomas Goirand Wed, 29 Jul 2015 23:18:54 +0200 diff --git a/debian/control b/debian/control index ebf2a548..eacbafc3 100644 --- a/debian/control +++ b/debian/control @@ -2,20 +2,21 @@ Source: python-jsonschema Section: python Priority: optional Maintainer: PKG OpenStack -Uploaders: Thomas Goirand +Uploaders: Thomas Goirand , Build-Depends: autopkgtest, debhelper (>= 9), dh-python, python-all, python-setuptools, + python-vcversioner, python3-all, - python3-setuptools + python3-setuptools, Build-Depends-Indep: python-mock, python-nose, python-pytest, python3-mock, python3-nose, - python3-pytest + python3-pytest, Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git @@ -24,7 +25,9 @@ XS-Testsuite: autopkgtest Package: python-jsonschema Architecture: all -Depends: python-mock, ${misc:Depends}, ${python:Depends} +Depends: python-mock, + ${misc:Depends}, + ${python:Depends}, Description: An(other) implementation of JSON Schema (Draft 3) for Python JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what @@ -37,7 +40,8 @@ Description: An(other) implementation of JSON Schema (Draft 3) for Python Package: python3-jsonschema Architecture: all -Depends: python3 (>= 3.2.3), ${misc:Depends} +Depends: python3 (>= 3.2.3), + ${misc:Depends}, Description: An(other) implementation of JSON Schema (Draft 3) for Python 3 JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what diff --git a/debian/python-jsonschema.install b/debian/python-jsonschema.install index e6cad156..4c0c522c 100644 --- a/debian/python-jsonschema.install +++ b/debian/python-jsonschema.install @@ -1,2 +1 @@ - usr/lib/python2*/ -- GitLab From f8f0911fea33af7daff43ea9a8a82c24a6a6e661 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 29 Jul 2015 22:15:56 +0000 Subject: [PATCH 26/79] * Creates version.txt on build, clean it on clean. * Do not delete *egg-info on clean, use debian/source/options instead. --- debian/changelog | 2 ++ debian/rules | 8 ++++++-- debian/source/options | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 debian/source/options diff --git a/debian/changelog b/debian/changelog index f4ae0beb..9d7e2de1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ python-jsonschema (2.5.1-1) experimental; urgency=medium * New upstream release. * Usual debian/control clean-up. * Added python{3,}-vcversioner as build-depends. + * Creates version.txt on build, clean it on clean. + * Do not delete *egg-info on clean, use debian/source/options instead. -- Thomas Goirand Wed, 29 Jul 2015 23:18:54 +0200 diff --git a/debian/rules b/debian/rules index 55bc8d47..8e540fba 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/') + PYTHON3:=$(shell py3versions -r) py3sdo=set -ex; $(foreach py, $(PYTHON3), $(py) $(1);) @@ -16,6 +18,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) endif override_dh_auto_build: + echo $$PACKAGE_VERSION | sed s/\\./-/g >version.txt dh_auto_build $(call py3sdo, setup.py build) @@ -24,6 +27,7 @@ override_dh_auto_install: $(call py3sdo, setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb) override_dh_auto_clean: + echo $$PACKAGE_VERSION | sed s/\\./-/g >version.txt dh_auto_clean - rm -rf build - rm -rf *.egg-info __pycache__ + rm -rf build version.txt jsonschema/_version.py + rm -rf __pycache__ diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 00000000..cb61fa52 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore = "^[^/]*[.]egg-info/" -- GitLab From 90ff18b27187ad9b2a813dc07f94c1ce2eef14f5 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 29 Jul 2015 22:54:07 +0000 Subject: [PATCH 27/79] Removed XS-Test-Suite in debian/control. --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9d7e2de1..e2c45715 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ python-jsonschema (2.5.1-1) experimental; urgency=medium * Added python{3,}-vcversioner as build-depends. * Creates version.txt on build, clean it on clean. * Do not delete *egg-info on clean, use debian/source/options instead. + * Removed XS-Test-Suite in debian/control. -- Thomas Goirand Wed, 29 Jul 2015 23:18:54 +0200 diff --git a/debian/control b/debian/control index eacbafc3..0a699e22 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,6 @@ Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git Homepage: https://github.com/Julian/jsonschema -XS-Testsuite: autopkgtest Package: python-jsonschema Architecture: all -- GitLab From 8d5285bde2e8a27031f064a8b099f62130701ec9 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 29 Jul 2015 22:56:21 +0000 Subject: [PATCH 28/79] Added python-functools32 as build-depends. --- debian/changelog | 1 + debian/control | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e2c45715..32be60a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ python-jsonschema (2.5.1-1) experimental; urgency=medium * Creates version.txt on build, clean it on clean. * Do not delete *egg-info on clean, use debian/source/options instead. * Removed XS-Test-Suite in debian/control. + * Added python-functools32 as build-depends. -- Thomas Goirand Wed, 29 Jul 2015 23:18:54 +0200 diff --git a/debian/control b/debian/control index 0a699e22..ec3af16e 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,8 @@ Build-Depends: autopkgtest, python-vcversioner, python3-all, python3-setuptools, -Build-Depends-Indep: python-mock, +Build-Depends-Indep: python-functools32, + python-mock, python-nose, python-pytest, python3-mock, @@ -24,7 +25,8 @@ Homepage: https://github.com/Julian/jsonschema Package: python-jsonschema Architecture: all -Depends: python-mock, +Depends: python-functools32, + python-mock, ${misc:Depends}, ${python:Depends}, Description: An(other) implementation of JSON Schema (Draft 3) for Python -- GitLab From a08ae7479ce08f823aa5ffb4f90bbe30b33864bb Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 17 Sep 2015 09:25:24 +0200 Subject: [PATCH 29/79] Fixed http{s,}_proxy during dh_auto_clean to avoid PyPi downloads. --- debian/changelog | 6 ++++++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 32be60a7..91300a0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (2.5.1-2) experimental; urgency=medium + + * Fixed http{s,}_proxy during dh_auto_clean to avoid PyPi downloads. + + -- Thomas Goirand Thu, 17 Sep 2015 09:25:38 +0200 + python-jsonschema (2.5.1-1) experimental; urgency=medium * New upstream release. diff --git a/debian/rules b/debian/rules index 8e540fba..d60d09e1 100755 --- a/debian/rules +++ b/debian/rules @@ -28,6 +28,6 @@ override_dh_auto_install: override_dh_auto_clean: echo $$PACKAGE_VERSION | sed s/\\./-/g >version.txt - dh_auto_clean + http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 dh_auto_clean rm -rf build version.txt jsonschema/_version.py rm -rf __pycache__ -- GitLab From bf475d6bd5a8696fe34e121077016be8d11bcd89 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 17 Sep 2015 09:28:14 +0200 Subject: [PATCH 30/79] Added python{3,}-vcversioner as build-depends-indep. --- debian/changelog | 1 + debian/control | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 91300a0f..47f4bf4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-jsonschema (2.5.1-2) experimental; urgency=medium * Fixed http{s,}_proxy during dh_auto_clean to avoid PyPi downloads. + * Added python{3,}-vcversioner as build-depends-indep. -- Thomas Goirand Thu, 17 Sep 2015 09:25:38 +0200 diff --git a/debian/control b/debian/control index ec3af16e..1297b295 100644 --- a/debian/control +++ b/debian/control @@ -15,9 +15,11 @@ Build-Depends-Indep: python-functools32, python-mock, python-nose, python-pytest, + python-vcversioner, python3-mock, python3-nose, python3-pytest, + python3-vcversioner, Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git -- GitLab From a27f77e676cd1abeb8322595273b7648043d9695 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 17 Sep 2015 09:30:02 +0200 Subject: [PATCH 31/79] Do not do dh_auto_clean at all. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d60d09e1..76d8b615 100755 --- a/debian/rules +++ b/debian/rules @@ -28,6 +28,6 @@ override_dh_auto_install: override_dh_auto_clean: echo $$PACKAGE_VERSION | sed s/\\./-/g >version.txt - http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 dh_auto_clean + #http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 dh_auto_clean rm -rf build version.txt jsonschema/_version.py rm -rf __pycache__ -- GitLab From e8c7c9f059a2e3aa301cf9bbdae90da2d33e5325 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 9 Oct 2015 12:05:44 +0000 Subject: [PATCH 32/79] Fixed pacakge version parsing to be compatible with Ubuntu Trusty. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 47f4bf4b..54adfc46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ python-jsonschema (2.5.1-2) experimental; urgency=medium + * Fixed pacakge version parsing to be compatible with Ubuntu Trusty. * Fixed http{s,}_proxy during dh_auto_clean to avoid PyPi downloads. * Added python{3,}-vcversioner as build-depends-indep. diff --git a/debian/rules b/debian/rules index 76d8b615..7269714a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/') +export PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1) PYTHON3:=$(shell py3versions -r) py3sdo=set -ex; $(foreach py, $(PYTHON3), $(py) $(1);) -- GitLab From 0c4e9b892a892f6051d014eb33b1586b347c76e2 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 9 Oct 2015 12:14:44 +0000 Subject: [PATCH 33/79] Fixed dh_auto_install. --- debian/python-jsonschema.install | 1 - debian/python3-jsonschema.install | 1 - debian/rules | 14 ++++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 debian/python-jsonschema.install delete mode 100644 debian/python3-jsonschema.install diff --git a/debian/python-jsonschema.install b/debian/python-jsonschema.install deleted file mode 100644 index 4c0c522c..00000000 --- a/debian/python-jsonschema.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2*/ diff --git a/debian/python3-jsonschema.install b/debian/python3-jsonschema.install deleted file mode 100644 index eae3930a..00000000 --- a/debian/python3-jsonschema.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python3/ diff --git a/debian/rules b/debian/rules index 7269714a..d9e2ba1c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,8 @@ #!/usr/bin/make -f +PYTHONS:=$(shell pyversions -vr) +PYTHON3S:=$(shell py3versions -vr) + export PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1) PYTHON3:=$(shell py3versions -r) @@ -23,8 +26,15 @@ override_dh_auto_build: $(call py3sdo, setup.py build) override_dh_auto_install: - dh_auto_install - $(call py3sdo, setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb) + set -e ; for pyvers in $(PYTHONS); do \ + python$$pyvers setup.py install --install-layout=deb \ + --root $(CURDIR)/debian/python-jsonschema; \ + done + set -e ; for pyvers in $(PYTHON3S); do \ + python$$pyvers setup.py install --install-layout=deb \ + --root $(CURDIR)/debian/python3-jsonschema; \ + done + rm -f $(CURDIR)/debian/python*/usr/lib/python*/dist-packages/*.pth override_dh_auto_clean: echo $$PACKAGE_VERSION | sed s/\\./-/g >version.txt -- GitLab From 274c406ca5477168639c8c7e09b9fe52e7126133 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 9 Oct 2015 12:58:02 +0000 Subject: [PATCH 34/79] Fixup version stuff. --- debian/patches/fixup-version.patch | 32 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fixup-version.patch create mode 100644 debian/patches/series diff --git a/debian/patches/fixup-version.patch b/debian/patches/fixup-version.patch new file mode 100644 index 00000000..a2bf227a --- /dev/null +++ b/debian/patches/fixup-version.patch @@ -0,0 +1,32 @@ +Description: Fixup vcversion cruft + vcversion looks stupid to me. Putting a semver version in version.txt just + didn't work for me. So I'm being even more stupid and hardcoding the version + in setup.py. If someone knows a better way to fix it, let me know. +Author: Thomas Goirand +Forwarded: no +Last-Update: 2015-10-09 + +--- /dev/null ++++ python-jsonschema-2.5.1/jsonschema/_version.py +@@ -0,0 +1,5 @@ ++ ++# This file is automatically generated by setup.py. ++__version__ = '2.5.1' ++__sha__ = '1\n' ++__revision__ = '1\n' +--- python-jsonschema-2.5.1.orig/setup.py ++++ python-jsonschema-2.5.1/setup.py +@@ -29,6 +29,7 @@ extras_require = { + + setup( + name="jsonschema", ++ version="2.5.1", + packages=["jsonschema", "jsonschema.tests"], + package_data={"jsonschema": ["schemas/*.json"]}, + setup_requires=["vcversioner"], +@@ -41,5 +42,4 @@ setup( + long_description=long_description, + url="http://github.com/Julian/jsonschema", + entry_points={"console_scripts": ["jsonschema = jsonschema.cli:main"]}, +- vcversioner={"version_module_paths" : ["jsonschema/_version.py"]}, + ) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..b426fda9 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fixup-version.patch diff --git a/debian/rules b/debian/rules index d9e2ba1c..79cad761 100755 --- a/debian/rules +++ b/debian/rules @@ -39,5 +39,5 @@ override_dh_auto_install: override_dh_auto_clean: echo $$PACKAGE_VERSION | sed s/\\./-/g >version.txt #http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 dh_auto_clean - rm -rf build version.txt jsonschema/_version.py + rm -rf build version.txt rm -rf __pycache__ -- GitLab From e0d730da3b7496e5664cfa86250d04b710d66271 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 9 Oct 2015 13:04:35 +0000 Subject: [PATCH 35/79] Using update-alternatives to provide /usr/bin/jsonschema. --- debian/changelog | 1 + debian/python-jsonschema.postinst | 11 +++++++++++ debian/python-jsonschema.postrm | 11 +++++++++++ debian/python-jsonschema.prerm | 11 +++++++++++ debian/python3-jsonschema.postinst | 11 +++++++++++ debian/python3-jsonschema.postrm | 11 +++++++++++ debian/python3-jsonschema.prerm | 11 +++++++++++ debian/rules | 2 ++ 8 files changed, 69 insertions(+) create mode 100644 debian/python-jsonschema.postinst create mode 100644 debian/python-jsonschema.postrm create mode 100644 debian/python-jsonschema.prerm create mode 100644 debian/python3-jsonschema.postinst create mode 100644 debian/python3-jsonschema.postrm create mode 100644 debian/python3-jsonschema.prerm diff --git a/debian/changelog b/debian/changelog index 54adfc46..1efd70bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-jsonschema (2.5.1-2) experimental; urgency=medium * Fixed pacakge version parsing to be compatible with Ubuntu Trusty. * Fixed http{s,}_proxy during dh_auto_clean to avoid PyPi downloads. * Added python{3,}-vcversioner as build-depends-indep. + * Using update-alternatives to provide /usr/bin/jsonschema. -- Thomas Goirand Thu, 17 Sep 2015 09:25:38 +0200 diff --git a/debian/python-jsonschema.postinst b/debian/python-jsonschema.postinst new file mode 100644 index 00000000..6d3827c7 --- /dev/null +++ b/debian/python-jsonschema.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] ; then + update-alternatives --install /usr/bin/jsonschema jsonschema /usr/bin/python2-jsonschema 300 +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/python-jsonschema.postrm b/debian/python-jsonschema.postrm new file mode 100644 index 00000000..6aacfa1e --- /dev/null +++ b/debian/python-jsonschema.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then + update-alternatives --remove jsonschema /usr/bin/python2-jsonschema +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/python-jsonschema.prerm b/debian/python-jsonschema.prerm new file mode 100644 index 00000000..423c2303 --- /dev/null +++ b/debian/python-jsonschema.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ] ; then + update-alternatives --remove jsonschema /usr/bin/python2-jsonschema +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/python3-jsonschema.postinst b/debian/python3-jsonschema.postinst new file mode 100644 index 00000000..5cc4606a --- /dev/null +++ b/debian/python3-jsonschema.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] ; then + update-alternatives --install /usr/bin/jsonschema jsonschema /usr/bin/python3-jsonschema 200 +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/python3-jsonschema.postrm b/debian/python3-jsonschema.postrm new file mode 100644 index 00000000..35af9ca7 --- /dev/null +++ b/debian/python3-jsonschema.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then + update-alternatives --remove jsonschema /usr/bin/python3-jsonschema +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/python3-jsonschema.prerm b/debian/python3-jsonschema.prerm new file mode 100644 index 00000000..7271bf0d --- /dev/null +++ b/debian/python3-jsonschema.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ] ; then + update-alternatives --remove jsonschema /usr/bin/python3-jsonschema +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index 79cad761..a6ecef1b 100755 --- a/debian/rules +++ b/debian/rules @@ -35,6 +35,8 @@ override_dh_auto_install: --root $(CURDIR)/debian/python3-jsonschema; \ done rm -f $(CURDIR)/debian/python*/usr/lib/python*/dist-packages/*.pth + mv $(CURDIR)/debian/python-jsonschema/usr/bin/jsonschema $(CURDIR)/debian/python-jsonschema/usr/bin/python2-jsonschema + mv $(CURDIR)/debian/python3-jsonschema/usr/bin/jsonschema $(CURDIR)/debian/python3-jsonschema/usr/bin/python3-jsonschema override_dh_auto_clean: echo $$PACKAGE_VERSION | sed s/\\./-/g >version.txt -- GitLab From 1ece432ff3fd5c3169b7d436b2c7c00cd8aab260 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 9 Oct 2015 13:06:35 +0000 Subject: [PATCH 36/79] Fixed missing ${python3:Depends}. --- debian/changelog | 1 + debian/control | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1efd70bd..81e2dbb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ python-jsonschema (2.5.1-2) experimental; urgency=medium * Fixed http{s,}_proxy during dh_auto_clean to avoid PyPi downloads. * Added python{3,}-vcversioner as build-depends-indep. * Using update-alternatives to provide /usr/bin/jsonschema. + * Fixed missing ${python3:Depends}. -- Thomas Goirand Thu, 17 Sep 2015 09:25:38 +0200 diff --git a/debian/control b/debian/control index 1297b295..a61ce510 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Depends: python-functools32, python-mock, ${misc:Depends}, ${python:Depends}, -Description: An(other) implementation of JSON Schema (Draft 3) for Python +Description: An(other) implementation of JSON Schema (Draft 3) - Python 2.7 JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what JSON data is required for a given application and how it can be @@ -39,13 +39,14 @@ Description: An(other) implementation of JSON Schema (Draft 3) for Python intended to provide validation, documentation, and interaction control of JSON data. . - This package contains the Python 2.x module. + This package contains the Python 2.7 module. Package: python3-jsonschema Architecture: all Depends: python3 (>= 3.2.3), ${misc:Depends}, -Description: An(other) implementation of JSON Schema (Draft 3) for Python 3 + ${python3:Depends}, +Description: An(other) implementation of JSON Schema (Draft 3) - Python 3.x JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what JSON data is required for a given application and how it can be -- GitLab From 55045dabbb8f393996daa8b851ab28e9759da1ef Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 9 Oct 2015 13:13:49 +0000 Subject: [PATCH 37/79] Fixup double defined python-vcversioner build-depends. --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index a61ce510..148f120c 100644 --- a/debian/control +++ b/debian/control @@ -11,15 +11,14 @@ Build-Depends: autopkgtest, python-vcversioner, python3-all, python3-setuptools, + python3-vcversioner, Build-Depends-Indep: python-functools32, python-mock, python-nose, python-pytest, - python-vcversioner, python3-mock, python3-nose, python3-pytest, - python3-vcversioner, Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git -- GitLab From d9e5ae8c5f64ef7c0703a92dbcfb24e08da1df28 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 16 Oct 2015 10:02:26 +0000 Subject: [PATCH 38/79] Uploading to unstable. --- debian/changelog | 6 ++++++ debian/gbp.conf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 81e2dbb1..5ee98502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (2.5.1-3) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Fri, 16 Oct 2015 10:02:14 +0000 + python-jsonschema (2.5.1-2) experimental; urgency=medium * Fixed pacakge version parsing to be compatible with Ubuntu Trusty. diff --git a/debian/gbp.conf b/debian/gbp.conf index 2835ee5a..48bd2b27 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,6 @@ [DEFAULT] upstream-branch = master -debian-branch = debian/experimental +debian-branch = debian/unstable upstream-tag = v%(version)s compression = xz -- GitLab From bc51223892c628a2b8e88b96abbea3643ad591f4 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 23 Oct 2015 22:41:15 +0000 Subject: [PATCH 39/79] override_dh_python3 to fix Py3 shebang. --- debian/changelog | 6 ++++++ debian/rules | 3 +++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5ee98502..1462c58d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (2.5.1-4) unstable; urgency=medium + + * override_dh_python3 to fix Py3 shebang. + + -- Thomas Goirand Fri, 23 Oct 2015 22:40:58 +0000 + python-jsonschema (2.5.1-3) unstable; urgency=medium * Uploading to unstable. diff --git a/debian/rules b/debian/rules index a6ecef1b..498a4e9a 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,9 @@ override_dh_auto_install: mv $(CURDIR)/debian/python-jsonschema/usr/bin/jsonschema $(CURDIR)/debian/python-jsonschema/usr/bin/python2-jsonschema mv $(CURDIR)/debian/python3-jsonschema/usr/bin/jsonschema $(CURDIR)/debian/python3-jsonschema/usr/bin/python3-jsonschema +override_dh_python3: + dh_python3 --shebang=/usr/bin/python3 + override_dh_auto_clean: echo $$PACKAGE_VERSION | sed s/\\./-/g >version.txt #http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 dh_auto_clean -- GitLab From 10768a5832f4bb8d72f2033e9c44e2e45d70bbb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Mon, 29 Feb 2016 11:35:22 +0100 Subject: [PATCH 40/79] Fixed VCS URLs (https). --- debian/changelog | 6 ++++++ debian/control | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1462c58d..e5e3edd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (2.5.1-5) UNRELEASED; urgency=medium + + * Fixed VCS URLs (https). + + -- Ondřej Nový Mon, 29 Feb 2016 11:35:07 +0100 + python-jsonschema (2.5.1-4) unstable; urgency=medium * override_dh_python3 to fix Py3 shebang. diff --git a/debian/control b/debian/control index 148f120c..5d87b247 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,8 @@ Build-Depends-Indep: python-functools32, python3-nose, python3-pytest, Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-jsonschema.git -Vcs-Git: git://anonscm.debian.org/openstack/python-jsonschema.git +Vcs-Git: https://anonscm.debian.org/git/openstack/python-jsonschema.git +Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-jsonschema.git/ Homepage: https://github.com/Julian/jsonschema Package: python-jsonschema -- GitLab From 06296bee967145420466489fc7fec8f7f52d9706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Thu, 19 May 2016 14:27:39 +0200 Subject: [PATCH 41/79] Mention Draft 4 support in package description (Closes: #816711) --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e5e3edd1..b8cb61b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-jsonschema (2.5.1-5) UNRELEASED; urgency=medium * Fixed VCS URLs (https). + * Mention Draft 4 support in package description (Closes: #816711) -- Ondřej Nový Mon, 29 Feb 2016 11:35:07 +0100 diff --git a/debian/control b/debian/control index 5d87b247..7fa55ef2 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Depends: python-functools32, python-mock, ${misc:Depends}, ${python:Depends}, -Description: An(other) implementation of JSON Schema (Draft 3) - Python 2.7 +Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 2.7 JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what JSON data is required for a given application and how it can be @@ -45,7 +45,7 @@ Architecture: all Depends: python3 (>= 3.2.3), ${misc:Depends}, ${python3:Depends}, -Description: An(other) implementation of JSON Schema (Draft 3) - Python 3.x +Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 3.x JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what JSON data is required for a given application and how it can be -- GitLab From d258e917cb060b94081d590ae0020fc7dd05e60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Thu, 19 May 2016 19:20:30 +0200 Subject: [PATCH 42/79] Removed d/CHANGELOG, upstream provides own changelog now --- debian/CHANGELOG | 1931 ---------------------------------------------- debian/changelog | 1 + 2 files changed, 1 insertion(+), 1931 deletions(-) delete mode 100644 debian/CHANGELOG diff --git a/debian/CHANGELOG b/debian/CHANGELOG deleted file mode 100644 index 6aa33193..00000000 --- a/debian/CHANGELOG +++ /dev/null @@ -1,1931 +0,0 @@ -commit 3a158e4e4d1df62ce9a553ff3bd6a564c686b0f6 -Author: Julian Berman -Date: Sun Jan 13 23:33:08 2013 -0500 - - Release 0.8.0 - -commit e10247e6b6b5bacb7f7366c226b29f085862780b -Author: Julian Berman -Date: Sun Jan 13 23:29:40 2013 -0500 - - ...to the right one - -commit e392c6ce49fd3025114a6c9a2f41fede0ece38f9 -Author: Julian Berman -Date: Sun Jan 13 23:28:45 2013 -0500 - - Update link - -commit fc4ff2105a9199a4784f1c72a4ab66513243270b -Author: Julian Berman -Date: Sun Jan 13 23:27:38 2013 -0500 - - Update readme and changelog - -commit b06b6a8f35473fe30811ade863887f16f219b44f -Author: Julian Berman -Date: Sun Jan 13 23:19:29 2013 -0500 - - Cleanup 123 - -commit 2e3550b7223aa6aa48290c64355740738972606b -Author: Julian Berman -Date: Sun Jan 13 23:11:34 2013 -0500 - - C o m p r ess - -commit 9c7e5c6d870a8da438bf65025d74162a0d1c738f -Author: Julian Berman -Date: Sun Jan 13 23:02:33 2013 -0500 - - Not meant to be doctested. - -commit 95c25330d67cb2ca9d7b86547d0d50250b5ac083 -Author: Julian Berman -Date: Sun Jan 13 22:52:21 2013 -0500 - - Finish additional types section. - -commit 31acb8f9a1336b6748ebebade0937f60761fd810 -Author: Julian Berman -Date: Sun Jan 13 21:52:07 2013 -0500 - - Finish IValidator - -commit 2cc1e91327036f90ec3d68678ce4ab8da6eb35a2 -Author: Julian Berman -Date: Sun Jan 13 20:10:43 2013 -0500 - - More docs. Start documenting IValidator. - -commit 1c39393e0e6685c4ce6707b617e1bfd55852393a -Author: Julian Berman -Date: Sun Jan 13 19:23:35 2013 -0500 - - More tiny cleanups in docstrings and such. - -commit 08c289ec7c0697f59eca65952d8d31418e7d3d6e -Author: Julian Berman -Date: Sat Jan 12 23:20:30 2013 -0500 - - Autofind version - -commit ef3d0134d12fd94004e655274394a69b8d0f161f -Author: Julian Berman -Date: Sat Jan 12 23:15:29 2013 -0500 - - validator -> validates - -commit 1b1f747c368207c3f1f93d1f783dc7cbe3ab5de3 -Author: Julian Berman -Date: Sat Jan 12 23:15:22 2013 -0500 - - Sphinx doctest - -commit 7e29d364811a3bf714f2ae39a9cdee380f1b32c0 -Author: Julian Berman -Date: Sat Jan 12 23:14:18 2013 -0500 - - Rename folder - -commit 69025fda786e6d0a4af2c224153c88e10292b666 -Author: Julian Berman -Date: Sat Jan 12 22:32:18 2013 -0500 - - More docstring updates - -commit cbeec6b8c562c35d1e6bd78e6d2b9d679bff0040 -Author: Julian Berman -Date: Sun Dec 30 14:46:02 2012 -0500 - - Add some arg types to docstrings - -commit f571a54f7319b535f40dc50d42e26900e625a238 -Author: Julian Berman -Date: Sat Dec 29 23:55:57 2012 -0500 - - Fixed any to accept any type, including unknown ones. - - Closes #47 - -commit 59cfa1922986203318d4a81ddee7e7568b619f96 -Author: Julian Berman -Date: Sat Dec 29 21:39:27 2012 -0500 - - Semantic versioning + release 0.8.0-b1 - -commit 8f66819ed3a18e8e8e4f1986e5901d42eb144f59 -Author: Julian Berman -Date: Sat Dec 29 20:50:57 2012 -0500 - - Revamp RefResolver. - - Now properly should resolve both local and remote uris and fragments within - them. - -commit 2b48e71dc2fd9abc70e4c068ead4139a044f33a8 -Author: Julian Berman -Date: Thu Dec 27 09:35:34 2012 -0500 - - Ignore non-objects in patternProperties. - - Closes #49 - -commit dbb71ca0f511e963dfc62ad53313cd1d1e4c96b9 -Author: Julian Berman -Date: Thu Dec 27 09:34:41 2012 -0500 - - Update suite - -commit dcc4e55c4ca25d9edd352a93a4a97df9128d846f -Author: Julian Berman -Date: Mon Dec 24 19:54:31 2012 -0500 - - Remove duplication. - -commit c41787bf3897ae903c4d1fa03d7b94f65e445552 -Author: Julian Berman -Date: Mon Dec 24 19:53:41 2012 -0500 - - OK, let's see if this worked. Updated test suite. - - Squashed commit of the following: - - commit b255d27aeca09583415fca8616e68eeaa2fd3eeb - Author: Julian Berman - Date: Mon Dec 24 19:41:09 2012 -0500 - - Add tests for ignoring irrelevant types. - - commit 71a0d30e0cafce6876f23ab6cf25365d1244e0cd - Merge: 2262a91 082e844 - Author: Julian Berman - Date: Sun Dec 23 21:14:38 2012 -0500 - - Tag version 1.0.0. - - Closes #13 - - commit 082e8440ccbf29181b8ba6f440d89f4723b841df - Author: Julian Berman - Date: Sun Dec 23 00:28:48 2012 -0500 - - Cleanup - - * Make errors in the tests be failures - * Removed use of ErrorTree - * Added another helper fn - * Use fnmatch instead of glob - - commit e39d53703cbf4047b4fcd864dc55ad412c4c9d1d - Author: Julian Berman - Date: Fri Dec 21 14:52:16 2012 -0500 - - Added tests differentiating between lexical and mathematical integers. - - Integer literals should be considered integers, while mathematical integers can - be specified with divisibleBy. - - See: https://github.com/json-schema/json-schema/issues/27 - - Closes #2 - - commit 44540b712d330625379ab3a85fa33aca044b29cd - Author: Julian Berman - Date: Fri Dec 21 14:47:26 2012 -0500 - - Added name to license. - - commit 646a9810aa69ca3a1fd14dc4282d4191cc222436 - Author: Julian Berman - Date: Fri Dec 21 14:31:47 2012 -0500 - - Add a test for BigNum integers. - - Closes #12 - - commit d22c24ea996491f839f5f5c8447ad30f2087eebb - Merge: e8bcd5a c0dbbb5 - Author: Julian Berman - Date: Wed Dec 19 10:57:03 2012 -0800 - - Merge pull request #17 from gazpachoking/validate_suite_content - - Add sanity checks for actual format of test suites - - commit c0dbbb5320d33763b186ff40aa0292c6170588ef - Author: Chase Sterling - Date: Wed Dec 19 10:53:57 2012 -0500 - - Add back executable bit to suite_sanity_check - - commit 86f348605b35b9777691a0498f720c9dba2fb500 - Author: Chase Sterling - Date: Wed Dec 19 00:49:20 2012 -0500 - - Add sanity check to validate all suites against suite schema. - Make sure optional test suites don't skip the sanity checks. - - commit e8bcd5a1f064eadd4acf4be16bf92412f9fd0e54 - Author: Nick Lombard - Date: Wed Dec 19 06:38:00 2012 +0200 - - Update README.md - - Travis status for develop branch - - commit ca8f1071db80ce5f256927d3cad8af8404c768b9 - Author: Nick Lombard - Date: Wed Dec 19 06:36:03 2012 +0200 - - Update README.md - - Added travis status image - - commit cf4597e140d1f713f9f7f34c2cb03da869a3224e - Author: Julian Berman - Date: Tue Dec 18 23:27:13 2012 -0500 - - Minor formatting (and get travis to build) - - commit 5cb630c9ee5c8eecb06332d65f784538e451bc31 - Author: Julian Berman - Date: Tue Dec 18 23:12:42 2012 -0500 - - Show number of tests found - - commit 7baea07ecbb64edf7bd4dab6f11139672298d3fd - Author: Julian Berman - Date: Tue Dec 18 23:11:33 2012 -0500 - - Travis - - commit 2f320bb1c0e7514e7e03fe6049413c974fc844ec - Author: Julian Berman - Date: Tue Dec 18 23:07:23 2012 -0500 - - Add sanity checker. - - commit 2262a9141c1f147c237adbeea540f66018349c5f - Merge: 9cda89e a1ec588 - Author: Julian Berman - Date: Tue Dec 18 13:22:23 2012 -0800 - - Merge pull request #15 from tdegrunt/patch-1 - - Update README.md - - commit a1ec58862c20ea4c98d5c6a26024e83145453b03 - Author: Tom de Grunt - Date: Tue Dec 18 22:10:48 2012 +0100 - - Update README.md - - Added node.js module jsonschema. - - commit 9cda89ee01a4cc9e86a215b3b9ff0468b59714a0 - Author: Julian Berman - Date: Tue Dec 18 14:35:19 2012 -0500 - - Update README.md - - commit b22d795b9863d02e9fd4891ffde153ad41c4f1cb - Author: Julian Berman - Date: Sat Nov 17 19:26:21 2012 -0500 - - Ignore TODO - - commit 330fd4864fa55b3b6bed8287cf3bdcbc2c639798 - Author: Julian Berman - Date: Sat Nov 17 19:25:27 2012 -0500 - - Merge into properties tests. - - commit c7c2338380efebf6b89c9b81552962736fcf0b84 - Author: Julian Berman - Date: Sat Nov 17 19:20:25 2012 -0500 - - Remove duplicate tests. - - commit 281c28be60f87fe231815b8faebc1e6169233be5 - Merge: 6f55ff5 6c28d7c - Author: Julian Berman - Date: Sat Nov 17 19:14:19 2012 -0500 - - Merge git://github.com/IreneKnapp/JSON-Schema-Test-Suite - - commit 6c28d7cb5fce73dd2cea792c151bb002501aa6ed - Author: Irene Knapp - Date: Fri Nov 16 08:33:30 2012 -0500 - - Fix a test that should actually be invalid. Remove some unnecessary tests. - - commit b7858cc3584ce8a8886a7edde3866f9776505b6f - Author: Irene Knapp - Date: Thu Nov 15 22:48:09 2012 -0500 - - Port over the rest of the stuff from jsonschema (the Python project). - - commit fa666236d2d4386ff3f17589d3f5f9416f3280df - Author: Irene Knapp - Date: Thu Nov 15 16:37:56 2012 -0500 - - Port roughly the first third of jsonschema (the Python project)'s tests.py. - - commit 6f55ff5138a561999df5b8ee27324856466eca6e - Author: Julian Berman - Date: Thu Nov 15 14:46:48 2012 -0500 - - Add the haskell thing that was using us. - - commit 756c8257ca5a9e4de08a27f716844d24ee99432f - Merge: d735a8a 459dd98 - Author: Julian Berman - Date: Thu Nov 15 11:44:08 2012 -0800 - - Merge pull request #6 from IreneKnapp/master - - Add direct-schema to list of clients - - commit 459dd98563fbeb840ce8202a1ce72a24199a87c7 - Author: Irene Knapp - Date: Thu Nov 15 14:40:41 2012 -0500 - - Adding direct-schema to list of clients. - - commit d735a8a9de59e1ed7e0bf660b7aba0925c0f1cfa - Author: Julian Berman - Date: Thu Nov 15 09:37:03 2012 -0500 - - Add call to action. - - commit ca78ea844e6ca0d4d43885630d122687982d4746 - Author: Julian Berman - Date: Thu Nov 1 08:58:50 2012 -0400 - - Add heterogeneous types unique test. - - commit 4ab01de94340e6baed2344f0b949043ca35ddfaa - Author: Julian Berman - Date: Wed Oct 31 20:12:53 2012 -0400 - - Add specific test for bool and int. - - commit 6a52026b0d5f1b687d5a995a1591b99d30240280 - Author: Julian Berman - Date: Wed Oct 31 20:12:38 2012 -0400 - - Simplify test to remove also testing integers and booleans. - - commit 3871deac9d5cbc50635533736b68da2feaac0a1d - Merge: fefa4dc 6f18358 - Author: Julian Berman - Date: Wed Oct 10 17:39:19 2012 -0400 - - Merge branch 'render' - - commit 6f18358cc498bb0ed5dfcef08bca52408bf717e9 - Author: Julian Berman - Date: Wed Oct 10 17:37:54 2012 -0400 - - Fix README example. - - commit fefa4dc1c72f75c605aeb8138c39468e8240e724 - Merge: 189e231 295d43a - Author: Julian Berman - Date: Wed Oct 10 12:47:28 2012 -0700 - - Merge pull request #5 from timjb/master - - Added tests for divisibleBy, format: "regex" - - commit 295d43a61daf4098864137c71b652c3d18ee33f3 - Author: Tim Baumann - Date: Wed Oct 10 21:27:32 2012 +0200 - - Move format.json to folder for optional tests - - commit 8f5d9e281b18296baa6440a8caa8955cf5eaec5e - Author: Tim Baumann - Date: Wed Oct 10 21:06:08 2012 +0200 - - regex validation - - commit f11ddc3615460fa4fc9a0e2de8efde856d138f2f - Author: Tim Baumann - Date: Wed Oct 10 20:59:55 2012 +0200 - - divisibleBy tests - - commit 189e231e65d2f25f722fa362cb770ef1c264f7a2 - Author: Julian Berman - Date: Wed Oct 10 10:00:42 2012 -0400 - - Fix the additionalItems tests. - - Closes #4 - - commit a0a6e71207e4cf2c2821370320cc8e158cd70f4c - Author: Julian Berman - Date: Wed Oct 10 09:54:52 2012 -0400 - - Fix nil. - - Closes #3 - - commit 8dbaf210b8430c8cd1058b22cc2bfc639bcbbf8b - Author: Julian Berman - Date: Tue Oct 9 20:28:09 2012 -0400 - - Fix line endings and add invalid test case. - - commit 7829853a2fffa508557c1e21613709417e603f09 - Author: Julian Berman - Date: Sun Oct 7 10:33:14 2012 -0400 - - required - - commit 91e57ae1dc09d75c3885bb8124213f5e67bf2275 - Author: Julian Berman - Date: Sun Oct 7 10:24:35 2012 -0400 - - Pattern - - commit 49af2ebc9a02584fe84ee8b414930b70af24637e - Author: Julian Berman - Date: Sat Oct 6 20:50:59 2012 -0400 - - uniqueItems - - commit 089ed8e819d598125bbac985aa292f78be1e1547 - Author: Julian Berman - Date: Sat Oct 6 20:50:23 2012 -0400 - - Enum - - commit 7e4b937146d92a8612e9b95074daf7582f6ace65 - Author: Julian Berman - Date: Sat Oct 6 20:40:53 2012 -0400 - - max/min Items/Length - - commit 5c27f85a33bc75a8cfddf3b66d2bae91eac9b21e - Author: Julian Berman - Date: Sat Oct 6 20:34:21 2012 -0400 - - Minimum and maximum - - commit 9e24adbd197dddd31d74743bbc203534eda07e9e - Merge: 3649b58 3498f34 - Author: Julian Berman - Date: Wed Sep 26 17:16:27 2012 -0700 - - Merge pull request #1 from gazpachoking/clean - - Add some more tests - - commit 3498f34e94db6e20f8202c0638005d2f62931ab7 - Author: Chase Sterling - Date: Wed Sep 26 20:02:58 2012 -0400 - - Fix an improper additionalItems test. - - commit 26a3873400e6c644cbe22842565624b40c410f1e - Merge: baf0502 3649b58 - Author: Chase Sterling - Date: Tue Sep 25 16:48:39 2012 -0400 - - Merge branch 'master' into clean - - commit baf050206e12334dfe158390a9d8f8d5525b3d6d - Author: Chase Sterling - Date: Tue Sep 25 16:48:30 2012 -0400 - - Added items tests. - - commit cb6dfb2f040c1cc581128a0fbd2a40cfa44fb994 - Author: Chase Sterling - Date: Tue Sep 25 16:11:21 2012 -0400 - - Add cleaned up additionalItems - - commit 3649b58a5ce8fefc77ee1cfaaaeaf68df278ebd6 - Author: Julian Berman - Date: Tue Sep 25 15:28:13 2012 -0400 - - Would be nice if I'd have properly run lint. - - commit e6a270f18c77a1218abc3a7137a093a757b071db - Author: Julian Berman - Date: Tue Sep 25 15:00:57 2012 -0400 - - Properties. - - commit 2192a637eff388a4ee666b07635922281e78539f - Author: Julian Berman - Date: Tue Sep 25 12:40:31 2012 -0400 - - Clarify test reqs. - - commit ff746d00529dd7df0e56329223a8f16933aff9d1 - Author: Julian Berman - Date: Tue Sep 25 12:34:22 2012 -0400 - - Add MIT License. - - commit 9271ce51a4e053fe40985b17c1f88715bd859eb6 - Author: Julian Berman - Date: Tue Sep 25 12:29:00 2012 -0400 - - A basic readme. - - commit 530a0f33201ce4d718d5859f4856a65bbbcdcc73 - Author: Julian Berman - Date: Tue Sep 25 12:12:43 2012 -0400 - - Finish type tests. - - commit 4f9cd46dd9f73a1903452b1a9f4ea99c1938fb50 - Author: Julian Berman - Date: Tue Sep 25 11:49:34 2012 -0400 - - Initial commit. Basic type tests. - -commit 898ebd9ac665eff1d736db2c71a1e7dccf76954c -Author: Julian Berman -Date: Sun Dec 2 14:12:51 2012 -0500 - - Think travis has 3.3 now. - -commit 6d5a088b220fff883f424cc518c325eb4fb3cdb9 -Author: Julian Berman -Date: Sun Dec 2 14:02:29 2012 -0500 - - Move ValidationError to errors page. - -commit c5473b8e386551aa4dcc663c96d4fdda118173c7 -Author: Julian Berman -Date: Sun Dec 2 13:58:51 2012 -0500 - - Copy basic example to docs. Move validation to its own page - -commit d9a0ac110c26eea92fe6559321335a51d1c86ab7 -Author: Julian Berman -Date: Sun Dec 2 13:58:06 2012 -0500 - - Wrong directive. - -commit 1c8c13c11850356b1fcd891599393c53cb3802ac -Author: Julian Berman -Date: Sat Dec 1 23:01:11 2012 -0500 - - Let's call it resolve_relative. - -commit 870869b4e6b210fac66823bd2c1ca103dc9eb9d9 -Author: Julian Berman -Date: Sat Dec 1 21:54:10 2012 -0500 - - Typoed the link. - -commit 6943d5de197e2543e29b12c43035e13e297eb33a -Author: Julian Berman -Date: Sat Dec 1 21:32:49 2012 -0500 - - Whoops. - -commit 2be54ec63c5ccf81956ca936e3da6b8e41f41f28 -Author: Julian Berman -Date: Sat Dec 1 21:25:52 2012 -0500 - - Link to the Draft3Validator - -commit 54a603118123c6ed749906788c3e19d2ea56f3a8 -Author: Julian Berman -Date: Sat Dec 1 21:23:48 2012 -0500 - - Link to more docs, so move the example into the docstring. - -commit 3fbe95d3a2c2ce597f2e50e916f8cea4798dcd72 -Author: Julian Berman -Date: Sat Dec 1 21:12:39 2012 -0500 - - Link to docs - -commit 9a6e4e52e4bc35587a66893a614b8629899f8d49 -Author: Julian Berman -Date: Sat Dec 1 21:10:41 2012 -0500 - - Add some documentation on ErrorTrees - -commit ac034f9ced9e1c7eb8c5c2ac7a5bd70107b497f6 -Author: Julian Berman -Date: Fri Nov 30 12:27:44 2012 -0500 - - Build docs in tox - -commit b1a1a5b5252e950150d5ae194dcda7715933f29a -Author: Julian Berman -Date: Fri Nov 30 10:42:24 2012 -0500 - - Update trove classifiers. - -commit a3e18b0ae6c247d5594177826b1eef3b684cc235 -Author: Julian Berman -Date: Thu Nov 29 21:07:25 2012 -0500 - - Minor cleanup. - -commit 84db74338e9102cd1d4886b3844fb413608d3b96 -Author: Julian Berman -Date: Thu Nov 29 17:51:16 2012 -0500 - - Add params to __init__ for Validation and SchemaError - - Also break out the ErrorTree test into separate unit tests. - -commit 5c1f34d0427e63a12fdf466c99fc49822a0f82ec -Author: Julian Berman -Date: Sat Nov 17 21:40:15 2012 -0500 - - Fix sorted_errors. - - Closes #39 - -commit 34ea55d6b8fbdde74698098c51037a44a23eeba2 -Author: Julian Berman -Date: Sat Nov 17 21:40:10 2012 -0500 - - Remove dead imports. - -commit 3ca9e34a49d64acd37ac8842c0eed3a00e48e187 -Author: Julian Berman -Date: Sat Nov 17 21:39:40 2012 -0500 - - Stupid nose. - -commit 7a5b8a66da9ef646ffd1b5534926aab160c3dcbb -Author: Julian Berman -Date: Sat Nov 17 21:29:53 2012 -0500 - - Never mind, this isn't necessary at all anymore. - -commit 1000836e4b6bc6049937b8e1d3ffa4db49f62c55 -Author: Julian Berman -Date: Sat Nov 17 20:16:50 2012 -0500 - - Silence coverage. - -commit 3b34727463afc55f1ad757ddc0094eb0ffa046e0 -Author: Julian Berman -Date: Sat Nov 17 20:16:16 2012 -0500 - - Be gone! - -commit 5a9f05ef05c897cee4aa64a936cc962823f51f05 -Author: Julian Berman -Date: Sat Nov 17 19:55:27 2012 -0500 - - Remove duplicated tests. - -commit 920f580dffd5522ee27c1bc454f4f22ef3da055d -Author: Julian Berman -Date: Sat Nov 17 19:52:58 2012 -0500 - - Update json schema test suite - -commit fb711b14672893782bb8bad31150849bd8283bd5 -Author: Julian Berman -Date: Wed Nov 7 00:51:27 2012 -0500 - - Update readme. - -commit e8b2b4e9016fca34ce2676b2f20e1140870f0f79 -Author: Julian Berman -Date: Wed Nov 7 00:35:18 2012 -0500 - - Fewer times - -commit fe5d9ff6aa1eff0af303eb4405278b44456d15e1 -Author: Julian Berman -Date: Wed Nov 7 00:08:38 2012 -0500 - - Non local refs. - -commit de3a3b6130537764dff67f6276178f477746fca4 -Author: Julian Berman -Date: Tue Nov 6 20:16:34 2012 -0500 - - Update docs. - -commit 880800a2efb5340474fcdb43f658b7117b286d58 -Author: Julian Berman -Date: Tue Nov 6 20:15:49 2012 -0500 - - Ref store - -commit 2690f948bb238cccedd1ce8278257003fc18f642 -Author: Julian Berman -Date: Tue Nov 6 20:06:46 2012 -0500 - - RefResolver - -commit 505bf3ac0f87a777e4a0827746e5f6156ebbbb56 -Author: Julian Berman -Date: Tue Nov 6 18:41:04 2012 -0500 - - Trim heading - -commit 5618b4526f85fb8e04f9938cd052035e9aa6742b -Author: Julian Berman -Date: Thu Nov 1 09:35:56 2012 -0400 - - Fix a directive - -commit a6501d53bfbf7f01b4df4d3a03c0375b926d257d -Author: Julian Berman -Date: Thu Nov 1 09:35:50 2012 -0400 - - Start on Sphinx docs. - -commit c58cc1855588c2e0c69345ee80801c63d282874d -Author: Julian Berman -Date: Thu Nov 1 09:01:03 2012 -0400 - - Still no idea why these extra commits are showing up. - -commit a83d398067e97f195bdf3ee4c0666f87abc99301 -Author: Julian Berman -Date: Thu Nov 1 08:56:36 2012 -0400 - - Fix #43 for homogeneous uniqueItems too. - -commit fe0d6471a669beee78cc26a1d27718f0994346c5 -Author: Julian Berman -Date: Wed Oct 31 22:28:26 2012 -0400 - - Add tox and JSON tests. - -commit db4f74befebd90a03f830bf6fe576a91c70fef93 -Author: Julian Berman -Date: Wed Oct 31 20:39:51 2012 -0400 - - Begrudgingly make 1 and True unique (and 0 and False). - - Closes: #43 - -commit 3b3bd00fef8547e4a96669f121ab76d31f0cfba0 -Author: Julian Berman -Date: Wed Oct 31 20:27:21 2012 -0400 - - Remove path from test name - -commit 897f198f311bd1cd41f0762f1b97dba05f1c0064 -Author: Julian Berman -Date: Wed Oct 31 20:17:44 2012 -0400 - - Git I don't even begin to understand you. - -commit 88937bd9021e1456dd432bc602206ea314a78c4d -Author: Julian Berman -Date: Tue Oct 30 21:21:45 2012 -0400 - - Use proper relative paths. - -commit 42d694b5584362e7ae05fde51e2173a3f4fb331e -Author: Julian Berman -Date: Tue Oct 30 21:11:17 2012 -0400 - - Use git subtree for JSON Test Suite - -commit 80939b83eb5eb7d5c375ecb13cec5d9f80edc18c -Author: Julian Berman -Date: Tue Oct 30 09:08:13 2012 -0400 - - Remove test duplication. - -commit 4c8c8ad4f6beb260c509d07e91b6f1ea64b6e3b0 -Author: Chase Sterling -Date: Sun Oct 28 23:36:05 2012 -0400 - - Disable some tests due to issue #43 - -commit 92646368385e34ee1db58a26b11bdc59d1ab605b -Merge: ceae60c 654896d -Author: Chase Sterling -Date: Sun Oct 28 23:21:31 2012 -0400 - - Merge branch 'master' into json-test-suite - -commit 654896dcfaff8190a929d199be28c30002b87665 -Merge: 42ec737 faabedc -Author: Chase Sterling -Date: Sun Oct 28 20:18:27 2012 -0700 - - Merge pull request #44 from gazpachoking/unique_fix - - A fix for identifying unique items. refs #43 - -commit faabedcfd9f00ca9b3d485530b39e17ebea30fde -Author: Chase Sterling -Date: Sun Oct 28 22:58:50 2012 -0400 - - A fix for identifying unique items. refs #34 - -commit ceae60c8f79ef88edd11e18265cb57aaca3f62ff -Author: Chase Sterling -Date: Sun Oct 28 21:53:31 2012 -0400 - - Make test method names into valid identifiers. - -commit 42ec73739e930c9f43ce00eee2bc24414951648e -Author: Julian Berman -Date: Sun Oct 28 21:06:24 2012 -0400 - - Remove deprecations. - -commit 6a6c166a75206d18e69c7c3bf0f48b649f2498e9 -Author: Chase Sterling -Date: Sun Oct 28 20:47:26 2012 -0400 - - Fix nose trying to run helper functions as tests. - Fix json test case runner on python 3. - Refactor loading test cases to be a class decorator. - Prevent test cases from swallowing ValidationErrors. - Test method names are now based on filename and test description. - -commit 3ddd80543bd6da56eeea84b2f364febaeadf31b9 -Author: Julian Berman -Date: Sun Oct 28 19:44:10 2012 -0400 - - Update features - -commit eed1d26c98810d00e8f117af82719d6956a0cd33 -Author: Julian Berman -Date: Sun Oct 28 19:43:02 2012 -0400 - - Clarify release note. - -commit 79e0c64c13c5aa98ab4800bf24a3f51abd5ad963 -Author: Julian Berman -Date: Sun Oct 28 19:41:36 2012 -0400 - - Prep for 0.7 release - -commit 253d39484769f064657a1284677c0627d5ed10ff -Author: Julian Berman -Date: Sun Oct 28 19:41:20 2012 -0400 - - Update release notes. - -commit 774bf9dccb902335b0bc1870bb62e304289dba31 -Author: Julian Berman -Date: Sun Oct 28 19:32:35 2012 -0400 - - Privatize _schema as an arg to Draft3Validator functions. - -commit 311e2a0b7c38146161c0e0288b06463c36546219 -Author: Julian Berman -Date: Sun Oct 28 19:27:05 2012 -0400 - - Rename -> resolve_json_pointer - -commit ffeeaf305445281fdc0b086f1d83bc7e4e880b64 -Author: Chase Sterling -Date: Sun Oct 28 19:18:29 2012 -0400 - - Add json based test cases, and a test runner for them. - -commit a8656b8d75944a0029376a0ed78f91c0cb7c886f -Author: Chase Sterling -Date: Fri Oct 26 18:50:25 2012 -0400 - - Add support and test for decoding percent encoded characters in json pointer references. - refs #37 - -commit cdced0f4a028d26f9a713bfb8706a7a8828c1e65 -Author: Chase Sterling -Date: Fri Oct 26 16:57:52 2012 -0400 - - Add test cases for encoded ~ and / in $ref values. - Add back support for decoding them. - refs #37 - -commit 942acd2f7a03134322ce82dfc753438165706a01 -Author: Julian Berman -Date: Fri Oct 26 13:45:48 2012 -0400 - - Cleanup - -commit dc4a02cf79a531cec7b35535d28c453d401f9f9d -Merge: 0e87ffa 64c0d2e -Author: Julian Berman -Date: Fri Oct 26 13:12:54 2012 -0400 - - Merge branch 'json-ref' of http://github.com/redpie/jsonschema - - Closes #37 - - Credit: Chase Sterling & Kiall Mac Innes - - Conflicts: - jsonschema.py - -commit 0e87ffafc8c2bd54eed9827ee50400449f97c98c -Author: Julian Berman -Date: Fri Oct 26 13:02:56 2012 -0400 - - Make check_schema a classmethod. - - meta_validate is deprecated in validate() - -commit e4e08ea2466266c6866d1bb7213bfff92094ce3a -Author: Julian Berman -Date: Mon Oct 22 15:14:13 2012 -0400 - - Add Python 3.3 - -commit 64c0d2e900e929b2fbd91163a8d6c52f6c94a851 -Author: Kiall Mac Innes -Date: Mon Oct 22 11:14:42 2012 +0100 - - Add support for json-pointer references based on Chase Sterling's code. - - Source: https://github.com/gazpachoking/jsonschema/commit/423499e18e64ca7765a03949805b053147a7b5f4 - -commit 0ccbf6f70d978323ae0a57aa0f3c1d73b41cfa97 -Author: Julian Berman -Date: Sun Oct 7 17:58:55 2012 -0400 - - Fix syntax highlighting in readme. - -commit c5a94e7528af88e7aad882323b9a481ea0343115 -Author: Julian Berman -Date: Fri Sep 28 14:42:15 2012 -0400 - - Update readme to use Draft3Validator - -commit da0b82da8f8bc020ee89ce825e94c1ab8e5cc4b5 -Author: Julian Berman -Date: Fri Sep 28 14:39:09 2012 -0400 - - Deprecate meta_validate too. - -commit c99486f0c9d553bc8f964273dda160dd5cb8ceda -Author: Julian Berman -Date: Fri Sep 28 14:07:06 2012 -0400 - - Add schema as a parameter to init for Draft3Validators. - -commit 84113d633521aa7c6784897e39ac1a7b19fe5b6d -Author: Julian Berman -Date: Fri Sep 28 13:36:27 2012 -0400 - - Fix docstring. - -commit d0ce604257cd1d3b0f82661cf90f504a4de6547f -Author: Julian Berman -Date: Fri Sep 28 13:12:20 2012 -0400 - - Add deprecation warning. - -commit 6e752ec1599369ba7bc31f9fe3185aecb775ef4a -Author: Julian Berman -Date: Fri Sep 28 12:54:59 2012 -0400 - - Reorderering functions. - -commit b8837568e3b8370a2665270121937c0447d152bb -Author: Julian Berman -Date: Fri Sep 28 12:52:01 2012 -0400 - - Cleanup. No need to stick these no_ops on for no reason. - -commit 5fc1f09afd3b4c5e916b9c726efd6c20e2eef8a3 -Author: Julian Berman -Date: Fri Sep 28 12:49:58 2012 -0400 - - Fix unvalidated properties. - -commit 4f372ff4249a7c867c2e3fc8b430a0b378f2eb63 -Author: Julian Berman -Date: Fri Sep 28 12:45:47 2012 -0400 - - Introduce check_schema. - -commit 74696988bcf286da6796594bad75e725dc1fc58b -Author: Julian Berman -Date: Fri Sep 28 11:40:51 2012 -0400 - - Test is_valid - -commit 0c1e3023c5485706c8c37c6470ef589c809ecc19 -Author: Julian Berman -Date: Fri Sep 28 11:31:07 2012 -0400 - - Refactor is_type. - -commit 968de69370647459a13c32a3431ca40ceeff888e -Author: Julian Berman -Date: Fri Sep 28 11:30:51 2012 -0400 - - Add mock. - -commit 3c3cf4f850765f5e1825f45767fb6aa7b1317ccf -Author: Julian Berman -Date: Fri Sep 28 11:30:37 2012 -0400 - - Update imports. - -commit 911e14897e1398b8946a96f5a760e3f995a3175d -Author: Julian Berman -Date: Fri Sep 28 10:45:00 2012 -0400 - - Create Draft3Validator class. - -commit dbb298069c8d04a51ce3f47f90226bdb91e292c7 -Author: Julian Berman -Date: Thu Sep 27 14:49:10 2012 -0400 - - Add number arg to perftest. - -commit c626b4b0771a40dc80682ac44263c83e7bd6101f -Author: Julian Berman -Date: Thu Sep 27 14:04:57 2012 -0400 - - More minor duplication removal. - -commit 7921c3c6320480a7a0f6bab26b9474ea6b7fdf85 -Author: Julian Berman -Date: Thu Sep 27 14:03:15 2012 -0400 - - Grouped the iter_errors tests. - -commit 52bec28ae638e79d08737d657de4c3d14e4cc3ad -Author: Julian Berman -Date: Thu Sep 27 14:00:03 2012 -0400 - - From import. - -commit ee0b6928f4112ac905f38e604495329c8b301d70 -Author: Julian Berman -Date: Thu Sep 27 10:23:58 2012 -0400 - - Move out tests into new test cases. - -commit 1d0fcda65261f36f6f141b2fc99509b516e0f1b4 -Author: Julian Berman -Date: Thu Sep 27 10:23:02 2012 -0400 - - Cleanup a test - -commit 207138a1a62e0cc4b87a3485005bdf1d2a508d0a -Author: Julian Berman -Date: Thu Sep 27 09:11:33 2012 -0400 - - Didn't like how this reads. - -commit 43b99fae5af42689989f5429e10e5082d2cd2fdb -Author: Julian Berman -Date: Thu Sep 27 09:10:04 2012 -0400 - - Module docstring update - -commit e47a081bb3396d9b99335e7484a3a161c47fe437 -Author: Julian Berman -Date: Wed Sep 26 21:00:44 2012 -0400 - - Minor formatting. - -commit 2d4a16b8cd5bbe1ea014b2fe7b9f6aa1c9cb5508 -Author: Chase Sterling -Date: Wed Sep 26 20:54:08 2012 -0400 - - Fix another merge problem. - -commit 0522f9112a5bd07148622c617ea178e54ff1b538 -Author: Chase Sterling -Date: Wed Sep 26 20:49:49 2012 -0400 - - Fix bad merge. - -commit 688420f719bd8ba4f8a9e500be3348a1c17c2f8e -Merge: 9a4a4ef e44b0b2 -Author: Chase Sterling -Date: Wed Sep 26 20:40:15 2012 -0400 - - Merge branch 'master' into additionalItems_fix - - Conflicts: - tests.py - -commit 9a4a4ef512cba056a8d6ae6e68be7f92806295b5 -Author: Chase Sterling -Date: Wed Sep 26 20:21:53 2012 -0400 - - Fix additionalItems behavior when items is not in tuple form. - -commit e44b0b29e38a09e0b244db7e1aade2127ab89913 -Author: Julian Berman -Date: Mon Sep 24 18:22:33 2012 -0400 - - Don't recommend using version. - - It is imminently going to be deprecated. - -commit 6615916ffc1cea2bca2dc60e0509ed1242ac02c4 -Author: Julian Berman -Date: Mon Sep 24 15:10:57 2012 -0400 - - Fix additionalProperties with patternProperties present. - - Closes #24. - -commit 69dc5c134e497ac003f071f7841f108d897c263c -Author: Julian Berman -Date: Mon Sep 24 14:17:32 2012 -0400 - - Centralize irrelevant types tests. - -commit 01de645e86e725c420e1b05b32fa38597cd7abab -Author: Julian Berman -Date: Sun Sep 23 15:24:21 2012 -0400 - - Never mind, travis is annoying. - -commit 885db7a26bebed11a312c73ac0495c002c5f7dcd -Author: Julian Berman -Date: Sun Sep 23 15:21:49 2012 -0400 - - Unittest2 dep. - -commit 65a0c6905e7ceb73dbae35a6e31b4e1150e437fd -Author: Julian Berman -Date: Sun Sep 23 15:18:12 2012 -0400 - - Really basic perf test. - -commit 8d308daec7dfcefa21f990ca69ca23b0b8f6b280 -Author: Julian Berman -Date: Sun Sep 23 15:17:38 2012 -0400 - - Version bump. - -commit 0b4b381ac4e4f766116d3114bf83ee09ef513590 -Author: Julian Berman -Date: Sun Sep 23 14:44:09 2012 -0400 - - Travis - -commit 638809ad7f8374d7bb480ed633708817ba847b75 -Author: Julian Berman -Date: Sun Sep 23 14:38:51 2012 -0400 - - Centralize rest of error message tests. - -commit 9709948ba6e577874677fabc861b67f3b168377d -Author: Julian Berman -Date: Sun Sep 23 14:22:00 2012 -0400 - - Show `name` in type validation error if present. - - This is mostly just a convenience to make debugging error messages for - object types easier, since as-is, they can span many lines if an object - type is really complicated. - - Closes: #25, #26 - -commit 75cca40af6e1f6bf29088707064fa36212237fff -Author: Julian Berman -Date: Sun Sep 23 00:04:30 2012 -0400 - - This can just be a regular test. - -commit 98c8a4fcb9adea08c53fbe020bba5b882ac18b82 -Author: Julian Berman -Date: Sun Sep 23 00:04:23 2012 -0400 - - Spacing. - -commit 652698bef1a5109bdbf9f30c660e753ea1f999bf -Merge: 1e47794 33bb92f -Author: Julian Berman -Date: Sun Sep 23 00:01:10 2012 -0400 - - Merge remote-tracking branch 'gazpachoking/dependencies_fix2' - -commit 33bb92fa31d2bd51a46e59af3a59390a0fa6dc07 -Author: Chase Sterling -Date: Sun Sep 23 00:01:25 2012 -0400 - - Add a unit test for dependencies validaton on non-objects. - -commit 663ddba17f3178efc3282f376289d5b0748a6330 -Author: Chase Sterling -Date: Sat Sep 22 23:53:50 2012 -0400 - - Fix dependencies behavior when instance is not of type object. refs #30 - -commit 1e47794fb0bec5830646d2004ed9eebed48c5ca1 -Author: Julian Berman -Date: Fri Sep 21 09:56:28 2012 -0400 - - Release v0.6 - -commit 80472b89f932572399c293985f50ea26f348908c -Author: Julian Berman -Date: Thu Sep 20 21:15:20 2012 -0400 - - Restore proper error message for dependencies. - - With a test to back it up. - -commit 5c6cadfc1c4af2d75897d4d972d21d2dc4c7cbdd -Author: Julian Berman -Date: Thu Sep 20 21:14:38 2012 -0400 - - Move out the sad path to clean out the conditional. - -commit 0a4421e5f990d9359346ffc0bb24a4a40b5c3d90 -Author: Chase Sterling -Date: Thu Sep 20 20:38:28 2012 -0400 - - Refactor 'dependencies' to work how I understand it in the spec. - - Fixed 3.x incompatibility. - - Closes #30 - -commit e6eff879eca4071fd3a2e92291a0cd12350ba8bf -Author: Julian Berman -Date: Sun Aug 12 12:04:42 2012 -0400 - - Minor style fixes. - -commit 2f17868c4862f5b57822678406f6e49fed81b20b -Author: Julian Berman -Date: Mon Jul 30 19:21:12 2012 -0400 - - Fix a bytestring test that was mis-written - -commit 9d8b6b38daad10025fcc3656c36ab7ad6e8b2ebd -Author: Julian Berman -Date: Mon Jul 30 14:08:06 2012 -0400 - - Typo - -commit 1685cdcaea5b25cc453306ce5e5ff50dae1a0956 -Author: Julian Berman -Date: Mon Jul 30 14:06:29 2012 -0400 - - Added a note on running the test suite. - -commit c882db9d760c63228f487240f96f45f034217816 -Author: Julian Berman -Date: Tue Jul 17 15:33:02 2012 -0400 - - Relese v0.5 - - Closes: #19 - -commit b04c608c708dd8a7226baa13e815da249ebf7453 -Author: Julian Berman -Date: Mon Jul 9 19:55:36 2012 -0400 - - Multiple types now validate correctly even for non-objects. - - Closes #18. - -commit 9e4571442f1f194ea6c47e502a81613b48b13cd4 -Author: Julian Berman -Date: Sun Jul 8 15:04:44 2012 +0000 - - Revert "Putting the license in the readme." - - This reverts commit a5e7964b4622142d3c15c6c057e62efebc36229c. - -commit 2472c3c7f137788c1441e892bf8aba651a0a4d7d -Author: Julian Berman -Date: Thu Jul 5 22:23:38 2012 -0400 - - Fixed the two failing tests. - -commit cce27c083046a3967d0fdfb6438954888ee91a87 -Author: Federico Mora -Date: Thu Jun 28 12:10:58 2012 -0400 - - Added path of require to ValidationError - -commit 7dfabf8d8022a297619b7fd120cfe48d67e9afb0 -Author: Julian Berman -Date: Tue Jun 19 13:26:57 2012 -0400 - - Forgot to actually remove the args. - -commit 766cc164b56c1d790397b337a04ee64bad9d44b6 -Author: Julian Berman -Date: Tue Jun 19 13:16:17 2012 -0400 - - Remove all the deprecations. - -commit b8b43a4544a529814ae0d7f5b5e065b974cc0b5f -Author: Julian Berman -Date: Tue Jun 19 10:13:27 2012 -0400 - - Lets wrestle with reSt shall we. - -commit 6afe17703e9c6834ab6e23c3ca4002ea8a59b6ee -Author: Julian Berman -Date: Tue Jun 19 09:57:43 2012 -0400 - - Release 0.4 - -commit d8d813c9a1ce24e8da84490f455e0f84bc71a13b -Author: Julian Berman -Date: Tue Jun 19 09:57:04 2012 -0400 - - Update release notes. - -commit a5e7964b4622142d3c15c6c057e62efebc36229c -Author: Julian Berman -Date: Tue Jun 19 09:49:16 2012 -0400 - - Putting the license in the readme. - -commit ca2ce055ae90c8d71d13eac51b5cbb85c34c9505 -Author: Julian Berman -Date: Tue Jun 19 09:46:35 2012 -0400 - - Clarify a deprecation message. - -commit dee2e14a5817853cdd1d28b8349cf5b15f2a7bd3 -Author: Julian Berman -Date: Tue Jun 19 09:44:41 2012 -0400 - - Deprecate meta_validate - -commit 0b0d59b12f3641c74a3efb0973eca85b2eb57c07 -Author: Julian Berman -Date: Tue Jun 19 09:25:53 2012 -0400 - - ErrorTree.__repr__ - -commit 69faf9185c2607dadc68ca96b57578cba2adcc94 -Author: Julian Berman -Date: Mon Jun 18 23:17:13 2012 -0400 - - Added an example of ErrorTree to the README. - -commit 4837056c3868eac6c0970bb8dbe10355d51164d1 -Author: Julian Berman -Date: Mon Jun 18 23:05:25 2012 -0400 - - ErrorTrees, to make programmatic poking at validation easier. - -commit 00a6128b28af8a61e14ca566433305031278049b -Author: Julian Berman -Date: Mon Jun 18 14:58:19 2012 -0400 - - Forgot to bump the version number. - -commit 87ac636ef345f841d44f32accfc4a836c98d91b2 -Author: Julian Berman -Date: Mon Jun 18 14:56:53 2012 -0400 - - With the validation detail, the reraise stuff should be unnecessary. - -commit cbb37aad7e5bafa8c5339885c5dd95390d463e1b -Author: Julian Berman -Date: Mon Jun 18 14:54:34 2012 -0400 - - Typo - -commit b1d7464cddabaa8fab11113537328cd286768496 -Author: Julian Berman -Date: Mon Jun 18 14:52:12 2012 -0400 - - Provide error details for each ValidationError. - - Closes #5. - - To make this work, raising errors from validators is now deprecated. - Instead, each validator needs to yield each error it wishes to signal. - - This was probably broken before anyhow with stop_on_error but there - wasn't a covering unit test at the time for it. - -commit eb026bd526132b113fec719ecf00532b15f9a38c -Author: Julian Berman -Date: Sun Jun 10 13:53:37 2012 -0400 - - Split off deprecation tests. - -commit 07697625e8d52996c90c080d8d4e8ad1c03fb273 -Author: Julian Berman -Date: Sun Jun 10 13:46:12 2012 -0400 - - Clarify the line about iter_errors. - -commit 3916c23f70b36542434e55e6a93776586981daca -Author: Julian Berman -Date: Sun Jun 10 13:44:06 2012 -0400 - - Reimplement deprecated stop_on_error - -commit 221c653478a8c2fd7f6190e8e50236d8d5849e81 -Author: Julian Berman -Date: Fri Jun 8 19:20:50 2012 -0400 - - Deprecate stop_on_error in favor of iter_errors. - - Temporarily reimplementing stop_on_error is not done yet. - - Also fix a small dependencies bug in the meta schema. - -commit 4d6598b98024ccb94cb15d0b6d4fe6443d65818a -Author: Julian Berman -Date: Thu Jun 7 19:56:59 2012 -0400 - - Fixed a bug caused by implementation of _SKIPPED - - Failing to be able to subclass Validator and implement additional validation - for one of the properties that the Validator happens to not validate (like - format). - -commit 23da7cedc58103d8dd037d6b9144c4e90532037e -Author: Julian Berman -Date: Thu Jun 7 14:58:38 2012 -0400 - - Minor style changes - -commit 5780369c57882c84070cbd20a6cd96f121352990 -Author: Julian Berman -Date: Thu Jun 7 14:44:54 2012 -0400 - - Fix reraising with the stack for Py3 - - The extra modules were not being installed, and even installing them - would be quite dirty without turning into a package. Just borrow six.py's - solution. - -commit f195a3f20c036cde5042b45adb33e30c010d2af1 -Author: Glenn Maynard -Date: Thu Jun 7 16:18:03 2012 +0000 - - Rename property in test schema. - - This test has nothing to do with additionalProperties; this is just a - property name. - -commit 5b0e318ad44fb3b79e6ced3c022721655b778f31 -Author: Glenn Maynard -Date: Thu Jun 7 16:10:15 2012 +0000 - - Test .errors propagation for SchemaError. - -commit 770c0a0f2878ef64d402ca99951b5f27b5e53439 -Author: Glenn Maynard -Date: Thu Jun 7 16:04:26 2012 +0000 - - Preserve .errors in SchemaError. - - When meta-validation exceptions are translated from ValidationError to - SchemaError, propagate the .errors attribute to SchemaError. - -commit 5dcb87b6f33beec067d3e4e35634bcb14cef282b -Author: Glenn Maynard -Date: Thu Jun 7 15:27:03 2012 +0000 - - Python3-compatible fix: don't discard exception backtraces. - - This is important; it's next to impossible to debug problems when backtraces are lost. - -commit ef233ae41387598978a19afd16f0296ad200bfdf -Author: Glenn Maynard -Date: Wed Jun 6 22:08:16 2012 +0000 - - Fix an exception when a "properties" value is not an object. - - This is fixed by checking for it in the metaschema, which means it can still - happen if meta_validate is false. I'm not sure if it should try to always - behave for any arbitrary input, even if it fails against the metaschema; I've - done it this way for now since I suspect there's a lot of broken behavior - if metaschema checks are disabled. - - Note that I havn't tried to fix all possible gaps in the metaschema; for example, - additionalProperties should probably also require this. I'm only fixing the ones - that actually cause runtime exceptions (for now). - -commit 46e0910765182c494bdda7020658860604727731 -Author: Julian Berman -Date: Tue Jun 5 23:25:03 2012 -0400 - - Deprecate {string,number}_types for a more robust thing. - -commit deb1648ac91f16d3388c8273777edac32908a586 -Author: Julian Berman -Date: Tue Jun 5 19:27:26 2012 -0400 - - Release notes & version bump for v0.3 - -commit 7de543262710dc23ff71e45f30541505dc7562b0 -Author: Julian Berman -Date: Sun Jun 3 10:00:50 2012 -0400 - - Removed two more stale 2.5 things. - -commit 3032b97c93d0364241582595c561cced53a72fa5 -Author: Julian Berman -Date: Sun Jun 3 09:57:48 2012 -0400 - - Comment cleanup. - -commit 5e1f54f61eda289201abc6e11369691d3dc88f8a -Author: Julian Berman -Date: Sun Jun 3 09:55:22 2012 -0400 - - Moved irrelevant type tests to test_ methods. - -commit baef48e7c1b79188071e7695c44daeb6c5cb6b75 -Author: Julian Berman -Date: Sun Jun 3 09:50:33 2012 -0400 - - Revert "Fix the stack for ValidationErrors being lost." - - This is a small pain to do in a PY3 compatible way. Delaying for now. - - This reverts commit ee1855f55cc42fb9272ae061592feb3187e31b34. - -commit ee1855f55cc42fb9272ae061592feb3187e31b34 -Author: Glenn Maynard -Date: Thu May 31 16:58:09 2012 +0000 - - Fix the stack for ValidationErrors being lost. - -commit caf0d6334adea122a9e28180ecbab4a1affdcf77 -Author: Glenn Maynard -Date: Thu May 31 16:52:38 2012 +0000 - - Fix divisibleBy when the item isn't a number. - - The spec doesn't actually say this one--there's no "when the type is a - number", but that seems like an oversight, since it doesn't otherwise - specify what should happen and that's how all other number-based - constraints work. - -commit 09b36567dd1f0da38f7086a20286322cbf513142 -Author: Glenn Maynard -Date: Thu May 31 16:51:03 2012 +0000 - - Replace multiple_types_with_properties and multiple_types_with_items with - simpler regression tests. - -commit 23e16ca5001186c9827e06f03f4c7e0afd0ecd8d -Author: Glenn Maynard -Date: Thu May 31 16:49:06 2012 +0000 - - Fix verification for minimum and maximum. - -commit ca301e70873358c9d6238dff020e676d058b5b3f -Author: Glenn Maynard -Date: Thu May 31 16:42:33 2012 +0000 - - Fix quotes (for consistency). - -commit 716d797a69385095b02c2f81bf652ebe7d8025de -Author: Glenn Maynard -Date: Thu May 31 16:42:01 2012 +0000 - - Fix "items" verification. - - Like "properties", "items" was failing: - - jsonschema.validate(1, {'type': ['number', 'array'], 'items': {'type': 'string'}}) - - (The regression tests I'm adding for these can probably be done more concisely.) - -commit 2c0ff4f0d2f4accc6589d9bfb5bcbdc02fcfc2d3 -Author: Glenn Maynard -Date: Wed May 30 22:04:49 2012 +0000 - - Fix "properties" verification. - - This fixes the following: - - jsonschema.validate(1, {'type': ['number', 'object'], 'properties': {'x': {}}}) - - raising an error at 'instance[property]' when instance isn't actually an object. "properties" - only has any effect when the instance value is an object. - -commit abe593d6d0f4a83f1fab62fe5af6d05f82118d2b -Author: Julian Berman -Date: Wed May 23 19:12:39 2012 -0400 - - Fixed docstring for updated unknown_* default. - -commit ed54b2a0ee0538e4bcd2c917114044767f073a72 -Author: Julian Berman -Date: Sun Apr 29 21:51:59 2012 -0400 - - Stale future import from 2.5. - -commit ee75ae845cdace66b6a1d166b0b55b289e9081b7 -Author: Julian Berman -Date: Sun Apr 29 21:47:58 2012 -0400 - - Fixed classifiers for py3. - -commit 5afe2146767b9a5a4857a28d8189f4c549fd7521 -Author: Michael Droettboom -Date: Mon Apr 23 15:34:52 2012 -0400 - - Clarify the ``string_types`` parameter for Python 2.x vs. Python 3.x - -commit e54568dd929735ba8d6bf4c03fd1c1dd4738350b -Author: Michael Droettboom -Date: Mon Apr 23 15:34:21 2012 -0400 - - Remove Python 2.5 "next" backward compatibility, since this code no longer works on Python 2.6 anyway. - -commit 1532b6ba22b2e219a264a573857bb9b206be9a54 -Author: Julian Berman -Date: Fri Apr 20 18:38:10 2012 -0400 - - Minor formatting and cleanup. - -commit 5510597e44b7a4758972fa7ebec1055db8880b1d -Author: Julian Berman -Date: Fri Apr 20 18:08:00 2012 -0400 - - Fix a doctest for py3, which includes modules in tracebacks. - -commit 267a9152c6340546ba7eba8049e8659cf50804fb -Author: Michael Droettboom -Date: Fri Apr 20 15:22:23 2012 -0400 - - An initial stab at making jsonschema Python 3.x compatible. - - This takes the approach of being Python 2.6, 2.7, 3.1 and 3.2 - compatible from an identical code base, i.e. not by requiring an - explicit 2to3 step. With this approach it is almost impossible to - also support Python 2.5, though that can be investigated if that is a - hard requirement. - - The testing framework was changed from Twisted.trial to nosetests, - since Twisted does not yet have Python 3.x support. Alternatively, - pytest could be used. - - Most changes are related to adding "from __future__ import - unicode_literals" and removing all of the "u" prefixes on string - literals. - - Since 3.x drops renames dict.iteritems to dict.items, a function - "iteritems" was added to handle either case. - - Likewise, itertools.izip was dropped in favor of just using zip. - - Comparisions of strings and numbers no longer works, so the string is - forcibly converted to a float before doing a numeric comparison. - - Updated "try .. except" to use the new "Exception as e" syntax. - - Python 3 changed the way metaclasses are handled. The metaclass in - tests.py (there are none in the library proper) now uses a crazy - inscrutable syntax that is Python 2.x and 3.x compatible. See - http://mikewatkins.ca/2008/11/29/python-2-and-3-metaclasses/ - - There is one doctest failing on Python 3.x that fails due to the fact - that in Python 3 the full path to the Exception object is shown in - tracebacks, i.e. jsonschema.ValidationError vs. ValidationError. I'm - not sure how to resolve this in a way that is both Python 2 and 3 - compatible. We may just want to skip the doctests on Python 3. - -commit f72f335455a029d9e07f415c46483cc5b00c2d25 -Author: Julian Berman -Date: Thu Apr 19 14:39:50 2012 -0400 - - Removed the securetypes stuff. - The hash fix has been released, so this can all go away. - -commit b202cfd22e69e97dfbc7c714c3d0bf85beab5e92 -Author: Julian Berman -Date: Thu Apr 19 14:07:38 2012 -0400 - - Change defaults for unknown type and unknown property - -commit 6bc1587dca6441e96c27b5f8e4e2ef3774936167 -Author: Julian Berman -Date: Fri Feb 24 11:12:55 2012 -0500 - - Updating the README - -commit f84bc39658d0464fc36d3d2cc97a0c4ab4bf0f25 -Author: Julian Berman -Date: Sun Feb 19 20:16:58 2012 -0500 - - Fixed a typo and elaborated a tiny bit. - -commit 425243d0162b7f019e70ab1ccf0638cc62ee2627 -Author: Julian Berman -Date: Sun Feb 19 19:53:53 2012 -0500 - - Stale import - -commit 35aeb624de72ef81dc6f8978053edcebe1cee40f -Author: Julian Berman -Date: Sun Feb 19 19:48:16 2012 -0500 - - Upping the epsilon for checking floats' divisibleBy - -commit 1206175b307f58ac3747696965cdba2fa0c239da -Author: Julian Berman -Date: Sun Feb 12 15:37:10 2012 -0500 - - Expose .is_type, .error, .schema_error - -commit b5c159bf702ed78a5002e8fac06cbf744bea2737 -Author: Julian Berman -Date: Fri Feb 10 15:25:39 2012 -0500 - - Minor style fix - -commit 6555eb0cfc31800ae6fa76f7f344dd904262f71e -Author: Julian Berman -Date: Fri Feb 10 15:22:12 2012 -0500 - - Fixing a docstring - -commit add00db44d7822370b176acddd617040e117cd6b -Author: Julian Berman -Date: Fri Feb 10 15:20:52 2012 -0500 - - Meta schema validation - -commit 1537b5fcf68a642caaa1d60a88d2cf74dee440b8 -Author: Julian Berman -Date: Thu Feb 9 14:16:32 2012 -0500 - - Some more documentation - -commit b79320fa77e17b9e710f736c5b88ffd64e805c18 -Author: Julian Berman -Date: Mon Jan 30 22:55:56 2012 -0500 - - Ignore TODO scribbles. - -commit 7030485561ea6ca8ed557e47117a57033b4aac5f -Author: Julian Berman -Date: Mon Jan 30 22:41:13 2012 -0500 - - Added basic extends support. forthcoming (I hope) - -commit e169504250e709ae9e45a6afa1eb09af8f593011 -Author: Julian Berman -Date: Mon Jan 30 22:03:42 2012 -0500 - - Make the error message for additionals prettier - - Also fixes an unexpected bug in additionalItems. - -commit c205e546f550bb7d1d0c92f880e19796661ab955 -Author: Julian Berman -Date: Sun Jan 29 19:53:55 2012 -0500 - - Fixed additional{Properties,Items} to appropriately typecheck. - -commit 0fd249c320b971920407a1d4f2382c2552aed6d3 -Author: Julian Berman -Date: Fri Jan 20 00:30:40 2012 -0500 - - Minor cleanup + 'privatize' of _uniq - -commit b3ae1de431b2df4f9918c2029c5b51afcfb114d2 -Author: Julian Berman -Date: Wed Jan 18 19:29:09 2012 -0500 - - Adding uniqueItems with optional (recommended) dep on securetypes. - -commit 2a409776e2370e562851d1f01f22055b823e1d1d -Author: Julian Berman -Date: Mon Jan 16 19:04:38 2012 -0500 - - Being less clever. Github and PyPI don't like this directive. - -commit 54e5ae2af7ed40cc52cc6e319bd46015bbca6d73 -Author: Julian Berman -Date: Mon Jan 16 15:10:50 2012 -0500 - - Adding a basic readme, some classifiers, and bumped the version. - -commit a1db2118b25fd450e1ca34a8174005a5a194fa65 -Author: Julian Berman -Date: Mon Jan 16 15:07:13 2012 -0500 - - Minor: Changed a few errant %s's to %r's. - -commit 5d6910d544991eef9210ab2573b797add4b6cb73 -Author: Julian Berman -Date: Sun Jan 15 20:54:14 2012 -0500 - - Decimal test. - -commit ce63985a3d854c016985923d55e8716d5aa579c5 -Author: Julian Berman -Date: Sun Jan 15 20:42:51 2012 -0500 - - Make {max,min}{Items,Length} stricter, and 'clean up' type checking. - -commit 0500c5069db7e997bb71cdab497e6b8e8a17d5b2 -Author: Julian Berman -Date: Sun Jan 15 20:08:03 2012 -0500 - - Docstring - -commit c54d30f61e3dea2f5fd7b6eb9ace8ee2c0662a0b -Author: Julian Berman -Date: Sun Jan 1 21:49:14 2012 -0500 - - MANIFEST - -commit 1f0e66bf614fda68d0809b9fd7fae8e240cff618 -Author: Julian Berman -Date: Sun Jan 1 21:42:40 2012 -0500 - - Fixed setup.py - -commit b44a6c98f4853bb573c964f3e7a5fe694e95e7e8 -Author: Julian Berman -Date: Sun Jan 1 21:42:19 2012 -0500 - - __version__ bump - -commit e8b741e6a2f19c767d00db87b730ed7ae9d39ee5 -Author: Julian Berman -Date: Sun Jan 1 21:26:46 2012 -0500 - - Broke 2.5 test support. - -commit bb69bdded671a589f8ad0390db735570c1fe0105 -Author: Julian Berman -Date: Sun Jan 1 21:22:31 2012 -0500 - - A docstring, and unknown_type/unknown_property. - -commit f09af6c2a2300b76dbbf975074e0ce4922c24acc -Author: Julian Berman -Date: Sun Jan 1 20:47:29 2012 -0500 - - Parametrized Tests, Or, How I Learned To Stop Worrying and Make My Tests Look Like C - -commit 3f0ec54ad37282079e10c9d30071ed8fe89d4d24 -Author: Julian Berman -Date: Sat Dec 31 20:45:58 2011 -0500 - - Hey. Let's try not stopping on errors too. - -commit 34ff653e3b3a0eea199299a12b18f5faa4c7508b -Author: Julian Berman -Date: Sat Dec 31 19:47:08 2011 -0500 - - disallowed - -commit 49d3bb3dc015fe0cc231e5a15efa777571716b55 -Author: Julian Berman -Date: Fri Dec 30 15:28:21 2011 -0500 - - A few docstrings. - -commit 31bbe94cca31cfee4630ef3a7506e184c7bebf7e -Author: Julian Berman -Date: Fri Dec 30 15:10:10 2011 -0500 - - Missed a dep. - -commit 008e747fb8067edb5bec4ce80c1c2eda5fc71dad -Author: Julian Berman -Date: Fri Dec 30 14:03:11 2011 -0500 - - setup.py and tox - -commit 5d68fa84ee198942100579707b9929436475681d -Author: Julian Berman -Date: Fri Dec 30 14:03:01 2011 -0500 - - Py2.5+ Support. - -commit b18bb96b9bd74a1e52c607bd4ae6dcf924e7caf1 -Author: Julian Berman -Date: Fri Dec 30 12:45:45 2011 -0500 - - Renaming to jsonschema - -commit 75e9a5bf24c63911c58d6f3e320ea1e1b15d2034 -Author: Julian Berman -Date: Fri Dec 30 12:44:00 2011 -0500 - - enum, pattern, and divisibleBy - -commit 2c25dc77051fbdb10b7e5552f317edb72bb6bcc4 -Author: Julian Berman -Date: Thu Dec 29 22:36:53 2011 -0500 - - Initial commit diff --git a/debian/changelog b/debian/changelog index b8cb61b5..4bbc9ba4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-jsonschema (2.5.1-5) UNRELEASED; urgency=medium * Fixed VCS URLs (https). * Mention Draft 4 support in package description (Closes: #816711) + * Removed d/CHANGELOG, upstream provides own changelog now -- Ondřej Nový Mon, 29 Feb 2016 11:35:07 +0100 -- GitLab From 0b078819361bc76c49cc303b002920cadd6f1d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Thu, 19 May 2016 19:22:05 +0200 Subject: [PATCH 43/79] Bumped Standards-Version to 3.9.8, no changes needed --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4bbc9ba4..2d347172 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-jsonschema (2.5.1-5) UNRELEASED; urgency=medium * Fixed VCS URLs (https). * Mention Draft 4 support in package description (Closes: #816711) * Removed d/CHANGELOG, upstream provides own changelog now + * Bumped Standards-Version to 3.9.8, no changes needed -- Ondřej Nový Mon, 29 Feb 2016 11:35:07 +0100 diff --git a/debian/control b/debian/control index 7fa55ef2..b301226a 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends-Indep: python-functools32, python3-mock, python3-nose, python3-pytest, -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/openstack/python-jsonschema.git Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-jsonschema.git/ Homepage: https://github.com/Julian/jsonschema -- GitLab From d464629dd9f136ed50e8377fb413f1921e3108d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Thu, 19 May 2016 21:18:32 +0200 Subject: [PATCH 44/79] d/rules: Changed UPSTREAM_GIT protocol to https --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2d347172..ba144b8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ python-jsonschema (2.5.1-5) UNRELEASED; urgency=medium * Mention Draft 4 support in package description (Closes: #816711) * Removed d/CHANGELOG, upstream provides own changelog now * Bumped Standards-Version to 3.9.8, no changes needed + * d/rules: Changed UPSTREAM_GIT protocol to https -- Ondřej Nový Mon, 29 Feb 2016 11:35:07 +0100 diff --git a/debian/rules b/debian/rules index 498a4e9a..ce1a677e 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ export PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' - PYTHON3:=$(shell py3versions -r) py3sdo=set -ex; $(foreach py, $(PYTHON3), $(py) $(1);) -UPSTREAM_GIT = git://github.com/Julian/jsonschema.git +UPSTREAM_GIT := https://github.com/Julian/jsonschema.git -include /usr/share/openstack-pkg-tools/pkgos.make %: -- GitLab From 94c99efbee22527d04901928eee602425c5061f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Thu, 19 May 2016 22:02:54 +0200 Subject: [PATCH 45/79] releasing package python-jsonschema version 2.5.1-5 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ba144b8a..242e3762 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ -python-jsonschema (2.5.1-5) UNRELEASED; urgency=medium +python-jsonschema (2.5.1-5) unstable; urgency=medium + * Team upload. * Fixed VCS URLs (https). * Mention Draft 4 support in package description (Closes: #816711) * Removed d/CHANGELOG, upstream provides own changelog now * Bumped Standards-Version to 3.9.8, no changes needed * d/rules: Changed UPSTREAM_GIT protocol to https - -- Ondřej Nový Mon, 29 Feb 2016 11:35:07 +0100 + -- Ondřej Nový Thu, 19 May 2016 22:02:32 +0200 python-jsonschema (2.5.1-4) unstable; urgency=medium -- GitLab From fbd4a332e0170ba787c6a79f376ec011b6ac8fc9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 4 Aug 2017 20:36:26 +0200 Subject: [PATCH 46/79] Updating vcs fields. Signed-off-by: Daniel Baumann --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index b301226a..e408dc92 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,8 @@ Build-Depends-Indep: python-functools32, python3-nose, python3-pytest, Standards-Version: 3.9.8 -Vcs-Git: https://anonscm.debian.org/git/openstack/python-jsonschema.git -Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-jsonschema.git/ +Vcs-Git: https://anonscm.debian.org/git/openstack/python/python-jsonschema.git +Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python/python-jsonschema.git Homepage: https://github.com/Julian/jsonschema Package: python-jsonschema -- GitLab From 990f651786330726b11c89d0d52f1570fa30df94 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 4 Aug 2017 21:03:24 +0200 Subject: [PATCH 47/79] Adding changelog message about updating vcs fields. Signed-off-by: Daniel Baumann --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 242e3762..8657c4f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ python-jsonschema (2.5.1-5) unstable; urgency=medium + [ Ondřej Nový ] * Team upload. * Fixed VCS URLs (https). * Mention Draft 4 support in package description (Closes: #816711) @@ -7,6 +8,9 @@ python-jsonschema (2.5.1-5) unstable; urgency=medium * Bumped Standards-Version to 3.9.8, no changes needed * d/rules: Changed UPSTREAM_GIT protocol to https + [ Daniel Baumann ] + * Updating vcs fields. + -- Ondřej Nový Thu, 19 May 2016 22:02:32 +0200 python-jsonschema (2.5.1-4) unstable; urgency=medium -- GitLab From 200d26006c59acd0fb763b8e1d6f38cd3951c7ed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 4 Aug 2017 21:14:47 +0200 Subject: [PATCH 48/79] Updating copyright format url. Signed-off-by: Daniel Baumann --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8657c4f6..8c6c510d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ python-jsonschema (2.5.1-5) unstable; urgency=medium [ Daniel Baumann ] * Updating vcs fields. + * Updating copyright format url. -- Ondřej Nový Thu, 19 May 2016 22:02:32 +0200 diff --git a/debian/copyright b/debian/copyright index 5a983559..2d29d121 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: jsonschema Source: https://github.com/Julian/jsonschema -- GitLab From 34b21da90a23423e88bce23430f9617cc244c164 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 4 Aug 2017 22:12:40 +0200 Subject: [PATCH 49/79] Fixing changelog. Signed-off-by: Daniel Baumann --- debian/changelog | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8c6c510d..f44d8bf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ +python-jsonschema (2.5.1-6) UNRELEASED; urgency=medium + + * Updating vcs fields. + * Updating copyright format url. + + -- Daniel Baumann Fri, 04 Aug 2017 21:59:18 +0200 + python-jsonschema (2.5.1-5) unstable; urgency=medium - [ Ondřej Nový ] * Team upload. * Fixed VCS URLs (https). * Mention Draft 4 support in package description (Closes: #816711) @@ -8,10 +14,6 @@ python-jsonschema (2.5.1-5) unstable; urgency=medium * Bumped Standards-Version to 3.9.8, no changes needed * d/rules: Changed UPSTREAM_GIT protocol to https - [ Daniel Baumann ] - * Updating vcs fields. - * Updating copyright format url. - -- Ondřej Nový Thu, 19 May 2016 22:02:32 +0200 python-jsonschema (2.5.1-4) unstable; urgency=medium -- GitLab From 5093a75d35a6b989cfec8f8db809f22618179a46 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 4 Aug 2017 23:21:50 +0200 Subject: [PATCH 50/79] Updating maintainer field. Signed-off-by: Daniel Baumann --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f44d8bf5..73ea7a5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-jsonschema (2.5.1-6) UNRELEASED; urgency=medium * Updating vcs fields. * Updating copyright format url. + * Updating maintainer field. -- Daniel Baumann Fri, 04 Aug 2017 21:59:18 +0200 diff --git a/debian/control b/debian/control index e408dc92..b442a0b5 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: python-jsonschema Section: python Priority: optional -Maintainer: PKG OpenStack +Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Build-Depends: autopkgtest, debhelper (>= 9), -- GitLab From 3305fffeb70b6147b8a86d686eaa43669f1af894 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 4 Aug 2017 23:32:02 +0200 Subject: [PATCH 51/79] Running wrap-and-sort -bast. Signed-off-by: Daniel Baumann --- debian/changelog | 1 + debian/control | 53 ++++++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 73ea7a5f..48258d97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-jsonschema (2.5.1-6) UNRELEASED; urgency=medium * Updating vcs fields. * Updating copyright format url. * Updating maintainer field. + * Running wrap-and-sort -bast. -- Daniel Baumann Fri, 04 Aug 2017 21:59:18 +0200 diff --git a/debian/control b/debian/control index b442a0b5..dec39911 100644 --- a/debian/control +++ b/debian/control @@ -2,23 +2,26 @@ Source: python-jsonschema Section: python Priority: optional Maintainer: Debian OpenStack -Uploaders: Thomas Goirand , -Build-Depends: autopkgtest, - debhelper (>= 9), - dh-python, - python-all, - python-setuptools, - python-vcversioner, - python3-all, - python3-setuptools, - python3-vcversioner, -Build-Depends-Indep: python-functools32, - python-mock, - python-nose, - python-pytest, - python3-mock, - python3-nose, - python3-pytest, +Uploaders: + Thomas Goirand , +Build-Depends: + autopkgtest, + debhelper (>= 9), + dh-python, + python-all, + python-setuptools, + python-vcversioner, + python3-all, + python3-setuptools, + python3-vcversioner, +Build-Depends-Indep: + python-functools32, + python-mock, + python-nose, + python-pytest, + python3-mock, + python3-nose, + python3-pytest, Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/openstack/python/python-jsonschema.git Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python/python-jsonschema.git @@ -26,10 +29,11 @@ Homepage: https://github.com/Julian/jsonschema Package: python-jsonschema Architecture: all -Depends: python-functools32, - python-mock, - ${misc:Depends}, - ${python:Depends}, +Depends: + python-functools32, + python-mock, + ${misc:Depends}, + ${python:Depends}, Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 2.7 JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what @@ -42,9 +46,10 @@ Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 2. Package: python3-jsonschema Architecture: all -Depends: python3 (>= 3.2.3), - ${misc:Depends}, - ${python3:Depends}, +Depends: + python3 (>= 3.2.3), + ${misc:Depends}, + ${python3:Depends}, Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 3.x JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what -- GitLab From 14f18237110bf004f9ac520423cca17c1b2361df Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 4 Aug 2017 23:59:20 +0200 Subject: [PATCH 52/79] Updating standards version to 4.0.0. Signed-off-by: Daniel Baumann --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 48258d97..f5a8de02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ python-jsonschema (2.5.1-6) UNRELEASED; urgency=medium * Updating copyright format url. * Updating maintainer field. * Running wrap-and-sort -bast. + * Updating standards version to 4.0.0. -- Daniel Baumann Fri, 04 Aug 2017 21:59:18 +0200 diff --git a/debian/control b/debian/control index dec39911..bafde66e 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends-Indep: python3-mock, python3-nose, python3-pytest, -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/openstack/python/python-jsonschema.git Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python/python-jsonschema.git Homepage: https://github.com/Julian/jsonschema -- GitLab From 035568cfff27b63ff50c32dc30c500b7ae22111d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 5 Aug 2017 00:15:49 +0200 Subject: [PATCH 53/79] Removing gbp.conf, not used anymore or should be specified in the developers dotfiles. Signed-off-by: Daniel Baumann --- debian/changelog | 2 ++ debian/gbp.conf | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 debian/gbp.conf diff --git a/debian/changelog b/debian/changelog index f5a8de02..e6cc3ec7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ python-jsonschema (2.5.1-6) UNRELEASED; urgency=medium * Updating maintainer field. * Running wrap-and-sort -bast. * Updating standards version to 4.0.0. + * Removing gbp.conf, not used anymore or should be specified in the + developers dotfiles. -- Daniel Baumann Fri, 04 Aug 2017 21:59:18 +0200 diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 48bd2b27..00000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -upstream-branch = master -debian-branch = debian/unstable -upstream-tag = v%(version)s -compression = xz - -[buildpackage] -export-dir = ../build-area/ -- GitLab From 34227df70dabe481a4f65a07cfa753a24b3121db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 5 Aug 2017 00:55:58 +0200 Subject: [PATCH 54/79] Correcting permissions in debian packaging files. Signed-off-by: Daniel Baumann --- debian/changelog | 1 + debian/python-jsonschema.postinst | 0 debian/python-jsonschema.postrm | 0 debian/python-jsonschema.prerm | 0 debian/python3-jsonschema.postinst | 0 debian/python3-jsonschema.postrm | 0 debian/python3-jsonschema.prerm | 0 7 files changed, 1 insertion(+) mode change 100644 => 100755 debian/python-jsonschema.postinst mode change 100644 => 100755 debian/python-jsonschema.postrm mode change 100644 => 100755 debian/python-jsonschema.prerm mode change 100644 => 100755 debian/python3-jsonschema.postinst mode change 100644 => 100755 debian/python3-jsonschema.postrm mode change 100644 => 100755 debian/python3-jsonschema.prerm diff --git a/debian/changelog b/debian/changelog index e6cc3ec7..228c4154 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ python-jsonschema (2.5.1-6) UNRELEASED; urgency=medium * Updating standards version to 4.0.0. * Removing gbp.conf, not used anymore or should be specified in the developers dotfiles. + * Correcting permissions in debian packaging files. -- Daniel Baumann Fri, 04 Aug 2017 21:59:18 +0200 diff --git a/debian/python-jsonschema.postinst b/debian/python-jsonschema.postinst old mode 100644 new mode 100755 diff --git a/debian/python-jsonschema.postrm b/debian/python-jsonschema.postrm old mode 100644 new mode 100755 diff --git a/debian/python-jsonschema.prerm b/debian/python-jsonschema.prerm old mode 100644 new mode 100755 diff --git a/debian/python3-jsonschema.postinst b/debian/python3-jsonschema.postinst old mode 100644 new mode 100755 diff --git a/debian/python3-jsonschema.postrm b/debian/python3-jsonschema.postrm old mode 100644 new mode 100755 diff --git a/debian/python3-jsonschema.prerm b/debian/python3-jsonschema.prerm old mode 100644 new mode 100755 -- GitLab From 7017e4b8dd88201cd64b88b3b68910713b40c0e3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 6 Aug 2017 13:49:15 +0200 Subject: [PATCH 55/79] Updating standards version to 4.0.1. Signed-off-by: Daniel Baumann --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 228c4154..4172e876 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ python-jsonschema (2.5.1-6) UNRELEASED; urgency=medium * Removing gbp.conf, not used anymore or should be specified in the developers dotfiles. * Correcting permissions in debian packaging files. + * Updating standards version to 4.0.1. -- Daniel Baumann Fri, 04 Aug 2017 21:59:18 +0200 diff --git a/debian/control b/debian/control index bafde66e..0620ce2e 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends-Indep: python3-mock, python3-nose, python3-pytest, -Standards-Version: 4.0.0 +Standards-Version: 4.0.1 Vcs-Git: https://anonscm.debian.org/git/openstack/python/python-jsonschema.git Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python/python-jsonschema.git Homepage: https://github.com/Julian/jsonschema -- GitLab From ba7021d0b2e029a09db236d6af9a99a9e45a7e39 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 22 Aug 2017 18:51:07 +0200 Subject: [PATCH 56/79] Updating standards version to 4.1.0. Signed-off-by: Daniel Baumann --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4172e876..ad04b4ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ python-jsonschema (2.5.1-6) UNRELEASED; urgency=medium developers dotfiles. * Correcting permissions in debian packaging files. * Updating standards version to 4.0.1. + * Updating standards version to 4.1.0. -- Daniel Baumann Fri, 04 Aug 2017 21:59:18 +0200 diff --git a/debian/control b/debian/control index 0620ce2e..fdf87c0d 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends-Indep: python3-mock, python3-nose, python3-pytest, -Standards-Version: 4.0.1 +Standards-Version: 4.1.0 Vcs-Git: https://anonscm.debian.org/git/openstack/python/python-jsonschema.git Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python/python-jsonschema.git Homepage: https://github.com/Julian/jsonschema -- GitLab From 580f8af3dfd9b5df0f97d43df2726a9902786bb0 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 1 Nov 2017 17:22:34 +0100 Subject: [PATCH 57/79] Restore changes from debian/newton branch. --- debian/changelog | 19 +++++++++++++++++-- debian/compat | 2 +- debian/control | 4 +++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index ad04b4ce..c149a122 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -python-jsonschema (2.5.1-6) UNRELEASED; urgency=medium +python-jsonschema (2.5.1-7) UNRELEASED; urgency=medium + [ Daniel Baumann ] * Updating vcs fields. * Updating copyright format url. * Updating maintainer field. @@ -11,7 +12,21 @@ python-jsonschema (2.5.1-6) UNRELEASED; urgency=medium * Updating standards version to 4.0.1. * Updating standards version to 4.1.0. - -- Daniel Baumann Fri, 04 Aug 2017 21:59:18 +0200 + [ Ondřej Nový ] + * Bumped debhelper compat version to 10 + + -- Ondřej Nový Thu, 24 Nov 2016 00:07:05 +0100 + +python-jsonschema (2.5.1-6) unstable; urgency=medium + + [ Ondřej Nový ] + * d/s/options: extend-diff-ignore of .gitreview + * d/control: Using OpenStack's Gerrit as VCS URLs. + + [ Thomas Goirand ] + * Adding depends on python3-pkg-resources (Closes: #839075). + + -- Thomas Goirand Tue, 04 Oct 2016 16:08:48 +0200 python-jsonschema (2.5.1-5) unstable; urgency=medium diff --git a/debian/compat b/debian/compat index ec635144..f599e28b 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index fdf87c0d..fadf695a 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Thomas Goirand , Build-Depends: autopkgtest, - debhelper (>= 9), + debhelper (>= 10), dh-python, python-all, python-setuptools, @@ -32,6 +32,7 @@ Architecture: all Depends: python-functools32, python-mock, + python3-pkg-resources, ${misc:Depends}, ${python:Depends}, Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 2.7 @@ -48,6 +49,7 @@ Package: python3-jsonschema Architecture: all Depends: python3 (>= 3.2.3), + python3-pkg-resources, ${misc:Depends}, ${python3:Depends}, Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 3.x -- GitLab From 102d96d237012d27f61a2cbad11991ebdb9c3a67 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 1 Nov 2017 17:23:41 +0100 Subject: [PATCH 58/79] Now packaging 2.6.0 --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c149a122..f84bb4be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-jsonschema (2.5.1-7) UNRELEASED; urgency=medium +python-jsonschema (2.6.0-1) UNRELEASED; urgency=medium [ Daniel Baumann ] * Updating vcs fields. @@ -15,7 +15,10 @@ python-jsonschema (2.5.1-7) UNRELEASED; urgency=medium [ Ondřej Nový ] * Bumped debhelper compat version to 10 - -- Ondřej Nový Thu, 24 Nov 2016 00:07:05 +0100 + [ Thomas Goirand ] + * New upstream release. + + -- Thomas Goirand Wed, 01 Nov 2017 17:23:29 +0100 python-jsonschema (2.5.1-6) unstable; urgency=medium -- GitLab From 760a2b7fc54c98512cff4003e2cdb27685df18fc Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 1 Nov 2017 17:25:02 +0100 Subject: [PATCH 59/79] Standards-Version is now 4.1.1. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f84bb4be..6278271a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ python-jsonschema (2.6.0-1) UNRELEASED; urgency=medium [ Thomas Goirand ] * New upstream release. + * Standards-Version is now 4.1.1. -- Thomas Goirand Wed, 01 Nov 2017 17:23:29 +0100 diff --git a/debian/control b/debian/control index fadf695a..1cbd239e 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends-Indep: python3-mock, python3-nose, python3-pytest, -Standards-Version: 4.1.0 +Standards-Version: 4.1.1 Vcs-Git: https://anonscm.debian.org/git/openstack/python/python-jsonschema.git Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python/python-jsonschema.git Homepage: https://github.com/Julian/jsonschema -- GitLab From b27c4c0afada6f0c739f9056df85a54f3fc27be0 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 1 Nov 2017 17:28:00 +0100 Subject: [PATCH 60/79] Using pkgos-dh_auto_install. --- debian/changelog | 1 + debian/control | 1 + debian/rules | 21 ++++----------------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6278271a..1a474fb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ python-jsonschema (2.6.0-1) UNRELEASED; urgency=medium [ Thomas Goirand ] * New upstream release. * Standards-Version is now 4.1.1. + * Using pkgos-dh_auto_install. -- Thomas Goirand Wed, 01 Nov 2017 17:23:29 +0100 diff --git a/debian/control b/debian/control index 1cbd239e..ae5ad03f 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: autopkgtest, debhelper (>= 10), dh-python, + openstack-pkg-tools, python-all, python-setuptools, python-vcversioner, diff --git a/debian/rules b/debian/rules index ce1a677e..f10894df 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,12 @@ #!/usr/bin/make -f -PYTHONS:=$(shell pyversions -vr) -PYTHON3S:=$(shell py3versions -vr) - -export PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1) - PYTHON3:=$(shell py3versions -r) py3sdo=set -ex; $(foreach py, $(PYTHON3), $(py) $(1);) UPSTREAM_GIT := https://github.com/Julian/jsonschema.git --include /usr/share/openstack-pkg-tools/pkgos.make +include /usr/share/openstack-pkg-tools/pkgos.make + +export PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1) %: dh $@ --with python2,python3 @@ -26,17 +23,7 @@ override_dh_auto_build: $(call py3sdo, setup.py build) override_dh_auto_install: - set -e ; for pyvers in $(PYTHONS); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python-jsonschema; \ - done - set -e ; for pyvers in $(PYTHON3S); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python3-jsonschema; \ - done - rm -f $(CURDIR)/debian/python*/usr/lib/python*/dist-packages/*.pth - mv $(CURDIR)/debian/python-jsonschema/usr/bin/jsonschema $(CURDIR)/debian/python-jsonschema/usr/bin/python2-jsonschema - mv $(CURDIR)/debian/python3-jsonschema/usr/bin/jsonschema $(CURDIR)/debian/python3-jsonschema/usr/bin/python3-jsonschema + pkgos-dh_auto_install override_dh_python3: dh_python3 --shebang=/usr/bin/python3 -- GitLab From 2a4531c9944e839fc6300f7652bd15a18bc6a5e0 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 1 Nov 2017 17:29:07 +0100 Subject: [PATCH 61/79] Testing with all versions of Python 3. --- debian/changelog | 1 + debian/rules | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a474fb1..aae88847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ python-jsonschema (2.6.0-1) UNRELEASED; urgency=medium * New upstream release. * Standards-Version is now 4.1.1. * Using pkgos-dh_auto_install. + * Testing with all versions of Python 3. -- Thomas Goirand Wed, 01 Nov 2017 17:23:29 +0100 diff --git a/debian/rules b/debian/rules index f10894df..8532cf1a 100755 --- a/debian/rules +++ b/debian/rules @@ -13,8 +13,9 @@ export PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' - override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - nosetests -v - nosetests3 -v + set -e ; for i in 2.7 $(PYTHON3S) ; do \ + PYTHON=python$$i python$$i -m nose -v ; \ + done endif override_dh_auto_build: -- GitLab From a558eed64b577b97efab6c7277741d4eaf09c6a7 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 1 Nov 2017 17:29:53 +0100 Subject: [PATCH 62/79] Refreshed version patch. --- debian/changelog | 1 + debian/patches/fixup-version.patch | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index aae88847..3b759b73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ python-jsonschema (2.6.0-1) UNRELEASED; urgency=medium * Standards-Version is now 4.1.1. * Using pkgos-dh_auto_install. * Testing with all versions of Python 3. + * Refreshed version patch. -- Thomas Goirand Wed, 01 Nov 2017 17:23:29 +0100 diff --git a/debian/patches/fixup-version.patch b/debian/patches/fixup-version.patch index a2bf227a..27bcdf43 100644 --- a/debian/patches/fixup-version.patch +++ b/debian/patches/fixup-version.patch @@ -6,25 +6,29 @@ Author: Thomas Goirand Forwarded: no Last-Update: 2015-10-09 +Index: python-jsonschema/jsonschema/_version.py +=================================================================== --- /dev/null -+++ python-jsonschema-2.5.1/jsonschema/_version.py ++++ python-jsonschema/jsonschema/_version.py @@ -0,0 +1,5 @@ + +# This file is automatically generated by setup.py. +__version__ = '2.5.1' +__sha__ = '1\n' +__revision__ = '1\n' ---- python-jsonschema-2.5.1.orig/setup.py -+++ python-jsonschema-2.5.1/setup.py -@@ -29,6 +29,7 @@ extras_require = { +Index: python-jsonschema/setup.py +=================================================================== +--- python-jsonschema.orig/setup.py ++++ python-jsonschema/setup.py +@@ -27,6 +27,7 @@ extras_require = { setup( name="jsonschema", + version="2.5.1", packages=["jsonschema", "jsonschema.tests"], package_data={"jsonschema": ["schemas/*.json"]}, - setup_requires=["vcversioner"], -@@ -41,5 +42,4 @@ setup( + setup_requires=["vcversioner>=2.16.0.0"], +@@ -39,5 +40,4 @@ setup( long_description=long_description, url="http://github.com/Julian/jsonschema", entry_points={"console_scripts": ["jsonschema = jsonschema.cli:main"]}, -- GitLab From e97a65a817b3393de87360f5eb393694191cb1fc Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 1 Nov 2017 17:31:38 +0100 Subject: [PATCH 63/79] Releasing to unstable. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3b759b73..02eb0b38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-jsonschema (2.6.0-1) UNRELEASED; urgency=medium +python-jsonschema (2.6.0-1) unstable; urgency=medium [ Daniel Baumann ] * Updating vcs fields. -- GitLab From c7d83d00c7bc8dd606b7fd4749c1172fffc3a553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Wed, 15 Nov 2017 20:38:04 +0100 Subject: [PATCH 64/79] d/p/fixup-version.patch: Set version to 2.6.0 (Closes: #881833) --- debian/changelog | 7 +++++++ debian/patches/fixup-version.patch | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 02eb0b38..55ed8f60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-jsonschema (2.6.0-2) UNRELEASED; urgency=medium + + * Team upload. + * d/p/fixup-version.patch: Set version to 2.6.0 (Closes: #881833) + + -- Ondřej Nový Wed, 15 Nov 2017 20:37:28 +0100 + python-jsonschema (2.6.0-1) unstable; urgency=medium [ Daniel Baumann ] diff --git a/debian/patches/fixup-version.patch b/debian/patches/fixup-version.patch index 27bcdf43..5728d0c2 100644 --- a/debian/patches/fixup-version.patch +++ b/debian/patches/fixup-version.patch @@ -13,7 +13,7 @@ Index: python-jsonschema/jsonschema/_version.py @@ -0,0 +1,5 @@ + +# This file is automatically generated by setup.py. -+__version__ = '2.5.1' ++__version__ = '2.6.0' +__sha__ = '1\n' +__revision__ = '1\n' Index: python-jsonschema/setup.py @@ -24,7 +24,7 @@ Index: python-jsonschema/setup.py setup( name="jsonschema", -+ version="2.5.1", ++ version="2.6.0", packages=["jsonschema", "jsonschema.tests"], package_data={"jsonschema": ["schemas/*.json"]}, setup_requires=["vcversioner>=2.16.0.0"], -- GitLab From 69f7ad2c744d65159dac5716c7fda8fc5cfd8a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Wed, 15 Nov 2017 20:43:40 +0100 Subject: [PATCH 65/79] releasing package python-jsonschema version 2.6.0-2 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 55ed8f60..faaa2e6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -python-jsonschema (2.6.0-2) UNRELEASED; urgency=medium +python-jsonschema (2.6.0-2) unstable; urgency=medium * Team upload. * d/p/fixup-version.patch: Set version to 2.6.0 (Closes: #881833) - -- Ondřej Nový Wed, 15 Nov 2017 20:37:28 +0100 + -- Ondřej Nový Wed, 15 Nov 2017 20:43:29 +0100 python-jsonschema (2.6.0-1) unstable; urgency=medium @@ -162,7 +162,7 @@ python-jsonschema (0.2-1) unstable; urgency=low python-jsonschema (0.2-0ubuntu2) quantal; urgency=low * debian/control: Add python-nose as a build dependency. - * debian/rules: Run testsuite during build. + * debian/rules: Run testsuite during build. -- Chuck Short Wed, 23 May 2012 20:02:47 -0400 -- GitLab From 2e460c1f816aee7664efd5fcb07148c541966e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Mon, 12 Feb 2018 10:30:46 +0100 Subject: [PATCH 66/79] d/control: Set Vcs-* to salsa.debian.org --- debian/changelog | 6 ++++++ debian/control | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index faaa2e6a..c48d6607 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (2.6.0-3) UNRELEASED; urgency=medium + + * d/control: Set Vcs-* to salsa.debian.org + + -- Ondřej Nový Mon, 12 Feb 2018 10:30:46 +0100 + python-jsonschema (2.6.0-2) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index ae5ad03f..0b753e0c 100644 --- a/debian/control +++ b/debian/control @@ -24,8 +24,8 @@ Build-Depends-Indep: python3-nose, python3-pytest, Standards-Version: 4.1.1 -Vcs-Git: https://anonscm.debian.org/git/openstack/python/python-jsonschema.git -Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python/python-jsonschema.git +Vcs-Git: https://salsa.debian.org/openstack-team/python/python-jsonschema.git +Vcs-Browser: https://salsa.debian.org/openstack-team/python/python-jsonschema Homepage: https://github.com/Julian/jsonschema Package: python-jsonschema -- GitLab From 1abe85a551d1c09f29d76715e66131c6af61a596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Tue, 27 Feb 2018 16:43:14 +0100 Subject: [PATCH 67/79] d/control: Add trailing tilde to min version depend to allow backports --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c48d6607..a0c987d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ python-jsonschema (2.6.0-3) UNRELEASED; urgency=medium * d/control: Set Vcs-* to salsa.debian.org + * d/control: Add trailing tilde to min version depend to allow + backports -- Ondřej Nový Mon, 12 Feb 2018 10:30:46 +0100 diff --git a/debian/control b/debian/control index 0b753e0c..de38bec2 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Thomas Goirand , Build-Depends: autopkgtest, - debhelper (>= 10), + debhelper (>= 10~), dh-python, openstack-pkg-tools, python-all, -- GitLab From 6ee2a354f0df3c33ed512506dba911f46375ab54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Fri, 3 Aug 2018 06:07:06 +0200 Subject: [PATCH 68/79] d/control: Use team+openstack@tracker.debian.org as maintainer --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a0c987d7..4755f1f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-jsonschema (2.6.0-3) UNRELEASED; urgency=medium * d/control: Set Vcs-* to salsa.debian.org * d/control: Add trailing tilde to min version depend to allow backports + * d/control: Use team+openstack@tracker.debian.org as maintainer -- Ondřej Nový Mon, 12 Feb 2018 10:30:46 +0100 diff --git a/debian/control b/debian/control index de38bec2..0cb8ad63 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: python-jsonschema Section: python Priority: optional -Maintainer: Debian OpenStack +Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Build-Depends: -- GitLab From 6581ecd914e69610f58d980dd43503b21dfef1de Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 6 Sep 2018 00:30:46 +0200 Subject: [PATCH 69/79] Revert "d/control: Add trailing tilde to min version depend to allow backports" This reverts commit 1abe85a551d1c09f29d76715e66131c6af61a596. --- debian/changelog | 2 -- debian/control | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4755f1f2..7e16ce30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,6 @@ python-jsonschema (2.6.0-3) UNRELEASED; urgency=medium * d/control: Set Vcs-* to salsa.debian.org - * d/control: Add trailing tilde to min version depend to allow - backports * d/control: Use team+openstack@tracker.debian.org as maintainer -- Ondřej Nový Mon, 12 Feb 2018 10:30:46 +0100 diff --git a/debian/control b/debian/control index 0cb8ad63..215452f6 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Thomas Goirand , Build-Depends: autopkgtest, - debhelper (>= 10~), + debhelper (>= 10), dh-python, openstack-pkg-tools, python-all, -- GitLab From c434cfa5b6b8ec80665d5f9e9d88f09899d1c24f Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 6 Sep 2018 00:37:58 +0200 Subject: [PATCH 70/79] Add a -doc package. (Closes: #857867) --- debian/changelog | 8 ++++++-- debian/control | 24 +++++++++++++++++++++++- debian/python-jsonschema-doc.doc-base | 9 +++++++++ debian/rules | 8 +++++++- 4 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 debian/python-jsonschema-doc.doc-base diff --git a/debian/changelog b/debian/changelog index 7e16ce30..7bf2931a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -python-jsonschema (2.6.0-3) UNRELEASED; urgency=medium +python-jsonschema (2.6.0-3) unstable; urgency=medium + [ Ondřej Nový ] * d/control: Set Vcs-* to salsa.debian.org * d/control: Use team+openstack@tracker.debian.org as maintainer - -- Ondřej Nový Mon, 12 Feb 2018 10:30:46 +0100 + [ Thomas Goirand ] + * Add a -doc package. (Closes: #857867) + + -- Thomas Goirand Thu, 06 Sep 2018 00:36:26 +0200 python-jsonschema (2.6.0-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 215452f6..b04085c0 100644 --- a/debian/control +++ b/debian/control @@ -14,12 +14,14 @@ Build-Depends: python-vcversioner, python3-all, python3-setuptools, + python3-sphinx, python3-vcversioner, Build-Depends-Indep: python-functools32, python-mock, python-nose, python-pytest, + python3-lxml, python3-mock, python3-nose, python3-pytest, @@ -36,6 +38,8 @@ Depends: python3-pkg-resources, ${misc:Depends}, ${python:Depends}, +Suggests: + python-jsonschema-doc, Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 2.7 JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what @@ -46,13 +50,31 @@ Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 2. . This package contains the Python 2.7 module. +Package: python-jsonschema-doc +Section: doc +Architecture: all +Depends: + ${misc:Depends}, + ${sphinxdoc:Depends}, +Description: An(other) implementation of JSON Schema (Draft 3 and 4) - doc + JSON Schema is a specification for a JSON-based format for defining + the structure of JSON data. JSON Schema provides a contract for what + JSON data is required for a given application and how it can be + modified, much like what XML Schema provides for XML. JSON Schema is + intended to provide validation, documentation, and interaction control + of JSON data. + . + This package provides the documentation. + Package: python3-jsonschema Architecture: all Depends: - python3 (>= 3.2.3), + python3, python3-pkg-resources, ${misc:Depends}, ${python3:Depends}, +Suggests: + python-jsonschema-doc, Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 3.x JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what diff --git a/debian/python-jsonschema-doc.doc-base b/debian/python-jsonschema-doc.doc-base new file mode 100644 index 00000000..ac84ab1d --- /dev/null +++ b/debian/python-jsonschema-doc.doc-base @@ -0,0 +1,9 @@ +Document: python-jsonschema-doc +Title: python-jsonschema-doc Documentation +Author: OpenStack +Abstract: Sphinx documentation for python-jsonschema-doc +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/python-jsonschema-doc/html/index.html +Files: /usr/share/doc/python-jsonschema-doc/html/* diff --git a/debian/rules b/debian/rules index 8532cf1a..e94c9ba6 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ include /usr/share/openstack-pkg-tools/pkgos.make export PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1) %: - dh $@ --with python2,python3 + dh $@ --with python2,python3,sphinxdoc override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) @@ -34,3 +34,9 @@ override_dh_auto_clean: #http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 dh_auto_clean rm -rf build version.txt rm -rf __pycache__ + +override_dh_sphinxdoc: +ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) + PYTHONPATH=$(CURDIR) PYTHON=python3 python3 -m sphinx $(SPHINXOPTS) -b html docs $(CURDIR)/debian/python-jsonschema-doc/usr/share/doc/python-jsonschema-doc/html + dh_sphinxdoc +endif -- GitLab From 6d823f702d11d119c29fff5c5c000bedd6d2f7d7 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 6 Sep 2018 00:43:23 +0200 Subject: [PATCH 71/79] Fix py3 runtime depends. --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index b04085c0..25e3684c 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Architecture: all Depends: python-functools32, python-mock, - python3-pkg-resources, + python-pkg-resources, ${misc:Depends}, ${python:Depends}, Suggests: @@ -69,7 +69,6 @@ Description: An(other) implementation of JSON Schema (Draft 3 and 4) - doc Package: python3-jsonschema Architecture: all Depends: - python3, python3-pkg-resources, ${misc:Depends}, ${python3:Depends}, -- GitLab From 375268adc09f4e350db8be7e082dcce5d19aa7bc Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 7 Sep 2018 09:04:34 +0200 Subject: [PATCH 72/79] * Define http{s,}_proxy when building the doc to avoid internet connection during the doc build (Closes: #908152). --- debian/changelog | 7 +++++++ debian/rules | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7bf2931a..e5973abf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-jsonschema (2.6.0-4) unstable; urgency=medium + + * Define http{s,}_proxy when building the doc to avoid internet connection + during the doc build (Closes: #908152). + + -- Thomas Goirand Fri, 07 Sep 2018 09:03:51 +0200 + python-jsonschema (2.6.0-3) unstable; urgency=medium [ Ondřej Nový ] diff --git a/debian/rules b/debian/rules index e94c9ba6..978e40da 100755 --- a/debian/rules +++ b/debian/rules @@ -37,6 +37,6 @@ override_dh_auto_clean: override_dh_sphinxdoc: ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) - PYTHONPATH=$(CURDIR) PYTHON=python3 python3 -m sphinx $(SPHINXOPTS) -b html docs $(CURDIR)/debian/python-jsonschema-doc/usr/share/doc/python-jsonschema-doc/html + http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 HTTP_PROXY=127.0.0.1:9 HTTPS_PROXY=127.0.0.1:9 PYTHONPATH=$(CURDIR) PYTHON=python3 python3 -m sphinx $(SPHINXOPTS) -b html docs $(CURDIR)/debian/python-jsonschema-doc/usr/share/doc/python-jsonschema-doc/html dh_sphinxdoc endif -- GitLab From f5f7e5aa8b2cfb27e0b7b12cafd184cec95da661 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 7 Sep 2018 09:06:00 +0200 Subject: [PATCH 73/79] Add do-not-access-internet-during-doc-build.patch --- debian/changelog | 1 + ...not-access-internet-during-doc-build.patch | 1332 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 1334 insertions(+) create mode 100644 debian/patches/do-not-access-internet-during-doc-build.patch diff --git a/debian/changelog b/debian/changelog index e5973abf..1d5fbecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-jsonschema (2.6.0-4) unstable; urgency=medium * Define http{s,}_proxy when building the doc to avoid internet connection during the doc build (Closes: #908152). + * Add do-not-access-internet-during-doc-build.patch. -- Thomas Goirand Fri, 07 Sep 2018 09:03:51 +0200 diff --git a/debian/patches/do-not-access-internet-during-doc-build.patch b/debian/patches/do-not-access-internet-during-doc-build.patch new file mode 100644 index 00000000..e8530864 --- /dev/null +++ b/debian/patches/do-not-access-internet-during-doc-build.patch @@ -0,0 +1,1332 @@ +Description: Do not access internet during doc build +Author: Thomas Goirand +Bug-Debian: https://bugs.debian.org/908152 +Forwarded: not-needed +Last-Update: 2018-09-07 + +--- python-jsonschema-2.6.0.orig/docs/jsonschema_role.py ++++ python-jsonschema-2.6.0/docs/jsonschema_role.py +@@ -53,15 +53,6 @@ + if error.errno != errno.ENOENT: + raise + +- request = urllib.Request(VALIDATION_SPEC, headers=headers) +- response = urllib.urlopen(request) +- +- if response.code == 200: +- with open(spec_path, "w+b") as spec: +- spec.writelines(response) +- spec.seek(0) +- return html.parse(spec) +- + with open(spec_path) as spec: + return html.parse(spec) + +--- a/_cache/spec.html 2018-09-05 18:14:21.691217237 +0200 ++++ b/_cache/spec.html 2018-09-07 09:21:51.918024100 +0200 +@@ -0,0 +1,1305 @@ ++ ++ ++ ++ ++ ++ ++ JSON Schema Validation: A Vocabulary for Structural Validation of JSON ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
Internet Engineering Task ForceA. Wright, Ed.
Internet-Draft
Intended status: InformationalH. Andrews, Ed.
Expires: September 20, 2018Cloudflare, Inc.
G. Luff
March 19, 2018
++ ++

JSON Schema Validation: A Vocabulary for Structural Validation of JSON
++ draft-handrews-json-schema-validation-01

++ ++

++ Abstract ++

++

JSON Schema (application/schema+json) has several purposes, one of which is JSON instance validation. This document specifies a vocabulary for JSON Schema to describe the meaning of JSON documents, provide hints for user interfaces working with JSON data, and to make assertions about what a valid document must look like.

++

++ Note to Readers ++

++

The issues list for this draft can be found at <https://github.com/json-schema-org/json-schema-spec/issues>.

++

For additional information, see <http://json-schema.org/>.

++

To provide feedback, use this issue tracker, the communication methods listed on the homepage, or email the document editors.

++

++ Status of This Memo ++

++

This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79.

++

Internet-Drafts are working documents of the Internet Engineering Task Force (IETF). Note that other groups may also distribute working documents as Internet-Drafts. The list of current Internet-Drafts is at http://datatracker.ietf.org/drafts/current/.

++

Internet-Drafts are draft documents valid for a maximum of six months and may be updated, replaced, or obsoleted by other documents at any time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress."

++

This Internet-Draft will expire on September 20, 2018.

++

++ Copyright Notice ++

++

Copyright (c) 2018 IETF Trust and the persons identified as the document authors. All rights reserved.

++

This document is subject to BCP 78 and the IETF Trust's Legal Provisions Relating to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of publication of this document. Please review these documents carefully, as they describe your rights and restrictions with respect to this document. Code Components extracted from this document must include Simplified BSD License text as described in Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License.

++ ++ ++
++

Table of Contents

++ ++ ++

1. Introduction

++

JSON Schema can be used to require that a given JSON document (an instance) satisfies a certain number of criteria. These criteria are asserted by using keywords described in this specification. In addition, a set of keywords is also defined to assist in interactive user interface instance generation.

++

This specification will use the concepts, syntax, and terminology defined by the JSON Schema core [json-schema] specification.

++

2. Conventions and Terminology

++

The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in RFC 2119 [RFC2119].

++

This specification uses the term "container instance" to refer to both array and object instances. It uses the term "children instances" to refer to array elements or object member values.

++

Elements in an array value are said to be unique if no two elements of this array are equal [json-schema].

++

3. Overview

++

JSON Schema validation applies schemas to locations within the instance, and asserts constraints on the structure of the data at each location. An instance location that satisfies all asserted constraints is then annotated with any keywords that contain non-assertion information, such as descriptive metadata and usage hints. If all locations within the instance satisfy all asserted constraints, then the instance is said to be valid against the schema.

++

Each schema object is independently evaluated against each instance location to which it applies. This greatly simplifies the implementation requirements for validators by ensuring that they do not need to maintain state across the document-wide validation process.

++

3.1. Applicability

++

Validation begins by applying the root schema to the complete instance document. From there, various keywords are used to determine which additional subschemas are applied to either the current location, or a child location. These keywords also define whether and how subschema assertion results are modified and/or combined. Such keywords do not assert conditions on their own. Rather, they control how assertions are applied and evaluated.

++

The keywords in the boolean logic [logic] and conditional [conditional] sections of this specification apply subschemas to the same location as the parent schema. The former group defines boolean operations on the subschema assertion results, while the latter evaluates one subschema and uses its assertion results to determine which of two other subschemas to apply as well.

++

Several keywords determine which subschemas are applied to array items, object property values, and object property names. They are: "items", "additionalItems", "contains", "properties", "patternProperties", "additionalProperties", and "propertyNames". The "contains" keyword only requires its subschema to be valid against at least one child instance, while the other keywords require that all subschemas are valid against all child instances to which they apply.

++

3.1.1. Keyword Independence

++

Validation keywords typically operate independently, without affecting each other's outcomes.

++

For schema author convenience, there are some exceptions among the keywords that control subschema applicability:

++ ++
    ++
  • "additionalProperties", whose behavior is defined in terms of "properties" and "patternProperties"; and
    • ++
  • "additionalItems", whose behavior is defined in terms of "items".
    • ++
++ ++

++

3.2. Assertions

++

Validation is a process of checking assertions. Each assertion adds constraints that an instance must satisfy in order to successfully validate.

++

Assertion keywords that are absent never restrict validation. In some cases, this no-op behavior is identical to a keyword that exists with certain values, and these values are noted where known.

++

All of the keywords in the general [general], numeric [numeric], and string [string] sections are assertions, as well as "minItems", "maxItems", "uniqueItems", "minProperties", "maxProperties", and "required". Additionally, "dependencies" is shorthand for a combination of conditional and assertion keywords.

++

The "format", "contentType", and "contentEncoding" keywords can also be implemented as assertions, although that functionality is an optional part of this specification, and the keywords convey additional non-assertion information.

++

3.2.1. Assertions and Instance Primitive Types

++

Most validation assertions only constrain values within a certain primitive type. When the type of the instance is not of the type targeted by the keyword, the instance is considered to conform to the assertion.

++

For example, the "maxLength" keyword will only restrict certain strings (that are too long) from being valid. If the instance is a number, boolean, null, array, or object, then it is valid against this assertion.

++

3.3. Annotations

++

In addition to assertions, this specification provides a small vocabulary of metadata keywords that can be used to annotate the JSON instance with useful information. The Section 7 and Section 8 keywords are also useful as annotations as well as being optional assertions, as they convey additional usage guidance for the instance data.

++

A schema that is applicable to a particular location in the instance, against which the instance location is valid, attaches its annotations to that location in the instance. Since many subschemas can be applicable to any single location, annotation keywords need to specify any unusual handling of multiple applicable occurrences of the keyword with different values. The default behavior is simply to collect all values.

++

Additional vocabularies SHOULD make use of this mechanism for applying their own annotations to instances.

++

3.3.1. Annotations and Validation Outcomes

++

Annotations are collected whenever an instance is valid against a schema object, and all of that schema object's parent schemas.

++

In particular, annotations in a subschema contained within a "not", at any depth, including any number of intervening additional "not" subschemas, MUST be ignored. If the instance was valid against the "not" subschema, then by definition it is not valid against the schema that contains the "not", so the "not" subschema's annotations are not used.

++

Similarly, annotations within a failing branch of a "oneOf", "anyOf", "then", or "else" MUST be ignored even when the instance successfully validates against the complete schema document.

++

3.3.2. Annotations and Short-Circuit Validation

++

Annotation keywords MUST be applied to all possible sub-instances. Even if such application can be short-circuited when only assertion evaluation is needed. For instance, the "contains" keyword need only be checked for assertions until at least one array item proves valid. However, when working with annotations, all items in the array must be evaluated to determine all items with which the annotations should be associated.

++

4. Interoperability Considerations

++

4.1. Validation of String Instances

++

It should be noted that the nul character (\u0000) is valid in a JSON string. An instance to validate may contain a string value with this character, regardless of the ability of the underlying programming language to deal with such data.

++

4.2. Validation of Numeric Instances

++

The JSON specification allows numbers with arbitrary precision, and JSON Schema does not add any such bounds. This means that numeric instances processed by JSON Schema can be arbitrarily large and/or have an arbitrarily long decimal part, regardless of the ability of the underlying programming language to deal with such data.

++

4.3. Regular Expressions

++

Two validation keywords, "pattern" and "patternProperties", use regular expressions to express constraints, and the "regex" value for the "format" keyword constrains the instance value to be a regular expression. These regular expressions SHOULD be valid according to the ECMA 262 [ecma262] regular expression dialect.

++

Furthermore, given the high disparity in regular expression constructs support, schema authors SHOULD limit themselves to the following regular expression tokens:

++ ++
    ++
  • individual Unicode characters, as defined by the JSON specification [RFC7159];
    • ++
  • simple character classes ([abc]), range character classes ([a-z]);
    • ++
  • complemented character classes ([^abc], [^a-z]);
    • ++
  • simple quantifiers: "+" (one or more), "*" (zero or more), "?" (zero or one), and their lazy versions ("+?", "*?", "??");
    • ++
  • range quantifiers: "{x}" (exactly x occurrences), "{x,y}" (at least x, at most y, occurrences), {x,} (x occurrences or more), and their lazy versions;
    • ++
  • the beginning-of-input ("^") and end-of-input ("$") anchors;
    • ++
  • simple grouping ("(...)") and alternation ("|").
    • ++
++ ++

++

Finally, implementations MUST NOT take regular expressions to be anchored, neither at the beginning nor at the end. This means, for instance, the pattern "es" matches "expression".

++

5. Meta-Schema

++

The current URI for the JSON Schema Validation is <http://json-schema.org/draft-07/schema#>.

++

6. Validation Keywords

++

Validation keywords in a schema impose requirements for successful validation of an instance.

++

6.1. Validation Keywords for Any Instance Type

++

6.1.1. type

++

The value of this keyword MUST be either a string or an array. If it is an array, elements of the array MUST be strings and MUST be unique.

++

String values MUST be one of the six primitive types ("null", "boolean", "object", "array", "number", or "string"), or "integer" which matches any number with a zero fractional part.

++

An instance validates if and only if the instance is in any of the sets listed for this keyword.

++

6.1.2. enum

++

The value of this keyword MUST be an array. This array SHOULD have at least one element. Elements in the array SHOULD be unique.

++

An instance validates successfully against this keyword if its value is equal to one of the elements in this keyword's array value.

++

Elements in the array might be of any value, including null.

++

6.1.3. const

++

The value of this keyword MAY be of any type, including null.

++

An instance validates successfully against this keyword if its value is equal to the value of the keyword.

++

6.2. Validation Keywords for Numeric Instances (number and integer)

++

6.2.1. multipleOf

++

The value of "multipleOf" MUST be a number, strictly greater than 0.

++

A numeric instance is valid only if division by this keyword's value results in an integer.

++

6.2.2. maximum

++

The value of "maximum" MUST be a number, representing an inclusive upper limit for a numeric instance.

++

If the instance is a number, then this keyword validates only if the instance is less than or exactly equal to "maximum".

++

6.2.3. exclusiveMaximum

++

The value of "exclusiveMaximum" MUST be number, representing an exclusive upper limit for a numeric instance.

++

If the instance is a number, then the instance is valid only if it has a value strictly less than (not equal to) "exclusiveMaximum".

++

6.2.4. minimum

++

The value of "minimum" MUST be a number, representing an inclusive lower limit for a numeric instance.

++

If the instance is a number, then this keyword validates only if the instance is greater than or exactly equal to "minimum".

++

6.2.5. exclusiveMinimum

++

The value of "exclusiveMinimum" MUST be number, representing an exclusive lower limit for a numeric instance.

++

If the instance is a number, then the instance is valid only if it has a value strictly greater than (not equal to) "exclusiveMinimum".

++

6.3. Validation Keywords for Strings

++

6.3.1. maxLength

++

The value of this keyword MUST be a non-negative integer.

++

A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword.

++

The length of a string instance is defined as the number of its characters as defined by RFC 7159 [RFC7159].

++

6.3.2. minLength

++

The value of this keyword MUST be a non-negative integer.

++

A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.

++

The length of a string instance is defined as the number of its characters as defined by RFC 7159 [RFC7159].

++

Omitting this keyword has the same behavior as a value of 0.

++

6.3.3. pattern

++

The value of this keyword MUST be a string. This string SHOULD be a valid regular expression, according to the ECMA 262 regular expression dialect.

++

A string instance is considered valid if the regular expression matches the instance successfully. Recall: regular expressions are not implicitly anchored.

++

6.4. Validation Keywords for Arrays

++

6.4.1. items

++

The value of "items" MUST be either a valid JSON Schema or an array of valid JSON Schemas.

++

This keyword determines how child instances validate for arrays, and does not directly validate the immediate instance itself.

++

If "items" is a schema, validation succeeds if all elements in the array successfully validate against that schema.

++

If "items" is an array of schemas, validation succeeds if each element of the instance validates against the schema at the same position, if any.

++

Omitting this keyword has the same behavior as an empty schema.

++

6.4.2. additionalItems

++

The value of "additionalItems" MUST be a valid JSON Schema.

++

This keyword determines how child instances validate for arrays, and does not directly validate the immediate instance itself.

++

If "items" is an array of schemas, validation succeeds if every instance element at a position greater than the size of "items" validates against "additionalItems".

++

Otherwise, "additionalItems" MUST be ignored, as the "items" schema (possibly the default value of an empty schema) is applied to all elements.

++

Omitting this keyword has the same behavior as an empty schema.

++

6.4.3. maxItems

++

The value of this keyword MUST be a non-negative integer.

++

An array instance is valid against "maxItems" if its size is less than, or equal to, the value of this keyword.

++

6.4.4. minItems

++

The value of this keyword MUST be a non-negative integer.

++

An array instance is valid against "minItems" if its size is greater than, or equal to, the value of this keyword.

++

Omitting this keyword has the same behavior as a value of 0.

++

6.4.5. uniqueItems

++

The value of this keyword MUST be a boolean.

++

If this keyword has boolean value false, the instance validates successfully. If it has boolean value true, the instance validates successfully if all of its elements are unique.

++

Omitting this keyword has the same behavior as a value of false.

++

6.4.6. contains

++

The value of this keyword MUST be a valid JSON Schema.

++

An array instance is valid against "contains" if at least one of its elements is valid against the given schema.

++

6.5. Validation Keywords for Objects

++

6.5.1. maxProperties

++

The value of this keyword MUST be a non-negative integer.

++

An object instance is valid against "maxProperties" if its number of properties is less than, or equal to, the value of this keyword.

++

6.5.2. minProperties

++

The value of this keyword MUST be a non-negative integer.

++

An object instance is valid against "minProperties" if its number of properties is greater than, or equal to, the value of this keyword.

++

Omitting this keyword has the same behavior as a value of 0.

++

6.5.3. required

++

The value of this keyword MUST be an array. Elements of this array, if any, MUST be strings, and MUST be unique.

++

An object instance is valid against this keyword if every item in the array is the name of a property in the instance.

++

Omitting this keyword has the same behavior as an empty array.

++

6.5.4. properties

++

The value of "properties" MUST be an object. Each value of this object MUST be a valid JSON Schema.

++

This keyword determines how child instances validate for objects, and does not directly validate the immediate instance itself.

++

Validation succeeds if, for each name that appears in both the instance and as a name within this keyword's value, the child instance for that name successfully validates against the corresponding schema.

++

Omitting this keyword has the same behavior as an empty object.

++

6.5.5. patternProperties

++

The value of "patternProperties" MUST be an object. Each property name of this object SHOULD be a valid regular expression, according to the ECMA 262 regular expression dialect. Each property value of this object MUST be a valid JSON Schema.

++

This keyword determines how child instances validate for objects, and does not directly validate the immediate instance itself. Validation of the primitive instance type against this keyword always succeeds.

++

Validation succeeds if, for each instance name that matches any regular expressions that appear as a property name in this keyword's value, the child instance for that name successfully validates against each schema that corresponds to a matching regular expression.

++

Omitting this keyword has the same behavior as an empty object.

++

6.5.6. additionalProperties

++

The value of "additionalProperties" MUST be a valid JSON Schema.

++

This keyword determines how child instances validate for objects, and does not directly validate the immediate instance itself.

++

Validation with "additionalProperties" applies only to the child values of instance names that do not match any names in "properties", and do not match any regular expression in "patternProperties".

++

For all such properties, validation succeeds if the child instance validates against the "additionalProperties" schema.

++

Omitting this keyword has the same behavior as an empty schema.

++

6.5.7. dependencies

++

[CREF1]This keyword may be split into two, with the variation that uses an array of property names rather than a subschema getting a new name. The dual behavior is confusing and relatively difficult to implement. In the previous draft, we proposed dropping the keyword altogether, or dropping one of its forms, but we received feedback in support of keeping it. See issues #442 and #528 at <https://github.com/json-schema-org/json-schema-spec/issues> for further discussion. Further feedback is encouraged.

++

This keyword specifies rules that are evaluated if the instance is an object and contains a certain property.

++

This keyword's value MUST be an object. Each property specifies a dependency. Each dependency value MUST be an array or a valid JSON Schema.

++

If the dependency value is a subschema, and the dependency key is a property in the instance, the entire instance must validate against the dependency value.

++

If the dependency value is an array, each element in the array, if any, MUST be a string, and MUST be unique. If the dependency key is a property in the instance, each of the items in the dependency value must be a property that exists in the instance.

++

Omitting this keyword has the same behavior as an empty object.

++

6.5.8. propertyNames

++

The value of "propertyNames" MUST be a valid JSON Schema.

++

If the instance is an object, this keyword validates if every property name in the instance validates against the provided schema. Note the property name that the schema is testing will always be a string.

++

Omitting this keyword has the same behavior as an empty schema.

++

6.6. Keywords for Applying Subschemas Conditionally

++

These keywords work together to implement conditional application of a subschema based on the outcome of another subschema.

++

These keywords MUST NOT interact with each other across subschema boundaries. In other words, an "if" in one branch of an "allOf" MUST NOT have an impact on a "then" or "else" in another branch.

++

There is no default behavior for any of these keywords when they are not present. In particular, they MUST NOT be treated as if present with an empty schema, and when "if" is not present, both "then" and "else" MUST be entirely ignored.

++

6.6.1. if

++

This keyword's value MUST be a valid JSON Schema.

++

This validation outcome of this keyword's subschema has no direct effect on the overall validation result. Rather, it controls which of the "then" or "else" keywords are evaluated.

++

Instances that successfully validate against this keyword's subschema MUST also be valid against the subschema value of the "then" keyword, if present.

++

Instances that fail to validate against this keyword's subschema MUST also be valid against the subschema value of the "else" keyword, if present.

++

If annotations [annotations] are being collected, they are collected from this keyword's subschema in the usual way, including when the keyword is present without either "then" or "else".

++

6.6.2. then

++

This keyword's value MUST be a valid JSON Schema.

++

When "if" is present, and the instance successfully validates against its subschema, then valiation succeeds against this keyword if the instance also successfully validates against this keyword's subschema.

++

This keyword has no effect when "if" is absent, or when the instance fails to validate against its subschema. Implementations MUST NOT evaluate the instance against this keyword, for either validation or annotation collection purposes, in such cases.

++

6.6.3. else

++

This keyword's value MUST be a valid JSON Schema.

++

When "if" is present, and the instance fails to validate against its subschema, then valiation succeeds against this keyword if the instance successfully validates against this keyword's subschema.

++

This keyword has no effect when "if" is absent, or when the instance successfully validates against its subschema. Implementations MUST NOT evaluate the instance against this keyword, for either validation or annotation collection purposes, in such cases.

++

6.7. Keywords for Applying Subschemas With Boolean Logic

++

6.7.1. allOf

++

This keyword's value MUST be a non-empty array. Each item of the array MUST be a valid JSON Schema.

++

An instance validates successfully against this keyword if it validates successfully against all schemas defined by this keyword's value.

++

6.7.2. anyOf

++

This keyword's value MUST be a non-empty array. Each item of the array MUST be a valid JSON Schema.

++

An instance validates successfully against this keyword if it validates successfully against at least one schema defined by this keyword's value.

++

6.7.3. oneOf

++

This keyword's value MUST be a non-empty array. Each item of the array MUST be a valid JSON Schema.

++

An instance validates successfully against this keyword if it validates successfully against exactly one schema defined by this keyword's value.

++

6.7.4. not

++

This keyword's value MUST be a valid JSON Schema.

++

An instance is valid against this keyword if it fails to validate successfully against the schema defined by this keyword.

++

7. Semantic Validation With "format"

++

7.1. Foreword

++

Structural validation alone may be insufficient to validate that an instance meets all the requirements of an application. The "format" keyword is defined to allow interoperable semantic validation for a fixed subset of values which are accurately described by authoritative resources, be they RFCs or other external specifications.

++

The value of this keyword is called a format attribute. It MUST be a string. A format attribute can generally only validate a given set of instance types. If the type of the instance to validate is not in this set, validation for this format attribute and instance SHOULD succeed.

++

7.2. Implementation Requirements

++

The "format" keyword functions as both an annotation (Section 3.3) and as an assertion (Section 3.2). While no special effort is required to implement it as an annotation conveying semantic meaning, implementing validation is non-trivial.

++

Implementations MAY support the "format" keyword as a validation assertion. Should they choose to do so:

++ ++
    ++
  • they SHOULD implement validation for attributes defined below;
    • ++
  • they SHOULD offer an option to disable validation for this keyword.
    • ++
++ ++

++

Implementations MAY add custom format attributes. Save for agreement between parties, schema authors SHALL NOT expect a peer implementation to support this keyword and/or custom format attributes.

++

7.3. Defined Formats

++

7.3.1. Dates and Times

++

These attributes apply to string instances.

++

Date and time format names are derived from RFC 3339, section 5.6 [RFC3339].

++

Implementations supporting formats SHOULD implement support for the following attributes:

++ ++
++
date-time:
++
A string instance is valid against this attribute if it is a valid representation according to the "date-time" production.
++
date:
++
A string instance is valid against this attribute if it is a valid representation according to the "full-date" production.
++
time:
++
A string instance is valid against this attribute if it is a valid representation according to the "full-time" production.
++
++ ++

++

Implementations MAY support additional attributes using the other production names defined in that section. If "full-date" or "full-time" are implemented, the corresponding short form ("date" or "time" respectively) MUST be implemented, and MUST behave identically. Implementations SHOULD NOT define extension attributes with any name matching an RFC 3339 production unless it validates according to the rules of that production. [CREF2]There is not currently consensus on the need for supporting all RFC 3339 formats, so this approach of reserving the namespace will encourage experimentation without committing to the entire set. Either the format implementation requirements will become more flexible in general, or these will likely either be promoted to fully specified attributes or dropped.

++

7.3.2. Email Addresses

++

These attributes apply to string instances.

++

A string instance is valid against these attributes if it is a valid Internet email address as follows:

++ ++
++
email:
++
As defined by RFC 5322, section 3.4.1 [RFC5322].
++
idn-email:
++
As defined by RFC 6531 [RFC6531]
++
++ ++

Note that all strings valid against the "email" attribute are also valid against the "idn-email" attribute.

++

7.3.3. Hostnames

++

These attributes apply to string instances.

++

A string instance is valid against these attributes if it is a valid representation for an Internet hostname as follows:

++ ++
++
hostname:
++
As defined by RFC 1034, section 3.1 [RFC1034], including host names produced using the Punycode algorithm specified in RFC 5891, section 4.4 [RFC5891].
++
idn-hostname:
++
As defined by either RFC 1034 as for hostname, or an internationalized hostname as defined by RFC 5890, section 2.3.2.3 [RFC5890].
++
++ ++

Note that all strings valid against the "hostname" attribute are also valid against the "idn-hostname" attribute.

++

7.3.4. IP Addresses

++

These attributes apply to string instances.

++

A string instance is valid against these attributes if it is a valid representation of an IP address as follows:

++ ++
++
ipv4:
++
An IPv4 address according to the "dotted-quad" ABNF syntax as defined in RFC 2673, section 3.2 [RFC2673].
++
ipv6:
++
An IPv6 address as defined in RFC 4291, section 2.2 [RFC4291].
++
++ ++

++

7.3.5. Resource Identifiers

++

These attributes apply to string instances.

++

++ ++

++
uri:
++
A string instance is valid against this attribute if it is a valid URI, according to [RFC3986].
++
uri-reference:
++
A string instance is valid against this attribute if it is a valid URI Reference (either a URI or a relative-reference), according to [RFC3986].
++
iri:
++
A string instance is valid against this attribute if it is a valid IRI, according to [RFC3987].
++
iri-reference:
++
A string instance is valid against this attribute if it is a valid IRI Reference (either an IRI or a relative-reference), according to [RFC3987].
++
++ ++

Note that all valid URIs are valid IRIs, and all valid URI References are also valid IRI References.

++

7.3.6. uri-template

++

This attribute applies to string instances.

++

A string instance is valid against this attribute if it is a valid URI Template (of any level), according to [RFC6570].

++

Note that URI Templates may be used for IRIs; there is no separate IRI Template specification.

++

7.3.7. JSON Pointers

++

These attributes apply to string instances.

++

++ ++

++
json-pointer:
++
A string instance is valid against this attribute if it is a valid JSON string representation of a JSON Pointer, according to RFC 6901, section 5 [RFC6901].
++
relative-json-pointer:
++
A string instance is valid against this attribute if it is a valid Relative JSON Pointer [relative-json-pointer].
++
++ ++

To allow for both absolute and relative JSON Pointers, use "anyOf" or "oneOf" to indicate support for either format.

++

7.3.8. regex

++

This attribute applies to string instances.

++

A regular expression, which SHOULD be valid according to the ECMA 262 [ecma262] regular expression dialect.

++

Implementations that validate formats MUST accept at least the subset of ECMA 262 defined in the Regular Expressions [regexInterop] section of this specification, and SHOULD accept all valid ECMA 262 expressions.

++

8. String-Encoding Non-JSON Data

++

8.1. Foreword

++

Properties defined in this section indicate that an instance contains non-JSON data encoded in a JSON string. They describe the type of content and how it is encoded.

++

These properties provide additional information required to interpret JSON data as rich multimedia documents.

++

8.2. Implementation Requirements

++

The content keywords function as both annotations (Section 3.3) and as assertions (Section 3.2). While no special effort is required to implement them as annotations conveying how applications can interpret the data in the string, implementing validation of conformance to the media type and encoding is non-trivial.

++

Implementations MAY support the "contentMediaType" and "contentEncoding" keywords as validation assertions. Should they choose to do so, they SHOULD offer an option to disable validation for these keywords.

++

8.3. contentEncoding

++

If the instance value is a string, this property defines that the string SHOULD be interpreted as binary data and decoded using the encoding named by this property. RFC 2045, Sec 6.1 [RFC2045] lists the possible values for this property.

++

The value of this property MUST be a string.

++

The value of this property SHOULD be ignored if the instance described is not a string.

++

8.4. contentMediaType

++

The value of this property must be a media type, as defined by RFC 2046 [RFC2046]. This property defines the media type of instances which this schema defines.

++

The value of this property MUST be a string.

++

The value of this property SHOULD be ignored if the instance described is not a string.

++

If the "contentEncoding" property is not present, but the instance value is a string, then the value of this property SHOULD specify a text document type, and the character set SHOULD be the character set into which the JSON string value was decoded (for which the default is Unicode).

++

8.5. Example

++

Here is an example schema, illustrating the use of "contentEncoding" and "contentMediaType":

++
++
++{
++    "type": "string",
++    "contentEncoding": "base64",
++    "contentMediaType": "image/png"
++}
++
++
++

Instances described by this schema should be strings, and their values should be interpretable as base64-encoded PNG images.

++

Another example:

++
++
++{
++    "type": "string",
++    "contentMediaType": "text/html"
++}
++
++
++

Instances described by this schema should be strings containing HTML, using whatever character set the JSON string was decoded into (default is Unicode).

++

9. Schema Re-Use With "definitions"

++

The "definitions" keywords provides a standardized location for schema authors to inline re-usable JSON Schemas into a more general schema. The keyword does not directly affect the validation result.

++

This keyword's value MUST be an object. Each member value of this object MUST be a valid JSON Schema.

++
++
++{
++    "type": "array",
++    "items": { "$ref": "#/definitions/positiveInteger" },
++    "definitions": {
++        "positiveInteger": {
++            "type": "integer",
++            "exclusiveMinimum": 0
++        }
++    }
++}
++
++
++

As an example, here is a schema describing an array of positive integers, where the positive integer constraint is a subschema in "definitions":

++

10. Schema Annotations

++

Schema validation is a useful mechanism for annotating instance data with additional information. The rules for determining when and how annotations are associated with an instance are outlined in section 3.3.

++

These general-purpose annotation keywords provide commonly used information for documentation and user interface display purposes. They are not intended to form a comprehensive set of features. Rather, additional vocabularies can be defined for more complex annotation-based applications.

++

10.1. "title" and "description"

++

The value of both of these keywords MUST be a string.

++

Both of these keywords can be used to decorate a user interface with information about the data produced by this user interface. A title will preferably be short, whereas a description will provide explanation about the purpose of the instance described by this schema.

++

10.2. "default"

++

There are no restrictions placed on the value of this keyword. When multiple occurrences of this keyword are applicable to a single sub-instance, implementations SHOULD remove duplicates.

++

This keyword can be used to supply a default JSON value associated with a particular schema. It is RECOMMENDED that a default value be valid against the associated schema.

++

10.3. "readOnly" and "writeOnly"

++

The value of these keywords MUST be a boolean. When multiple occurrences of these keywords are applicable to a single sub-instance, the resulting value MUST be true if any occurrence specifies a true value, and MUST be false otherwise.

++

If "readOnly" has a value of boolean true, it indicates that the value of the instance is managed exclusively by the owning authority, and attempts by an application to modify the value of this property are expected to be ignored or rejected by that owning authority.

++

An instance document that is marked as "readOnly for the entire document MAY be ignored if sent to the owning authority, or MAY result in an error, at the authority's discretion.

++

If "writeOnly" has a value of boolean true, it indicates that the value is never present when the instance is retrieved from the owning authority. It can be present when sent to the owning authority to update or create the document (or the resource it represents), but it will not be included in any updated or newly created version of the instance.

++

An instance document that is marked as "writeOnly" for the entire document MAY be returned as a blank document of some sort, or MAY produce an error upon retrieval, or have the retrieval request ignored, at the authority's discretion.

++

For example, "readOnly" would be used to mark a database-generated serial number as read-only, while "writeOnly" would be used to mark a password input field.

++

These keywords can be used to assist in user interface instance generation. In particular, an application MAY choose to use a widget that hides input values as they are typed for write-only fields.

++

Omitting these keywords has the same behavior as values of false.

++

10.4. "examples"

++

The value of this keyword MUST be an array. There are no restrictions placed on the values within the array. When multiple occurrences of this keyword are applicable to a single sub-instance, implementations MUST provide a flat array of all values rather than an array of arrays.

++

This keyword can be used to provide sample JSON values associated with a particular schema, for the purpose of illustrating usage. It is RECOMMENDED that these values be valid against the associated schema.

++

Implementations MAY use the value(s) of "default", if present, as an additional example. If "examples" is absent, "default" MAY still be used in this manner.

++

11. Security Considerations

++

JSON Schema validation defines a vocabulary for JSON Schema core and concerns all the security considerations listed there.

++

JSON Schema validation allows the use of Regular Expressions, which have numerous different (often incompatible) implementations. Some implementations allow the embedding of arbitrary code, which is outside the scope of JSON Schema and MUST NOT be permitted. Regular expressions can often also be crafted to be extremely expensive to compute (with so-called "catastrophic backtracking"), resulting in a denial-of-service attack.

++

Implementations that support validating or otherwise evaluating instance string data based on "contentEncoding" and/or "contentMediaType" are at risk of evaluating data in an unsafe way based on misleading information. Applications can mitigate this risk by only performing such processing when a relationship between the schema and instance is established (e.g., they share the same authority).

++

Processing a media type or encoding is subject to the security considerations of that media type or encoding. For example, the security considerations of RFC 4329 Scripting Media Types [RFC4329] apply when processing JavaScript or ECMAScript encoded within a JSON string.

++

12. References

++

12.1. Normative References

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ , " ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
++ [RFC2119] ++ Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997.
++ [RFC1034] ++ Mockapetris, P., "Domain names - concepts and facilities", STD 13, RFC 1034, DOI 10.17487/RFC1034, November 1987.
++ [RFC2045] ++ Freed, N. and N. Borenstein, "Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies", RFC 2045, DOI 10.17487/RFC2045, November 1996.
++ [RFC2046] ++ Freed, N. and N. Borenstein, "Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types", RFC 2046, DOI 10.17487/RFC2046, November 1996.
++ [RFC2673] ++ Crawford, M., "Binary Labels in the Domain Name System", RFC 2673, DOI 10.17487/RFC2673, August 1999.
++ [RFC3339] ++ Klyne, G. and C. Newman, "Date and Time on the Internet: Timestamps", RFC 3339, DOI 10.17487/RFC3339, July 2002.
++ [RFC3986] ++ Berners-Lee, T., Fielding, R. and L. Masinter, "Uniform Resource Identifier (URI): Generic Syntax", STD 66, RFC 3986, DOI 10.17487/RFC3986, January 2005.
++ [RFC3987] ++ Duerst, M. and M. Suignard, "Internationalized Resource Identifiers (IRIs)", RFC 3987, DOI 10.17487/RFC3987, January 2005.
++ [RFC4291] ++ Hinden, R. and S. Deering, "IP Version 6 Addressing Architecture", RFC 4291, DOI 10.17487/RFC4291, February 2006.
++ [RFC5322] ++ Resnick, P., "Internet Message Format", RFC 5322, DOI 10.17487/RFC5322, October 2008.
++ [RFC5890] ++ Klensin, J., "Internationalized Domain Names for Applications (IDNA): Definitions and Document Framework", RFC 5890, DOI 10.17487/RFC5890, August 2010.
++ [RFC5891] ++ Klensin, J., "Internationalized Domain Names in Applications (IDNA): Protocol", RFC 5891, DOI 10.17487/RFC5891, August 2010.
++ [RFC6570] ++ Gregorio, J., Fielding, R., Hadley, M., Nottingham, M. and D. Orchard, "URI Template", RFC 6570, DOI 10.17487/RFC6570, March 2012.
++ [RFC6531] ++ Yao, J. and W. Mao, "SMTP Extension for Internationalized Email", RFC 6531, DOI 10.17487/RFC6531, February 2012.
++ [RFC6901] ++ Bryan, P., Zyp, K. and M. Nottingham, "JavaScript Object Notation (JSON) Pointer", RFC 6901, DOI 10.17487/RFC6901, April 2013.
++ [RFC7159] ++ Bray, T., The JavaScript Object Notation (JSON) Data Interchange Format", RFC 7159, DOI 10.17487/RFC7159, March 2014.
[ecma262]ECMA 262 specification"
++ [relative-json-pointer] ++ Luff, G. and H. Andrews, "Relative JSON Pointers", Internet-Draft draft-handrews-relative-json-pointer-01, November 2017.
++ [json-schema] ++ Wright, A. and H. Andrews, "JSON Schema: A Media Type for Describing JSON Documents", Internet-Draft draft-handrews-json-schema-01, November 2017.
++

12.2. Informative References

++ ++ ++ ++ ++ ++ ++ ++
++ [RFC4329] ++ Hoehrmann, B., "Scripting Media Types", RFC 4329, DOI 10.17487/RFC4329, April 2006.
++

Appendix A. Acknowledgments

++

Thanks to Gary Court, Francis Galiegue, Kris Zyp, and Geraint Luff for their work on the initial drafts of JSON Schema.

++

Thanks to Jason Desrosiers, Daniel Perrett, Erik Wilde, Ben Hutton, Evgeny Poberezkin, Brad Bowman, Gowry Sankar, Donald Pipowitch, Dave Finlay, and Denis Laxalde for their submissions and patches to the document.

++

Appendix B. ChangeLog

++

[CREF3]This section to be removed before leaving Internet-Draft status.

++

++ ++

++
draft-handrews-json-schema-validation-01
++
++
    ++
  • This draft is purely a clarification with no functional changes
    • ++
  • Provided the general principle behind ignoring annotations under "not" and similar cases
    • ++
  • Clarified "if"/"then"/"else" validation interactions
    • ++
  • Clarified "if"/"then"/"else" behavior for annotation
    • ++
  • Minor formatting and cross-referencing improvements
    • ++
++

++
++
draft-handrews-json-schema-validation-00
++
++
    ++
  • Added "if"/"then"/"else"
    • ++
  • Classify keywords as assertions or annotations per the core spec
    • ++
  • Warn of possibly removing "dependencies" in the future
    • ++
  • Grouped validation keywords into sub-sections for readability
    • ++
  • Moved "readOnly" from hyper-schema to validation meta-data
    • ++
  • Added "writeOnly"
    • ++
  • Added string-encoded media section, with former hyper-schema "media" keywords
    • ++
  • Restored "regex" format (removal was unintentional)
    • ++
  • Added "date" and "time" formats, and reserved additional RFC 3339 format names
    • ++
  • I18N formats: "iri", "iri-reference", "idn-hostname", "idn-email"
    • ++
  • Clarify that "json-pointer" format means string encoding, not URI fragment
    • ++
  • Fixed typo that inverted the meaning of "minimum" and "exclusiveMinimum"
    • ++
  • Move format syntax references into Normative References
    • ++
  • JSON is a normative requirement
    • ++
++

++
++
draft-wright-json-schema-validation-01
++
++
    ++
  • Standardized on hyphenated format names with full words ("uriref" becomes "uri-reference")
    • ++
  • Add the formats "uri-template" and "json-pointer"
    • ++
  • Changed "exclusiveMaximum"/"exclusiveMinimum" from boolean modifiers of "maximum"/"minimum" to independent numeric fields.
    • ++
  • Split the additionalItems/items into two sections
    • ++
  • Reworked properties/patternProperties/additionalProperties definition
    • ++
  • Added "examples" keyword
    • ++
  • Added "contains" keyword
    • ++
  • Allow empty "required" and "dependencies" arrays
    • ++
  • Fixed "type" reference to primitive types
    • ++
  • Added "const" keyword
    • ++
  • Added "propertyNames" keyword
    • ++
++

++
++
draft-wright-json-schema-validation-00
++
++
    ++
  • Added additional security considerations
    • ++
  • Removed reference to "latest version" meta-schema, use numbered version instead
    • ++
  • Rephrased many keyword definitions for brevity
    • ++
  • Added "uriref" format that also allows relative URI references
    • ++
++

++
++
draft-fge-json-schema-validation-00
++
++
    ++
  • Initial draft.
    • ++
  • Salvaged from draft v3.
    • ++
  • Redefine the "required" keyword.
    • ++
  • Remove "extends", "disallow"
    • ++
  • Add "anyOf", "allOf", "oneOf", "not", "definitions", "minProperties", "maxProperties".
    • ++
  • "dependencies" member values can no longer be single strings; at least one element is required in a property dependency array.
    • ++
  • Rename "divisibleBy" to "multipleOf".
    • ++
  • "type" arrays can no longer have schemas; remove "any" as a possible value.
    • ++
  • Rework the "format" section; make support optional.
    • ++
  • "format": remove attributes "phone", "style", "color"; rename "ip-address" to "ipv4"; add references for all attributes.
    • ++
  • Provide algorithms to calculate schema(s) for array/object instances.
    • ++
  • Add interoperability considerations.
    • ++
++

++
++
++ ++

++

++ Authors' Addresses ++

++
++
++ ++ Austin Wright (editor) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ EMail: aaa@bzfx.net ++ ++
++
++
++ ++ Henry Andrews (editor) ++ ++ ++ Cloudflare, Inc. ++ ++ ++ ++ San Francisco, ++ CA ++ ++ ++ USA ++ ++ EMail: henry@cloudflare.com ++ ++
++
++
++ ++ Geraint Luff ++ ++ ++ ++ ++ ++ ++ Cambridge, ++ ++ ++ ++ UK ++ ++ EMail: luffgd@gmail.com ++ ++
++
++ ++ ++ diff --git a/debian/patches/series b/debian/patches/series index b426fda9..3946bdf7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fixup-version.patch +do-not-access-internet-during-doc-build.patch -- GitLab From 1f9952566b4cf0013067e82e6a9bcf09a1e4e402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Sat, 29 Sep 2018 23:52:02 +0200 Subject: [PATCH 74/79] Remove python-mock from runtime dependency --- debian/changelog | 6 ++++++ debian/control | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7bf2931a..7e777a0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-jsonschema (2.6.0-4) UNRELEASED; urgency=medium + + * Remove python-mock from runtime dependency + + -- Ondřej Nový Sat, 29 Sep 2018 23:51:40 +0200 + python-jsonschema (2.6.0-3) unstable; urgency=medium [ Ondřej Nový ] diff --git a/debian/control b/debian/control index 25e3684c..76f48da5 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,6 @@ Package: python-jsonschema Architecture: all Depends: python-functools32, - python-mock, python-pkg-resources, ${misc:Depends}, ${python:Depends}, -- GitLab From bae831f885b2680ebf6634e242da3ef0f69b6132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Thu, 18 Jul 2019 18:25:35 +0200 Subject: [PATCH 75/79] Running wrap-and-sort -bast --- debian/changelog | 1 + debian/tests/control | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c12cf74c..fc07b449 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-jsonschema (2.6.0-5) UNRELEASED; urgency=medium * Remove python-mock from runtime dependency + * Running wrap-and-sort -bast. -- Ondřej Nový Sat, 29 Sep 2018 23:51:40 +0200 diff --git a/debian/tests/control b/debian/tests/control index 574c44b9..448d6280 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,2 +1,5 @@ Tests: upstream-py2 upstream-py3 -Depends: @, python-pytest, python3-pytest +Depends: + python-pytest, + python3-pytest, + @, -- GitLab From 14dc124423ba4d61c3051e7273d43e768175229d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Thu, 18 Jul 2019 18:25:36 +0200 Subject: [PATCH 76/79] Use debhelper-compat instead of debian/compat --- debian/changelog | 1 + debian/compat | 1 - debian/control | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index fc07b449..6cfcb15c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-jsonschema (2.6.0-5) UNRELEASED; urgency=medium * Remove python-mock from runtime dependency * Running wrap-and-sort -bast. + * Use debhelper-compat instead of debian/compat. -- Ondřej Nový Sat, 29 Sep 2018 23:51:40 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 76f48da5..c1f3f2ad 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Thomas Goirand , Build-Depends: autopkgtest, - debhelper (>= 10), + debhelper-compat (= 10), dh-python, openstack-pkg-tools, python-all, -- GitLab From e38fd45dca0a7acb918d3f44e839a1b5008d4867 Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 13 Sep 2019 13:50:12 +0200 Subject: [PATCH 77/79] debian/control: update packages description Added draft 6 and 7 support --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index c1f3f2ad..75d4dd11 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Depends: ${python:Depends}, Suggests: python-jsonschema-doc, -Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 2.7 +Description: An(other) implementation of JSON Schema (Draft 3, 4, 6 and 7) - Python 2.7 JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what JSON data is required for a given application and how it can be @@ -55,7 +55,7 @@ Architecture: all Depends: ${misc:Depends}, ${sphinxdoc:Depends}, -Description: An(other) implementation of JSON Schema (Draft 3 and 4) - doc +Description: An(other) implementation of JSON Schema (Draft 3, 4, 6 and 7) - doc JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what JSON data is required for a given application and how it can be @@ -73,7 +73,7 @@ Depends: ${python3:Depends}, Suggests: python-jsonschema-doc, -Description: An(other) implementation of JSON Schema (Draft 3 and 4) - Python 3.x +Description: An(other) implementation of JSON Schema (Draft 3, 4, 6 and 7) - Python 3.x JSON Schema is a specification for a JSON-based format for defining the structure of JSON data. JSON Schema provides a contract for what JSON data is required for a given application and how it can be -- GitLab From 7ef5624e4c9c5ef28b09cf3e0684ee85239ac198 Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 13 Sep 2019 15:40:09 +0200 Subject: [PATCH 78/79] update debian/changelog with new version --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6cfcb15c..03d5ce47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -python-jsonschema (2.6.0-5) UNRELEASED; urgency=medium +python-jsonschema (3.0.2-1~) UNRELEASED; urgency=medium + [ Ondřej Nový ] * Remove python-mock from runtime dependency * Running wrap-and-sort -bast. * Use debhelper-compat instead of debian/compat. - -- Ondřej Nový Sat, 29 Sep 2018 23:51:40 +0200 + [ Fabio Fantoni ] + * New upstream release. + + -- Fabio Fantoni Fri, 13 Sep 2019 15:19:05 +0200 python-jsonschema (2.6.0-4) unstable; urgency=medium -- GitLab From 2e13cb4564b2b544fe8ef5e1ae98f412cd45b8b0 Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 13 Sep 2019 15:49:04 +0200 Subject: [PATCH 79/79] Redone fixed version debian patch in a different way --- debian/changelog | 1 + debian/patches/fixup-version-new.patch | 20 ++++++++++++++++++++ debian/patches/series | 4 ++-- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 debian/patches/fixup-version-new.patch diff --git a/debian/changelog b/debian/changelog index 03d5ce47..ed8a27b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ python-jsonschema (3.0.2-1~) UNRELEASED; urgency=medium [ Fabio Fantoni ] * New upstream release. + * debian/patches: redone fixed version patch. -- Fabio Fantoni Fri, 13 Sep 2019 15:19:05 +0200 diff --git a/debian/patches/fixup-version-new.patch b/debian/patches/fixup-version-new.patch new file mode 100644 index 00000000..b053b76a --- /dev/null +++ b/debian/patches/fixup-version-new.patch @@ -0,0 +1,20 @@ +Description: Fix version + Put static version in setup instead use scm version. +Author: Fabio Fantoni +Forwarded: no +Last-Update: 2019-09-13 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,5 +1,6 @@ + [metadata] + name = jsonschema ++version = 3.0.2 + url = https://github.com/Julian/jsonschema + project_urls = + Docs = https://python-jsonschema.readthedocs.io/en/latest/ +--- a/setup.py ++++ b/setup.py +@@ -1,2 +1,2 @@ + from setuptools import setup +-setup(use_scm_version=True) ++setup(use_scm_version=False) diff --git a/debian/patches/series b/debian/patches/series index 3946bdf7..d6dc2cb7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -fixup-version.patch -do-not-access-internet-during-doc-build.patch +fixup-version-new.patch +#do-not-access-internet-during-doc-build.patch -- GitLab