From 565e1b622d906659f5b0b531a86ad5abca04b70c3224a5a731737411527663ca Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 25 Feb 2013 14:26:05 +0000 Subject: [PATCH 1/2] - Allow jsonschema==1.0 too OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-warlock?expand=0&rev=6 --- python-warlock.changes | 5 +++++ python-warlock.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python-warlock.changes b/python-warlock.changes index 0ec3787..3da4c68 100644 --- a/python-warlock.changes +++ b/python-warlock.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 25 14:28:02 UTC 2013 - saschpe@suse.de + +- Allow jsonschema==1.0 too + ------------------------------------------------------------------- Fri Feb 22 14:05:28 UTC 2013 - saschpe@suse.de diff --git a/python-warlock.spec b/python-warlock.spec index 965a129..0ba34d7 100644 --- a/python-warlock.spec +++ b/python-warlock.spec @@ -28,6 +28,7 @@ BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: python-jsonpatch BuildRequires: python-jsonschema +BuildRequires: python-nose Requires: python-jsonpatch Requires: python-jsonschema BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,6 +43,7 @@ Build self-validating python objects using JSON schemas %prep %setup -q -n warlock-%{version} +sed -i "s|jsonschema>=0.7,<1|jsonschema>=0.7,<=1|" setup.py %build python setup.py build @@ -50,7 +52,7 @@ python setup.py build python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check -python setup.py test +nosetests %files %defattr(-,root,root,-) From 94552fc2c8869dee7a13dce02dfc506a88cd6fb3676a4c24d71a794fca3cd1fd Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 26 Feb 2013 12:44:17 +0000 Subject: [PATCH 2/2] fixup OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-warlock?expand=0&rev=8 --- python-warlock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-warlock.spec b/python-warlock.spec index 0ba34d7..65e9899 100644 --- a/python-warlock.spec +++ b/python-warlock.spec @@ -43,7 +43,7 @@ Build self-validating python objects using JSON schemas %prep %setup -q -n warlock-%{version} -sed -i "s|jsonschema>=0.7,<1|jsonschema>=0.7,<=1|" setup.py +sed -i "s|jsonschema>=0.7,<1|jsonschema>=0.7,<=1|" requirements.txt %build python setup.py build