From 796ff442a224fceaa816e9e14f8a0f88b61a99c98d3e8551d20c6928b8114ee7 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Mon, 15 Sep 2014 14:01:21 +0000 Subject: [PATCH] Accepting request 249253 from Cloud:OpenStack:Master New upstream release OBS-URL: https://build.opensuse.org/request/show/249253 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsonschema?expand=0&rev=17 --- jsonschema-2.2.0.tar.gz | 3 --- jsonschema-2.4.0.tar.gz | 3 +++ python-jsonschema.changes | 14 ++++++++++++++ python-jsonschema.spec | 21 ++++++++++++++++++++- 4 files changed, 37 insertions(+), 4 deletions(-) delete mode 100644 jsonschema-2.2.0.tar.gz create mode 100644 jsonschema-2.4.0.tar.gz diff --git a/jsonschema-2.2.0.tar.gz b/jsonschema-2.2.0.tar.gz deleted file mode 100644 index e36854f..0000000 --- a/jsonschema-2.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98071d52706e30b01fbb72567fbe26e342db9d7cc89bea04bff44e9304685763 -size 40963 diff --git a/jsonschema-2.4.0.tar.gz b/jsonschema-2.4.0.tar.gz new file mode 100644 index 0000000..f49860a --- /dev/null +++ b/jsonschema-2.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1298a2f1b2f4c4a7b921cccd159e4e42f6d7b0fb75c86c0cdecfc71f061833fa +size 48293 diff --git a/python-jsonschema.changes b/python-jsonschema.changes index 3a2b830..775f82c 100644 --- a/python-jsonschema.changes +++ b/python-jsonschema.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Sep 15 10:57:54 UTC 2014 - tbechtold@suse.com + +- update to version 2.4.0: + * Added a CLI (#134) + * Added absolute path and absolute schema path to errors (#120) + * Added ``relevance`` + * Meta-schemas are now loaded via ``pkgutil`` + * Added ``by_relevance`` and ``best_match`` (#91) + * Fixed ``format`` to allow adding formats for non-strings (#125) + * Fixed the ``uri`` format to reject URI references (#131) +- BuildRequires python-setuptools +- Install /usr/bin/jsonschema with update-alternatives support + ------------------------------------------------------------------- Thu Feb 13 10:27:36 UTC 2014 - dmueller@suse.com diff --git a/python-jsonschema.spec b/python-jsonschema.spec index cbfb83a..2b5c3ca 100644 --- a/python-jsonschema.spec +++ b/python-jsonschema.spec @@ -17,7 +17,7 @@ Name: python-jsonschema -Version: 2.2.0 +Version: 2.4.0 Release: 0 Summary: An implementation of JSON-Schema validation for Python License: MIT @@ -25,8 +25,11 @@ Group: Development/Languages/Python Url: http://github.com/Julian/jsonschema Source: http://pypi.python.org/packages/source/j/jsonschema/jsonschema-%{version}.tar.gz BuildRequires: python-devel +BuildRequires: python-setuptools # Test build requirements BuildRequires: python-mock +Requires(post): update-alternatives +Requires(postun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 BuildRequires: python-unittest2 @@ -47,15 +50,31 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +mv %{buildroot}%{_bindir}/jsonschema %{buildroot}%{_bindir}/jsonschema-%{py_ver} +ln -s %{_bindir}/jsonschema-%{py_ver} %{buildroot}%{_bindir}/jsonschema %if 0%{?suse_version} > 1110 %check python -m unittest jsonschema.tests.test_jsonschema_test_suite %endif +%pre +[[ ! -L %{_bindir}/jsonschema ]] && rm -f %{_bindir}/jsonschema || : + +%post +update-alternatives --install \ + %{_bindir}/jsonschema jsonschema %{_bindir}/jsonschema-%{py_ver} 20 + +%preun +if [ $1 -eq 0 ] ; then + update-alternatives --remove jsonschema %{_bindir}/jsonschema-%{py_ver} +fi + %files %defattr(-,root,root,-) %doc COPYING README.rst +%ghost %{_bindir}/jsonschema +%{_bindir}/jsonschema-%{py_ver} %{python_sitelib}/* %changelog