From fde4e593d52610937824bdd08bfdc78d25e2d0a9b8d73f0bd5355e1d04179839 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Wed, 20 Jan 2016 19:10:15 +0000 Subject: [PATCH 1/4] - Manage the jp executable with update-alternatives now that python3-jmespath exists - spec file improvements OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jmespath?expand=0&rev=14 --- python-jmespath.changes | 7 +++++++ python-jmespath.spec | 32 +++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/python-jmespath.changes b/python-jmespath.changes index 475b7e2..4290a0d 100644 --- a/python-jmespath.changes +++ b/python-jmespath.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 20 19:08:32 UTC 2016 - rjschwei@suse.com + +- Manage the jp executable with update-alternatives now that + python3-jmespath exists +- spec file improvements + ------------------------------------------------------------------- Wed May 27 17:04:07 UTC 2015 - rjschwei@suse.com diff --git a/python-jmespath.spec b/python-jmespath.spec index c2928a4..ce95534 100644 --- a/python-jmespath.spec +++ b/python-jmespath.spec @@ -1,7 +1,7 @@ # # spec file for package python-jmespath # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -28,10 +28,14 @@ Url: https://github.com/boto/jmespath Source0: https://pypi.python.org/packages/source/j/%{baseName}/%{baseName}-%{version}.tar.gz Requires: python Requires: python-ply >= 3.4 +Requires(post): update-alternatives +Requires(postun): update-alternatives BuildRequires: python BuildRequires: python-devel -BuildRequires: python-ply +BuildRequires: python-ply >= 3.4 BuildRequires: python-setuptools +# For testing +BuildRequires: python-nose 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()")} @@ -79,17 +83,27 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} pushd %{buildroot}/%{_bindir} -ln -s jp.py jp +mv jp.py jp-%{py_ver} popd +%check +nosetests tests + +%post +"%_sbindir/update-alternatives" --install %{_bindir}/jp jp %{_bindir}/jp-%{py_ver} 30 + +%postun +if [ $1 -eq 0 ] ; then + "%_sbindir/update-alternatives" --remove jp %{_bindir}/jp-%{py_ver} +fi + %files %defattr(-,root,root,-) %doc LICENSE.txt README.rst -%dir %{python_sitelib}/jmespath -%dir %{python_sitelib}/%{baseName}-%{version}-py%{py_ver}.egg-info -%{_bindir}/jp -%{_bindir}/jp.py -%{python_sitelib}/jmespath/* -%{python_sitelib}/*egg-info/* +#%dir %{python_sitelib}/jmespath +#%dir %{python_sitelib}/%{baseName}-%{version}-py%{py_ver}.egg-info +%{_bindir}/jp-%{py_ver} +%{python_sitelib}/jmespath/ +%{python_sitelib}/%{baseName}-%{version}-py%{py_ver}.egg-info/ %changelog From c74164c96cd9ab943ecea7debd7d82368bcd7ebfe234a8e9e46dd6db9ee29e54 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Wed, 20 Jan 2016 19:10:49 +0000 Subject: [PATCH 2/4] - Remove comments OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jmespath?expand=0&rev=15 --- python-jmespath.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/python-jmespath.spec b/python-jmespath.spec index ce95534..f23506b 100644 --- a/python-jmespath.spec +++ b/python-jmespath.spec @@ -100,8 +100,6 @@ fi %files %defattr(-,root,root,-) %doc LICENSE.txt README.rst -#%dir %{python_sitelib}/jmespath -#%dir %{python_sitelib}/%{baseName}-%{version}-py%{py_ver}.egg-info %{_bindir}/jp-%{py_ver} %{python_sitelib}/jmespath/ %{python_sitelib}/%{baseName}-%{version}-py%{py_ver}.egg-info/ From 4e51596506e318d2996d8d299144a6aba75331b85488272b7722a617977ffd12 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Wed, 20 Jan 2016 19:43:20 +0000 Subject: [PATCH 3/4] - Fix build issues for SLE 11 + More test dependencies required OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jmespath?expand=0&rev=16 --- python-jmespath.changes | 6 ++++++ python-jmespath.spec | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/python-jmespath.changes b/python-jmespath.changes index 4290a0d..938c4ff 100644 --- a/python-jmespath.changes +++ b/python-jmespath.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 20 19:42:39 UTC 2016 - rjschwei@suse.com + +- Fix build issues for SLE 11 + + More test dependencies required + ------------------------------------------------------------------- Wed Jan 20 19:08:32 UTC 2016 - rjschwei@suse.com diff --git a/python-jmespath.spec b/python-jmespath.spec index f23506b..b1247a4 100644 --- a/python-jmespath.spec +++ b/python-jmespath.spec @@ -26,16 +26,20 @@ 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 -Requires: python +Requires: python-base Requires: python-ply >= 3.4 Requires(post): update-alternatives Requires(postun): update-alternatives -BuildRequires: python 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()")} From fc960be3a28daaa1193112d5e2bc674ac1f016443815e0f76954123dbc783918 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 1 Feb 2016 11:48:48 +0000 Subject: [PATCH 4/4] Accepting request 357108 from home:TheBlackCat:branches:devel:languages:python Update to version 0.9.0 OBS-URL: https://build.opensuse.org/request/show/357108 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jmespath?expand=0&rev=17 --- jmespath-0.7.1.tar.gz | 3 --- jmespath-0.9.0.tar.gz | 3 +++ python-jmespath.changes | 20 ++++++++++++++++++++ python-jmespath.spec | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) delete mode 100644 jmespath-0.7.1.tar.gz create mode 100644 jmespath-0.9.0.tar.gz diff --git a/jmespath-0.7.1.tar.gz b/jmespath-0.7.1.tar.gz deleted file mode 100644 index 77537d0..0000000 --- a/jmespath-0.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd5a12ee3dfa470283a020a35e69e83b0700d44fe413014fd35ad5584c5f5fd1 -size 19696 diff --git a/jmespath-0.9.0.tar.gz b/jmespath-0.9.0.tar.gz new file mode 100644 index 0000000..46808a9 --- /dev/null +++ b/jmespath-0.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08dfaa06d4397f283a01e57089f3360e3b52b5b9da91a70e1fd91e9f0cdd3d3d +size 20855 diff --git a/python-jmespath.changes b/python-jmespath.changes index 938c4ff..0e1744e 100644 --- a/python-jmespath.changes +++ b/python-jmespath.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +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 + * Fix issue with hardcoded path in ``jp.py`` executable + (`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 `__) + * Add support for providing your own dict cls to support + 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 b1247a4..bc8a8da 100644 --- a/python-jmespath.spec +++ b/python-jmespath.spec @@ -19,7 +19,7 @@ %define baseName jmespath Name: python-jmespath -Version: 0.7.1 +Version: 0.9.0 Release: 0 Summary: Extract elements from JSON document License: MIT