Compare commits

..

No commits in common. 'c9' and 'i8c' have entirely different histories.
c9 ... i8c

2
.gitignore vendored

@ -1 +1 @@
SOURCES/jsonschema-3.2.0.tar.gz SOURCES/jsonschema-2.6.0.tar.gz

@ -1 +1 @@
fbca135887b3c79e7f08fff6a34fef053746151b SOURCES/jsonschema-3.2.0.tar.gz 97e49df4601f7066d9954c0ec4d8d697887b32f0 SOURCES/jsonschema-2.6.0.tar.gz

@ -0,0 +1,58 @@
diff -ru jsonschema-2.6.0.orig/jsonschema/compat.py jsonschema-2.6.0/jsonschema/compat.py
--- jsonschema-2.6.0.orig/jsonschema/compat.py 2015-11-30 13:58:04.000000000 +0100
+++ jsonschema-2.6.0/jsonschema/compat.py 2017-07-21 12:57:25.768508757 +0200
@@ -8,6 +8,7 @@
from collections.abc import MutableMapping, Sequence # noqa
PY3 = sys.version_info[0] >= 3
+PY27 = sys.version_info[:2] == (2, 7)
if PY3:
zip = zip
@@ -32,8 +33,10 @@
int_types = int, long
iteritems = operator.methodcaller("iteritems")
- from functools32 import lru_cache
-
+ if PY27:
+ from repoze.lru import lru_cache
+ else:
+ from functools32 import lru_cache
# On python < 3.3 fragments are not handled properly with unknown schemes
def urlsplit(url):
diff -ru jsonschema-2.6.0.orig/setup.py jsonschema-2.6.0/setup.py
--- jsonschema-2.6.0.orig/setup.py 2016-08-28 04:29:36.000000000 +0200
+++ jsonschema-2.6.0/setup.py 2017-07-21 13:28:06.503903938 +0200
@@ -1,6 +1,7 @@
import os
from setuptools import setup
+from jsonschema import _version
with open(os.path.join(os.path.dirname(__file__), "README.rst")) as readme:
@@ -22,14 +23,14 @@
extras_require = {
"format" : ["rfc3987", "strict-rfc3339", "webcolors"],
- ":python_version=='2.7'": ["functools32"],
+ ":python_version=='2.7'": ["repoze.lru"],
}
setup(
name="jsonschema",
+ version=_version.__version__,
packages=["jsonschema", "jsonschema.tests"],
package_data={"jsonschema": ["schemas/*.json"]},
- setup_requires=["vcversioner>=2.16.0.0"],
extras_require=extras_require,
author="Julian Berman",
author_email="Julian@GrayVines.com",
@@ -39,5 +40,4 @@
long_description=long_description,
url="http://github.com/Julian/jsonschema",
entry_points={"console_scripts": ["jsonschema = jsonschema.cli:main"]},
- vcversioner={"version_module_paths" : ["jsonschema/_version.py"]},
)

@ -0,0 +1,12 @@
diff -U3 -r jsonschema-2.6.0-orig/jsonschema/tests/test_jsonschema_test_suite.py jsonschema-2.6.0/jsonschema/tests/test_jsonschema_test_suite.py
--- jsonschema-2.6.0-orig/jsonschema/tests/test_jsonschema_test_suite.py 2016-11-27 16:49:17.000000000 +0100
+++ jsonschema-2.6.0/jsonschema/tests/test_jsonschema_test_suite.py 2018-05-30 15:29:44.840669853 +0200
@@ -47,7 +47,7 @@
JSONSCHEMA_SUITE = os.path.join(SUITE, "bin", "jsonschema_suite")
remotes_stdout = subprocess.Popen(
- ["python", JSONSCHEMA_SUITE, "remotes"], stdout=subprocess.PIPE,
+ [sys.executable, JSONSCHEMA_SUITE, "remotes"], stdout=subprocess.PIPE,
).stdout
with closing(remotes_stdout):

@ -1,52 +1,41 @@
# Created by pyp2rpm-0.4.2
%global pypi_name jsonschema %global pypi_name jsonschema
%global common_description %{expand:
jsonschema is an implementation of JSON Schema for Python (supporting
2.7+, including Python 3).
- Full support for Draft 7, Draft 6, Draft 4 and Draft 3
- Lazy validation that can iteratively report all validation errors.
- Small and extensible
- Programmatic querying of which properties or items failed validation.}
%{?python_enable_dependency_generator}
Name: python-%{pypi_name} Name: python-%{pypi_name}
Summary: Implementation of JSON Schema validation for Python Version: 2.6.0
Version: 3.2.0 Release: 4%{?dist}
Release: 13%{?dist} Summary: An implementation of JSON Schema validation for Python
License: MIT
URL: https://github.com/Julian/jsonschema
Source0: %{pypi_source}
License: MIT
URL: http://pypi.python.org/pypi/jsonschema
Source0: https://files.pythonhosted.org/packages/source/j/jsonschema/%{pypi_name}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: python3-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-nose
BuildRequires: python%{python3_pkgversion}-mock
BuildRequires: python3dist(setuptools) # avoid functools32, vcversioner
BuildRequires: python3dist(setuptools-scm) Patch0: avoid-unpackaged-for-jsonschema-2.6.0.patch
Patch1: test-sys-executable.patch
%description %{common_description} %description
jsonschema is JSON Schema validator currently based on
http://tools.ietf.org/html/draft-zyp-json-schema-03
%package -n python%{python3_pkgversion}-%{pypi_name}
Summary: An implementation of JSON Schema validation for Python %{python3_version}
%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
%package -n python3-%{pypi_name} %description -n python%{python3_pkgversion}-%{pypi_name}
Summary: %{summary} jsonschema is JSON Schema validator currently based on
# This subpackage was removed for missing deps: http://tools.ietf.org/html/draft-zyp-json-schema-03
Obsoletes: python3-%{pypi_name}+format < 3.2.0-12
%{?python_provide:%python_provide python3-%{pypi_name}}
%description -n python3-%{pypi_name} %{common_description}
%prep %prep
%autosetup -n %{pypi_name}-%{version} %setup -q -n %{pypi_name}-%{version}
%patch0 -p1
# Remove bundled egg-info %patch1 -p1
rm -rf %{pypi_name}.egg-info
%build %build
%py3_build %py3_build
@ -54,107 +43,27 @@ rm -rf %{pypi_name}.egg-info
%install %install
%py3_install %py3_install
mv %{buildroot}%{_bindir}/jsonschema %{buildroot}%{_bindir}/jsonschema-3
%check
%{__python3} -m nose -v
%files -n python%{python3_pkgversion}-%{pypi_name}
%license COPYING
%files -n python3-%{pypi_name}
%license COPYING json/LICENSE
%doc README.rst %doc README.rst
%{_bindir}/jsonschema-3
%{_bindir}/jsonschema
%{python3_sitelib}/%{pypi_name}/ %{python3_sitelib}/%{pypi_name}/
%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/ %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
%changelog %changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.2.0-13 * Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2.6.0-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for MSVSphere 8.8
Related: rhbz#1991688
* Wed May 19 2021 Miroslav Rezanina <mrezanin@redhat.com> - 3.2.0-12
- Remove +format metapackage
- Resolves: rhbz#1952356
* Wed Apr 21 2021 Miroslav Rezanina <mrezanin@redhat.com> - 3.2.0-11
- Remove unwanted packages
- Resolves: bz#1935823
- Resolves: bz#1942562
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.2.0-10
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Nov 10 2020 Nils Philippsen <nils@redhat.com> - 3.2.0-8
- Provide python3dist(jsonschema[format]) again (#1878976)
* Tue Sep 29 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2.0-7
- Remove metapackage for python3dist(jsonschema[format]) (missing deps, #1880820)
* Sat Sep 19 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2.0-6 * Wed May 30 2018 Petr Viktorin <pviktori@redhat.com> - 2.6.0-4
- Add metapackage for python3dist(jsonschema[format]) needed by python3-bravado-core (#1878976) - Drop the Python2 subpackage
https://bugzilla.redhat.com/show_bug.cgi?id=1584189
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-5 - Use sys.executable rather than unversioned "python" in tests
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2.0-4
- Rebuilt for Python 3.9
* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2.0-3
- Bootstrap for Python 3.9
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Dec 07 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.0-1
- Update to version 3.2.0.
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.2-4
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.2-3
- Rebuilt for Python 3.8
* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.2-2
- Bootstrap for Python 3.8
* Fri Aug 02 2019 Fabio Valentini <decathorpe@gmail.com> - 3.0.2-1
- Update to version 3.0.2.
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Mar 01 2019 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-1
- Update to version 3.0.1.
* Sun Feb 24 2019 Fabio Valentini <decathorpe@gmail.com> - 3.0.0-1
- Update to version 3.0.0.
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~b3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 28 2019 Fabio Valentini <decathorpe@gmail.com> - 3.0.0~b3-1
- Update to version 3.0.0b3.
* Tue Jan 22 2019 Fabio Valentini <decathorpe@gmail.com> - 3.0.0~b1-1
- Update to version 3.0.0b1.
* Sat Jan 19 2019 Fabio Valentini <decathorpe@gmail.com> - 3.0.0~a5-1
- Update to version 3.0.0a5.
- Moved python2 sub-package to separate source package.
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.6.0-5
- Rebuilt for Python 3.7
* Wed Feb 21 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.6.0-4
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-3 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@ -187,6 +96,7 @@ rm -rf %{pypi_name}.egg-info
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-4 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 2.4.0-3 * Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 2.4.0-3
- Rebuilt for Python3.5 rebuild - Rebuilt for Python3.5 rebuild
@ -229,4 +139,3 @@ rm -rf %{pypi_name}.egg-info
* Wed May 23 2012 Pádraig Brady <P@draigBrady.com> - 0.2-1 * Wed May 23 2012 Pádraig Brady <P@draigBrady.com> - 0.2-1
- Initial package. - Initial package.

Loading…
Cancel
Save