Compare commits

...

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

2
.gitignore vendored

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

@ -1 +1 @@
fbca135887b3c79e7f08fff6a34fef053746151b SOURCES/jsonschema-3.2.0.tar.gz 9173714cb88964d07f3a3f4fcaaef638b8ceac0c SOURCES/jsonschema-4.19.1.tar.gz

@ -0,0 +1,61 @@
From cbe20c5d50c40167a0736e4175330b6ba11ca9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Wed, 26 Jun 2024 15:46:22 +0200
Subject: [PATCH] Remove hatch-vcs and hatch-fancy-pypi-readme deps
These apparently have no effect on the built RPM (I checked manually),
so let's drop them from pyproject.toml, so we can remove them from RHEL.
---
pyproject.toml | 29 +----------------------------
1 file changed, 1 insertion(+), 28 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 26d299a..a2bda8c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,7 @@
[build-system]
-requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme"]
+requires = ["hatchling"]
build-backend = "hatchling.build"
-[tool.hatch.version]
-source = "vcs"
-
[project]
name = "jsonschema"
description = "An implementation of JSON Schema validation for Python"
@@ -77,30 +74,6 @@ Tidelift = "https://tidelift.com/subscription/pkg/pypi-jsonschema?utm_source=pyp
Changelog = "https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst"
Source = "https://github.com/python-jsonschema/jsonschema"
-[tool.hatch.metadata.hooks.fancy-pypi-readme]
-content-type = "text/x-rst"
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-path = "README.rst"
-end-before = ".. start cut from PyPI"
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-path = "README.rst"
-start-after = ".. end cut from PyPI\n\n\n"
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-text = """
-
-
-Release Information
--------------------
-
-"""
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-path = "CHANGELOG.rst"
-pattern = "(^v.+?)\nv"
-
[tool.coverage.html]
show_contexts = true
skip_covered = false
--
2.45.2

@ -9,81 +9,161 @@ jsonschema is an implementation of JSON Schema for Python (supporting
- Small and extensible - Small and extensible
- Programmatic querying of which properties or items failed validation.} - 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 Summary: Implementation of JSON Schema validation for Python
Version: 3.2.0 Version: 4.19.1
Release: 13%{?dist} Release: 7%{?dist}
License: MIT License: MIT
URL: https://github.com/Julian/jsonschema URL: https://github.com/Julian/jsonschema
Source0: %{pypi_source} Source0: %{pypi_source}
Patch0: 0001-Remove-hatch-vcs-and-hatch-fancy-pypi-readme-deps.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3dist(setuptools) # test requirements
BuildRequires: python3dist(setuptools-scm) %if %{defined rhel}
%bcond_with tests
%else
%bcond_without tests
%endif
%if %{with tests}
# For “trial-3”
BuildRequires: python3dist(twisted)
%endif
%description %{common_description} %description %{common_description}
%package -n python3-%{pypi_name} %package -n python3-%{pypi_name}
Summary: %{summary} Summary: %{summary}
# This subpackage was removed for missing deps:
Obsoletes: python3-%{pypi_name}+format < 3.2.0-12
%{?python_provide:%python_provide python3-%{pypi_name}}
%description -n python3-%{pypi_name} %{common_description} %description -n python3-%{pypi_name} %{common_description}
%prep %prep
%autosetup -n %{pypi_name}-%{version} %autosetup -n %{pypi_name}-%{version} -p1
# Remove bundled egg-info # Requires a checkout of the JSON-Schema-Test-Suite
rm -rf %{pypi_name}.egg-info # https://github.com/json-schema-org/JSON-Schema-Test-Suite
rm jsonschema/tests/test_jsonschema_test_suite.py
%generate_buildrequires
%pyproject_buildrequires -w
%build %build
%py3_build %pyproject_wheel
%install %install
%py3_install %pyproject_install
%pyproject_save_files %{pypi_name}
%if %{with tests}
%check
PYTHONPATH=%{buildroot}%{python3_sitelib} trial-3 %{pypi_name}
%endif
%files -n python3-%{pypi_name} %files -n python3-%{pypi_name} -f %{pyproject_files}
%license COPYING json/LICENSE %license COPYING json/LICENSE
%doc README.rst %doc README.rst
%{_bindir}/jsonschema %{_bindir}/jsonschema
%{python3_sitelib}/%{pypi_name}/ %changelog
%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/ * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 4.19.1-7
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.19.1-6
- Rebuilt for MSVSphere 10
* Thu Jun 27 2024 Ondřej Budai <obudai@redhat.com> - 4.19.1-6
- Remove meta-subpackages because they are not needed in RHEL
%changelog * Wed Jun 26 2024 Ondřej Budai <obudai@redhat.com> - 4.19.1-5
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.2.0-13 - Drop unneeded build dependencies
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.19.1-4
- Bump release for June 2024 mass rebuild
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.19.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.19.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Sep 20 2023 Joel Capitao <jcapitao@redhat.com> - 4.19.1-1
- Update to 4.19.1 release (#2239879)
* Mon Aug 07 2023 Joel Capitao <jcapitao@redhat.com> - 4.19.0-1
- Update to 4.19.0 release (#2139238)
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.17.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jun 29 2023 Python Maint <python-maint@redhat.com> - 4.17.3-4
- Rebuilt for Python 3.12
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 4.17.3-3
- Bootstrap for Python 3.12
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.17.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Dec 19 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.17.3-1
- Update to 4.17.3 release
* Mon Nov 07 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.17.0-1
- Update to 4.17.0 release
* Wed Sep 21 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.16.0-1
- Update to 4.16.0 release
* Wed Aug 17 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.10.0-1
- Update to 4.10.0 release
* Mon Aug 01 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.9.0-1
- Update to 4.9.0 release
* Sun Jul 24 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.7.2-1
- Update to 4.7.2 release
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jun 28 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 4.6.0-3
- Drop some BuildRequires that are generated or no longer needed
* Tue Jun 28 2022 Miro Hrončok <mhroncok@redhat.com> - 4.6.0-2
- Include the metadata directory in python3-jsonschema
- Fixes: rhbz#2101786
* Mon Jun 27 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.6.0-1
- Update to 4.6.0
* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 3.2.0-17
- Rebuilt for Python 3.11
* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 3.2.0-16
- Bootstrap for Python 3.11
* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 3.2.0-15
- Rebuilt for Python 3.11
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.2.0-14
- Bootstrap for Python 3.11
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed May 19 2021 Miroslav Rezanina <mrezanin@redhat.com> - 3.2.0-12 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-12
- Remove +format metapackage - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
- Resolves: rhbz#1952356
* Wed Apr 21 2021 Miroslav Rezanina <mrezanin@redhat.com> - 3.2.0-11 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.2.0-11
- Remove unwanted packages - Rebuilt for Python 3.10
- Resolves: bz#1935823
- Resolves: bz#1942562
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.2.0-10 * Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 3.2.0-10
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Bootstrap for Python 3.10
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-9 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save