4 changed files with 91 additions and 74 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/jmespath-0.9.4.tar.gz
+SOURCES/jmespath-0.9.0.tar.gz
--- a/.python-jmespath.metadata
+++ b/.python-jmespath.metadata
@ -1 +1 @@
-e69576ffb34660ac546ddfe9ec1a905e795cb856 SOURCES/jmespath-0.9.4.tar.gz
+642800c1bc901a440639d5743c9cd74ba59c2d4a SOURCES/jmespath-0.9.0.tar.gz
--- a/SOURCES/nonose.patch
+++ b/SOURCES/nonose.patch
@ -1,13 +0,0 @@
-diff -up jmespath-0.9.4/tests/test_compliance.py.orig jmespath-0.9.4/tests/test_compliance.py
--- jmespath-0.9.4/tests/test_compliance.py.orig	2017-05-13 19:21:34.000000000 +0200
-+++ jmespath-0.9.4/tests/test_compliance.py	2021-06-29 11:34:10.355125102 +0200
-@@ -3,7 +3,8 @@ from pprint import pformat
- from tests import OrderedDict
- from tests import json
- 
-from nose.tools import assert_equal
-+import unittest
-+assert_equal = unittest.TestCase().assertEqual
- 
- from jmespath.visitor import Options
- 
--- a/SPECS/python-jmespath.spec
+++ b/SPECS/python-jmespath.spec
@ -1,7 +1,20 @@
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%bcond_with python3
+%else
+%bcond_without python3
+%endif
+
+%if 0%{?rhel} > 7
+# Disable python2 build by default
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+
 %global pypi_name jmespath

 Name:           python-%{pypi_name}
-Version:        0.9.4
+Version:        0.9.0
 Release:        11%{?dist}
 Summary:        JSON Matching Expressions

@ -10,99 +23,116 @@ URL:            https://github.com/jmespath/jmespath.py
 Source0:        https://pypi.python.org/packages/source/j/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch

-Patch:          nonose.patch
-
 %description
 JMESPath allows you to declaratively specify how to extract elements from
 a JSON document.

+%if %{with python2}
+%package -n     python2-%{pypi_name}
+Summary:        JSON Matching Expressions
+%{?el6:Provides: python-%{pypi_name}}
+%{?python_provide:%python_provide python2-%{pypi_name}}
+
+BuildRequires:  python2-devel
+BuildRequires:  python2-mock
+BuildRequires:  python2-nose
+BuildRequires:  python2-setuptools
+%if 0%{?rhel} && 0%{?rhel} < 7
+BuildRequires:  python-ordereddict
+# tests specifically import simplejson as json if python version is 2.6
+BuildRequires:  python-simplejson
+BuildRequires:  python-unittest2
+%endif # rhel < 7
+
+%description -n python2-%{pypi_name}
+JMESPath allows you to declaratively specify how to extract elements from
+a JSON document.
+%endif # with python2
+
+%if %{with python3}
 %package -n     python3-%{pypi_name}
 Summary:        JSON Matching Expressions
 %{?python_provide:%python_provide python3-%{pypi_name}}
-%{?python_provide:%python_provide python-%{pypi_name}}

 BuildRequires:  python3-devel
+BuildRequires:  python3-mock
+BuildRequires:  python3-nose
 BuildRequires:  python3-setuptools
-BuildRequires:  python3-pytest

-Obsoletes: python2-jmespath < 0.9.4-2
+Supplements:    ansible

 %description -n python3-%{pypi_name}
 JMESPath allows you to declaratively specify how to extract elements from
 a JSON document.
+%endif # with python3

 %prep
 %setup -q -n %{pypi_name}-%{version}
-%patch -p1
 rm -rf %{pypi_name}.egg-info

 %build
+%if %{with python2}
+%py2_build
+%endif # with python2
+%if %{with python3}
 %py3_build
+%endif # with python3

 %install
+%if %{with python3}
 %py3_install
+mv %{buildroot}/%{_bindir}/jp.py %{buildroot}/%{_bindir}/jp.py-%{python3_version}
+ln -sf %{_bindir}/jp.py-%{python3_version} %{buildroot}/%{_bindir}/jp.py-3
+%if %{without python2}
+ln -sf %{_bindir}/jp.py-%{python3_version} %{buildroot}/%{_bindir}/jp.py
+%endif # without python2
+%endif # with python3
+
+%if %{with python2}
+%py2_install
+mv %{buildroot}/%{_bindir}/jp.py %{buildroot}/%{_bindir}/jp.py-%{python2_version}
+ln -sf %{_bindir}/jp.py-%{python2_version} %{buildroot}/%{_bindir}/jp.py-2
+ln -sf %{_bindir}/jp.py-%{python2_version} %{buildroot}/%{_bindir}/jp.py
+%endif # with python2

 %check
-%pytest
+%if %{with python2}
+nosetests-%{python2_version}
+%endif # with python2
+%if %{with python3}
+nosetests-%{python3_version}
+%endif # with python3

-%files -n python3-%{pypi_name}
+%if %{with python2}
+%files -n python2-%{pypi_name}
 %doc README.rst
 %license LICENSE.txt
 %{_bindir}/jp.py
+%{_bindir}/jp.py-2
+%{_bindir}/jp.py-%{python2_version}
+%{python2_sitelib}/%{pypi_name}
+%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%endif # with python2
+
+%if %{with python3}
+%files -n python3-%{pypi_name}
+%doc README.rst
+%license LICENSE.txt
+%if %{without python2}
+%{_bindir}/jp.py
+%endif # without python2
+%{_bindir}/jp.py-3
+%{_bindir}/jp.py-%{python3_version}
 %{python3_sitelib}/%{pypi_name}
-%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
+%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%endif # with python3

 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.4-11
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Jan 14 2019 Pavel Cahyna <pcahyna@redhat.com> - 0.9.0-11
+- Supplement: ansible, as we enable the json_query Jinja2 filter. RHBZ#1660559

-* Wed Jun 30 2021 Pavel Cahyna <pcahyna@redhat.com> - 0.9.4-10
- Remove the python-nose dependency, replace by pytest
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.4-9
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Mar  3 2021 Pavel Cahyna <pcahyna@redhat.com> - 0.9.4-8
- Remove unused python-mock build dependency
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 0.9.4-5
- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Sep  4 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.9.4-3
- Obsolete python2 subpackage to fix upgrade path (#1734184)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.9.4-2
- Rebuilt for Python 3.8
-
-* Wed Jul 24 2019 Kevin Fenzi <kevin@scrye.com> - 0.9.4-1
- Upgrade to 0.9.4.
- Drop python2 subpackage and fix unversioned command to use python3.
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Sep 08 2018 Kevin Fenzi <kevin@scrye.com> - 0.9.3-1
- Upgrade to 0.9.3. Fixes bug #1588131
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.9.0-11
- Rebuilt for Python 3.7
-
-* Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.9.0-10
- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+* Fri Jun 15 2018 Charalampos Stratakis <cstratak@redhat.com> - 0.9.0-10
+- Conditionalize the python2 subpackage

 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild