diff --git a/jmespath-0.9.0.tar.gz b/jmespath-0.9.0.tar.gz deleted file mode 100644 index 46808a9..0000000 --- a/jmespath-0.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08dfaa06d4397f283a01e57089f3360e3b52b5b9da91a70e1fd91e9f0cdd3d3d -size 20855 diff --git a/jmespath-0.9.2.tar.gz b/jmespath-0.9.2.tar.gz new file mode 100644 index 0000000..acd1bfd --- /dev/null +++ b/jmespath-0.9.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54c441e2e08b23f12d7fa7d8e6761768c47c969e6aed10eead57505ba760aee9 +size 22773 diff --git a/python-jmespath.changes b/python-jmespath.changes index f79527b..1ec19e7 100644 --- a/python-jmespath.changes +++ b/python-jmespath.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Mar 16 18:43:59 UTC 2017 - rjschwei@suse.com + +- Switch to single-spec build +- Update to version 0.9.2 + + Fix regression when using ordering comparators on strings (issue 124) +- From 0.9.1 + + Raise LexerError on invalid numbers (issue 98) + + Add support for custom functions (#100) (issue 100) + + Fix ZeroDivisionError for built-in function avg() on empty lists (#115) + (issue 115) + + Properly handle non numerical ordering operators (#117) (issue 117) + ------------------------------------------------------------------- Mon Aug 15 14:51:56 UTC 2016 - toddrme2178@gmail.com @@ -8,20 +21,17 @@ Mon Feb 1 11:24:14 UTC 2016 - toddrme2178@gmail.com - Update to version 0.9.0 * Add support for new lines with tokens in an expression - * Add support for `JEP 9 `__, - which introduces "and" expressions, "unary" expressions, "not" expressions, - and "paren" expressions + * Add support for JEP 9 which introduces "and" expressions, "unary" + expressions, "not" expressions, and "paren" expressions * Fix issue with hardcoded path in ``jp.py`` executable - (`issue 90 `__, - `issue 88 `__, - `issue 82 `__) + (issue 90, issue 88, issue 82) - Update to version 0.8.0 - * Improve lexing performance (`issue 84 `__) - * Fix parsing error for multiselect lists (`issue 86 `__) - * Fix issue with escaping single quotes in literal strings (`issue 85 `__) + * Improve lexing performance (issue 84) + * Fix parsing error for multiselect lists (issue 86) + * Fix issue with escaping single quotes in literal strings (issue 85) * Add support for providing your own dict cls to support - ordered dictionaries (`issue 94 `__) - * Add map() function (`issue 95 `__) + ordered dictionaries (issue 94) + * Add map() function (issue 95) ------------------------------------------------------------------- Wed Jan 20 19:42:39 UTC 2016 - rjschwei@suse.com diff --git a/python-jmespath.spec b/python-jmespath.spec index d410f87..d1fac20 100644 --- a/python-jmespath.spec +++ b/python-jmespath.spec @@ -1,7 +1,7 @@ # # spec file for package python-jmespath # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,37 +16,35 @@ # -%define baseName jmespath - +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-jmespath -Version: 0.9.0 +Version: 0.9.2 Release: 0 Summary: Extract elements from JSON document License: MIT Group: Development/Languages/Python Url: https://github.com/boto/jmespath -Source0: https://pypi.python.org/packages/source/j/%{baseName}/%{baseName}-%{version}.tar.gz +Source: https://pypi.io/packages/source/j/jmespath/jmespath-%{version}.tar.gz +BuildRequires: %{python_module devel} +BuildRequires: %{python_module ply >= 3.4} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module simplejson} +BuildRequires: python-rpm-macros +# Testing +BuildRequires: %{python_module nose} +BuildRequires: %{python_module unittest2} Requires: python-base Requires: python-ply >= 3.4 -Requires(post): update-alternatives +Requires: python-simplejson +Requires(post): update-alternatives Requires(preun): update-alternatives -BuildRequires: python-devel -BuildRequires: python-ply >= 3.4 -BuildRequires: python-setuptools -# For testing -BuildRequires: python-nose -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -BuildRequires: python-ordereddict -%endif -BuildRequires: python-simplejson -BuildRequires: python-unittest2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else + +%if 0%{?suse_version} > 1110 BuildArch: noarch %endif +%python_subpackages + %description JMESPath (pronounced "jaymz path") allows you to declaratively specify how to extract elements from a JSON document. @@ -79,37 +77,35 @@ The * can also be used for hash types: The expression: foo.*.name will return ["one", "two"]. %prep -%setup -q -n %{baseName}-%{version} +%setup -q -n jmespath-%{version} %build -python setup.py build +%python_build +#pushd build/scripts-%{$python_bin_suffix} +#mv jp.py jp-%{$python_bin_suffix} +#popd +#pushd build/scripts-%{py_ver} +#mv jp.py jp-%{py_ver} +#popd %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} - -# Prepare for update-alternatives usage -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -mv %{buildroot}%{_bindir}/jp.py %{buildroot}%{_bindir}/jp-%{py_ver} -ln -s -f %{_sysconfdir}/alternatives/jp %{buildroot}%{_bindir}/jp +%python_install +mv %{buildroot}%{_bindir}/jp.py %{buildroot}%{_bindir}/jp +%python_clone -a %{buildroot}%{_bindir}/jp %check -nosetests tests +%python_expand nosetests-%{$python_bin_suffix} tests %post -%_sbindir/update-alternatives --install %{_bindir}/jp jp %{_bindir}/jp-%{py_ver} 30 +%python_install_alternative jp -%preun -if [ $1 -eq 0 ] ; then - %_sbindir/update-alternatives --remove jp %{_bindir}/jp-%{py_ver} -fi +%postun +%python_uninstall_alternative jp -%files +%files %{python_files} %defattr(-,root,root,-) %doc LICENSE.txt README.rst -%{_bindir}/jp -%{_bindir}/jp-%{py_ver} -%ghost %{_sysconfdir}/alternatives/jp -%{python_sitelib}/jmespath/ -%{python_sitelib}/%{baseName}-%{version}-py%{py_ver}.egg-info/ +%{python_sitelib}/* +%python_alternative %{_bindir}/jp %changelog