diff --git a/.python-jmespath.metadata b/.python-jmespath.metadata index 9aa76d8..ce344e3 100644 --- a/.python-jmespath.metadata +++ b/.python-jmespath.metadata @@ -1 +1 @@ -642800c1bc901a440639d5743c9cd74ba59c2d4a SOURCES/jmespath-0.9.0.tar.gz +ec40e04cc9feedfa70652639f1a1bdbc25062165 SOURCES/jmespath.py-1.0.1.tar.gz diff --git a/SOURCES/.gitignore b/SOURCES/.gitignore new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/SOURCES/.gitignore diff --git a/SPECS/python-jmespath.spec b/SPECS/python-jmespath.spec index 71f1271..0b417af 100644 --- a/SPECS/python-jmespath.spec +++ b/SPECS/python-jmespath.spec @@ -1,138 +1,138 @@ -%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.0 -Release: 11%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: JSON Matching Expressions License: MIT URL: https://github.com/jmespath/jmespath.py -Source0: https://pypi.python.org/packages/source/j/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: %{url}/archive/%{version}/jmespath.py-%{version}.tar.gz BuildArch: noarch %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 -Supplements: ansible +# The tests unfortunately still import from nose, but we use pytest as test runner: +BuildRequires: python3-pytest +BuildRequires: python3-hypothesis + +Obsoletes: python2-jmespath < 0.9.4-2 %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} +%setup -q -n jmespath.py-%{version} 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 -%if %{with python2} -nosetests-%{python2_version} -%endif # with python2 -%if %{with python3} -nosetests-%{python3_version} -%endif # with python3 - -%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 +# epel9 does not have python3-nose since nose is deprecated upstream. Only one file +# in the upstream repo still depends on nose, so we can omit this dependency for epel9. +# See upstream issue: https://github.com/jmespath/jmespath.py/issues/261%if 0%{?el9} +%pytest --ignore=extra/test_hypothesis.py -%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?.?.egg-info -%endif # with python3 +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog -* Mon Jan 14 2019 Pavel Cahyna - 0.9.0-11 -- Supplement: ansible, as we enable the json_query Jinja2 filter. RHBZ#1660559 +* Sat Nov 12 2022 Kevin Fenzi - 1.0.1-1 +- Update to 1.0.1. Fixes rhbz#2098349 + +* Fri Jul 22 2022 Fedora Release Engineering - 1.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.0.0-4 +- Rebuilt for Python 3.11 + +* Tue May 03 2022 Major Hayden - 1.0.0-3 +- Remove python3-nose from BuildRequires and skip single test file that requires nose. + +* Wed Apr 06 2022 Kevin Fenzi - 1.0.0-2 +- Rebuild to deal with update snafu. + +* Tue Mar 22 2022 Kevin Fenzi - 1.0.0-1 +- Update to 1.0.0. Fixes rhbz#2064951 + +* Tue Mar 15 2022 Tomáš Hrnčiar - 0.10.0-6 +- Use list for random.sample since using a set has been removed in Python 3.11 +- Fixes: rhbz#2057520 + +* Fri Jan 21 2022 Fedora Release Engineering - 0.10.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.10.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 29 2021 Miro Hrončok - 0.10.0-3 +- Actually run the tests in %%check + +* Fri Jun 04 2021 Python Maint - 0.10.0-2 +- Rebuilt for Python 3.10 + +* Sat Apr 3 2021 Eduardo Echeverria - 0.10.0-1 +- Bumped to the last version + +* Wed Mar 3 2021 Pavel Cahyna - 0.9.4-8 +- Remove unused python-mock build dependency + +* Wed Jan 27 2021 Fedora Release Engineering - 0.9.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.9.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun May 24 2020 Miro Hrončok - 0.9.4-5 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 0.9.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Sep 4 2019 Zbigniew Jędrzejewski-Szmek - 0.9.4-3 +- Obsolete python2 subpackage to fix upgrade path (#1734184) + +* Mon Aug 19 2019 Miro Hrončok - 0.9.4-2 +- Rebuilt for Python 3.8 + +* Wed Jul 24 2019 Kevin Fenzi - 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 - 0.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Sep 08 2018 Kevin Fenzi - 0.9.3-1 +- Upgrade to 0.9.3. Fixes bug #1588131 + +* Sat Jul 14 2018 Fedora Release Engineering - 0.9.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 0.9.0-11 +- Rebuilt for Python 3.7 -* Fri Jun 15 2018 Charalampos Stratakis - 0.9.0-10 -- Conditionalize the python2 subpackage +* Mon Feb 12 2018 Iryna Shcherbina - 0.9.0-10 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) * Fri Feb 09 2018 Fedora Release Engineering - 0.9.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild