Compare commits

..

No commits in common. "fbb8881d684e74f0629515b9d7dab05588d1f217" and "3b3ada7f8d368cc40219b99dfa272e0949544dd0" have entirely different histories.

5 changed files with 51 additions and 53 deletions

View File

@ -1,25 +0,0 @@
From d9ec0f5f74975dfb4ebcc18efeb4cee69aa8e788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Sun, 10 Apr 2022 13:36:37 +0200
Subject: [PATCH] Fix invalid escape sequence (#50)
---
tests.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests.py b/tests.py
index dafbe89..9252369 100755
--- a/tests.py
+++ b/tests.py
@@ -129,7 +129,7 @@ class SpecificationTests(unittest.TestCase):
("/c%d", ['c%d']),
("/e^f", ['e^f']),
("/g|h", ['g|h']),
- ("/i\\j", ['i\j']),
+ ("/i\\j", ['i\\j']),
("/k\"l", ['k"l']),
("/ ", [' ']),
("/m~0n", ['m~n']),
--
2.27.0

BIN
jsonpointer-1.10.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,21 +1,31 @@
%global pypi_name jsonpointer
%bcond_without python3
%bcond_without python2
Name: python-%{pypi_name}
Version: 2.2
Release: 2
Version: 1.10
Release: 15
Summary: Resolve JSON Pointers in Python
License: BSD
URL: https://github.com/stefankoegl/python-json-pointer
Source0: https://pypi.io/packages/source/j/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
Patch0: backport-fix-invalid-escape-sequence-50.patch
BuildArch: noarch
%description
python-json-pointer is a Python library for resolving JSON pointers (RFC 6901). Python 2.7, 3.4+ and PyPy are supported.
%if %{with python2}
%package -n python2-%{pypi_name}
Summary: Resolve JSON Pointers in Python
BuildRequires: python2-devel python2-setuptools
%{?python_provide:%python_provide python2-%{pypi_name}}
%description -n python2-%{pypi_name}
python-json-pointer is a Python library for resolving JSON pointers (RFC 6901).
%endif
%if %{with python3}
%package -n python3-%{pypi_name}
Summary: Resolve JSON Pointers in Python
BuildRequires: python3-devel python3-setuptools
@ -24,6 +34,7 @@ BuildRequires: python3-devel python3-setuptools
%description -n python3-%{pypi_name}
python-json-pointer is a Python library for resolving JSON pointers (RFC 6901).
%endif
%package_help
@ -31,48 +42,64 @@ python-json-pointer is a Python library for resolving JSON pointers (RFC 6901).
%autosetup -n %{pypi_name}-%{version}
%build
%if %{with python2}
%py2_build
%endif
%if %{with python3}
LC_ALL=en_US.UTF-8 %py3_build
%endif
%install
%if %{with python2}
%py2_install
mv %{buildroot}%{_bindir}/jsonpointer %{buildroot}%{_bindir}/jsonpointer-%{python2_version}
ln -s ./jsonpointer-%{python2_version} %{buildroot}%{_bindir}/jsonpointer-2
%if %{without python3}
ln -s ./jsonpointer-%{python2_version} %{buildroot}%{_bindir}/jsonpointer
%endif
%endif
%if %{with python3}
LC_ALL=en_US.UTF-8 %py3_install
mv %{buildroot}%{_bindir}/jsonpointer %{buildroot}%{_bindir}/jsonpointer-%{python3_version}
ln -s ./jsonpointer-%{python3_version} %{buildroot}%{_bindir}/jsonpointer-3
ln -s ./jsonpointer-%{python3_version} %{buildroot}%{_bindir}/jsonpointer
%endif
%check
%if %{with python3}
%{__python3} tests.py
%endif
%if %{with python2}
%{__python2} tests.py
%endif
%if %{with python2}
%files -n python2-%{pypi_name}
%license COPYING AUTHORS
%if %{without python3}
%{_bindir}/jsonpointer
%endif
%{_bindir}/jsonpointer-2*
%{python2_sitelib}/%{pypi_name}.py*
%{python2_sitelib}/*.egg-info
%endif
%if %{with python3}
%files -n python3-%{pypi_name}
%license COPYING AUTHORS
%{_bindir}/jsonpointer
%{_bindir}/jsonpointer-3*
%{python3_sitelib}/__pycache__/*
%{python3_sitelib}/%{pypi_name}.py*
%{python3_sitelib}/*.egg-info
%endif
%files help
%doc README.md
%changelog
* Mon Oct 24 2022 zhangruifang <zhangruifang1@h-partners.com> - 2.2-2
- fix invalid escape sequence
- fix bad date in changelog
* Tue Nov 23 2021 liudabo <liudabo1@huawei.com> - 2.2-1
- upgrade version to 2.2
* Thu Oct 29 2020 tianwei <tianwei12@huawei.com> - 2.0-2
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:delete python2
* Thu Jul 23 2020 dingyue <dingyue5@huawei.com> - 2.0-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:NA
* Fri Oct 11 2019 yefei <yefei25@huawei.com> - 1.10-15
- Type:enhancement
- ID:NA

View File

@ -1,4 +0,0 @@
version_control: github
src_repo: stefankoegl/python-json-pointer
tag_prefix: ^v
seperator: .