From 64c1a6170e78ba659012c55924c42e659f8027507033707b186d92c172dbe02f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 18 May 2019 14:29:02 +0000 Subject: [PATCH 1/3] Accepting request 703836 from home:jayvdb:coala:test-rig - Remove build dependency on vcversioner OBS-URL: https://build.opensuse.org/request/show/703836 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsonschema?expand=0&rev=40 --- python-jsonschema.changes | 5 +++++ python-jsonschema.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-jsonschema.changes b/python-jsonschema.changes index eb0d6b5..7e575db 100644 --- a/python-jsonschema.changes +++ b/python-jsonschema.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 18 05:58:05 UTC 2019 - John Vandenberg + +- Remove build dependency on vcversioner + ------------------------------------------------------------------- Tue Apr 16 16:17:12 UTC 2019 - Matej Cepl diff --git a/python-jsonschema.spec b/python-jsonschema.spec index da5e60d..a57fbb8 100644 --- a/python-jsonschema.spec +++ b/python-jsonschema.spec @@ -30,7 +30,6 @@ Url: http://github.com/Julian/jsonschema Source: https://files.pythonhosted.org/packages/source/j/jsonschema/jsonschema-%{version}.tar.gz BuildRequires: %{python_module mock} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module vcversioner >= 2.16.0.0} BuildRequires: fdupes BuildRequires: python-rpm-macros %if %{with python2} @@ -50,6 +49,7 @@ for Python (supporting 2.6+ including Python 3). %prep %setup -q -n jsonschema-%{version} +sed -i '/vcversioner/d' setup.py %build %python_build From 569bddbef8e170348dd6b3cba9edff214655983e1cf378b418e141df79b7dc2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 21 May 2019 08:59:27 +0000 Subject: [PATCH 2/3] Accepting request 704393 from devel:languages:python OBS-URL: https://build.opensuse.org/request/show/704393 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsonschema?expand=0&rev=41 --- python-jsonschema.changes | 5 ----- python-jsonschema.spec | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/python-jsonschema.changes b/python-jsonschema.changes index 7e575db..eb0d6b5 100644 --- a/python-jsonschema.changes +++ b/python-jsonschema.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sat May 18 05:58:05 UTC 2019 - John Vandenberg - -- Remove build dependency on vcversioner - ------------------------------------------------------------------- Tue Apr 16 16:17:12 UTC 2019 - Matej Cepl diff --git a/python-jsonschema.spec b/python-jsonschema.spec index a57fbb8..da5e60d 100644 --- a/python-jsonschema.spec +++ b/python-jsonschema.spec @@ -30,6 +30,7 @@ Url: http://github.com/Julian/jsonschema Source: https://files.pythonhosted.org/packages/source/j/jsonschema/jsonschema-%{version}.tar.gz BuildRequires: %{python_module mock} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module vcversioner >= 2.16.0.0} BuildRequires: fdupes BuildRequires: python-rpm-macros %if %{with python2} @@ -49,7 +50,6 @@ for Python (supporting 2.6+ including Python 3). %prep %setup -q -n jsonschema-%{version} -sed -i '/vcversioner/d' setup.py %build %python_build From d13e73b0c0bcd227409bbf549ef19ff056b47a9f6ee697d6ba37aab1229cf0f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 20 Sep 2019 12:03:14 +0000 Subject: [PATCH 3/3] Accepting request 731508 from home:jayvdb:jsonschema Try to upgrade again -- see issue mentioned ... poetry needs this. - Activate more of the test suite - Remove tests and benchmarking from the runtime package - Update to v3.0.2 OBS-URL: https://build.opensuse.org/request/show/731508 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsonschema?expand=0&rev=42 --- jsonschema-2.6.0.tar.gz | 3 --- jsonschema-3.0.2.tar.gz | 3 +++ python-jsonschema.changes | 19 +++++++++++++++++++ python-jsonschema.spec | 35 +++++++++++++++++++++++++---------- 4 files changed, 47 insertions(+), 13 deletions(-) delete mode 100644 jsonschema-2.6.0.tar.gz create mode 100644 jsonschema-3.0.2.tar.gz diff --git a/jsonschema-2.6.0.tar.gz b/jsonschema-2.6.0.tar.gz deleted file mode 100644 index 5d135a9..0000000 --- a/jsonschema-2.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02 -size 53252 diff --git a/jsonschema-3.0.2.tar.gz b/jsonschema-3.0.2.tar.gz new file mode 100644 index 0000000..87c17a4 --- /dev/null +++ b/jsonschema-3.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d +size 143432 diff --git a/python-jsonschema.changes b/python-jsonschema.changes index eb0d6b5..9e770ac 100644 --- a/python-jsonschema.changes +++ b/python-jsonschema.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Sep 17 05:31:26 UTC 2019 - John Vandenberg + +- Activate more of the test suite +- Remove tests and benchmarking from the runtime package +- Update to v3.0.2 + * Fixed a bug where 0 and False were considered equal by + const and enum +- from v3.0.1 + * Fixed a bug where extending validators did not preserve their + notion of which validator property contains $id information. +- from v3.0.0 + * Support for Draft 6 and Draft 7 + * Draft 7 is now the default + * New TypeChecker object for more complex type definitions + (and overrides) + * Falling back to isodate for the date-time format checker is + no longer attempted, in accordance with the specification + ------------------------------------------------------------------- Tue Apr 16 16:17:12 UTC 2019 - Matej Cepl diff --git a/python-jsonschema.spec b/python-jsonschema.spec index da5e60d..6d15572 100644 --- a/python-jsonschema.spec +++ b/python-jsonschema.spec @@ -19,26 +19,38 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 Name: python-jsonschema -# Please, do not update to the current version, it breaks numerous other -# packages, because of unstable API. -Version: 2.6.0 +# v3 incompatibility with OpenStack raised upstream at +# https://github.com/Julian/jsonschema/issues/604 +Version: 3.0.2 Release: 0 Summary: An implementation of JSON-Schema validation for Python License: MIT Group: Development/Languages/Python -Url: http://github.com/Julian/jsonschema +URL: https://github.com/Julian/jsonschema Source: https://files.pythonhosted.org/packages/source/j/jsonschema/jsonschema-%{version}.tar.gz +BuildRequires: %{python_module Twisted} +BuildRequires: %{python_module attrs >= 17.4.0} +BuildRequires: %{python_module idna} +BuildRequires: %{python_module jsonpointer > 1.13} BuildRequires: %{python_module mock} +BuildRequires: %{python_module pyrsistent >= 0.14.0} +BuildRequires: %{python_module rfc3987} +BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module vcversioner >= 2.16.0.0} +BuildRequires: %{python_module six >= 1.11.0} +BuildRequires: %{python_module strict-rfc3339} +BuildRequires: %{python_module webcolors} BuildRequires: fdupes BuildRequires: python-rpm-macros -%if %{with python2} -BuildRequires: python2-functools32 -%endif +Requires: python-attrs >= 17.4.0 +Requires: python-pyrsistent >= 0.14.0 +Requires: python-six >= 1.11.0 Requires(post): update-alternatives Requires(preun): update-alternatives BuildArch: noarch +%if %{with python2} +BuildRequires: python2-functools32 +%endif %ifpython2 Requires: python-functools32 %endif @@ -56,13 +68,16 @@ for Python (supporting 2.6+ including Python 3). %install %python_install -%python_expand %fdupes -s %{buildroot}%{$python_sitelib} +# Remove benchmark tests +%{python_expand rm -r %{buildroot}%{$python_sitelib}/jsonschema/benchmarks %{buildroot}%{$python_sitelib}/jsonschema/tests +%fdupes -s %{buildroot}%{$python_sitelib} +} # Prepare for update-alternatives usage %python_clone -a %{buildroot}%{_bindir}/jsonschema %check -%python_exec -m unittest jsonschema.tests.test_jsonschema_test_suite +%python_exec setup.py test --test-suite=jsonschema.tests %post %python_install_alternative jsonschema