Compare commits

...

No commits in common. 'i10c-beta' and 'c9' have entirely different histories.

2
.gitignore vendored

@ -1 +1 @@
SOURCES/attrs-23.2.0.tar.gz SOURCES/attrs-20.3.0.tar.gz

@ -1 +1 @@
42f867af79ff72fcf054adce2c87fa9ef5cb04c2 SOURCES/attrs-23.2.0.tar.gz f0f9640820631a78ade009cf83336c1fa49d5a51 SOURCES/attrs-20.3.0.tar.gz

@ -1,98 +0,0 @@
From dea54349ce9d0bc12f5ea27d9ba1f1821cd06faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Wed, 26 Jun 2024 17:04:38 +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 | 51 +++-----------------------------------------------
1 file changed, 3 insertions(+), 48 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 1c72fc2..d61be73 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,12 +1,13 @@
# SPDX-License-Identifier: MIT
[build-system]
-requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme>=23.2.0"]
+requires = ["hatchling"]
build-backend = "hatchling.build"
[project]
name = "attrs"
+version = "23.2.0"
authors = [{ name = "Hynek Schlawack", email = "hs@ox.cx" }]
license = "MIT"
requires-python = ">=3.7"
@@ -26,7 +27,7 @@ classifiers = [
"Typing :: Typed",
]
dependencies = ["importlib_metadata;python_version<'3.8'"]
-dynamic = ["version", "readme"]
+dynamic = ["readme"]
[project.optional-dependencies]
tests-mypy = [
@@ -69,55 +70,9 @@ GitHub = "https://github.com/python-attrs/attrs"
Funding = "https://github.com/sponsors/hynek"
Tidelift = "https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi"
-
-[tool.hatch.version]
-source = "vcs"
-raw-options = { local_scheme = "no-local-version" }
-
[tool.hatch.build.targets.wheel]
packages = ["src/attr", "src/attrs"]
-[tool.hatch.metadata.hooks.fancy-pypi-readme]
-content-type = "text/markdown"
-
-# PyPI doesn't support the <picture> tag.
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-text = """<p align="center">
- <a href="https://www.attrs.org/">
- <img src="https://raw.githubusercontent.com/python-attrs/attrs/main/docs/_static/attrs_logo.svg" width="35%" alt="attrs" />
- </a>
-</p>
-"""
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-path = "README.md"
-start-after = "<!-- teaser-begin -->"
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-text = """
-
-## Release Information
-
-"""
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-path = "CHANGELOG.md"
-pattern = "\n(###.+?\n)## "
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-text = """
-
----
-
-[Full changelog](https://www.attrs.org/en/stable/changelog.html)
-"""
-
-# Point sponsor image URLs to versions.
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]]
-pattern = '\/latest\/_static/sponsors'
-replacement = '/$HFPR_VERSION/_static/sponsors'
-
-
[tool.pytest.ini_options]
addopts = ["-ra", "--strict-markers", "--strict-config"]
xfail_strict = true
--
2.45.2

@ -1,26 +1,28 @@
%global modname attrs # Disable tests on RHEL9 as to not pull in the test dependencies
# Specify --with tests to run the tests e.g. on EPEL
%if 0%{?rhel}
# Avoid unwanted/unavailable dependencies in RHEL builds
%bcond_with tests %bcond_with tests
%else
# Turn the tests off when bootstrapping Python, because pytest requires attrs %global modname attrs
%bcond_without tests
%endif
Name: python-attrs Name: python-attrs
Version: 23.2.0 Version: 20.3.0
Release: 6%{?dist} Release: 7%{?dist}
Summary: Python attributes without boilerplate Summary: Python attributes without boilerplate
# SPDX
License: MIT License: MIT
URL: http://www.attrs.org/ URL: http://www.attrs.org/
BuildArch: noarch BuildArch: noarch
Source0: https://github.com/python-attrs/%{modname}/archive/%{version}/%{modname}-%{version}.tar.gz Source0: https://github.com/hynek/%{modname}/archive/%{version}/%{modname}-%{version}.tar.gz
Patch0: 0001-Remove-hatch-vcs-and-hatch-fancy-pypi-readme-deps.patch
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
%if %{with tests}
BuildRequires: python%{python3_pkgversion}-pytest
BuildRequires: python%{python3_pkgversion}-hypothesis
BuildRequires: python%{python3_pkgversion}-six
BuildRequires: python%{python3_pkgversion}-zope-interface
%endif
%description %description
attrs is an MIT-licensed Python package with class decorators that attrs is an MIT-licensed Python package with class decorators that
@ -38,113 +40,42 @@ object protocols.
%prep %prep
%setup -q -n %{modname}-%{version} %setup -q -n %{modname}-%{version}
%patch -P 0 -p1
# Remove undesired/optional test dependency on pympler
sed -i '/"pympler",/d' pyproject.toml
# Remove tests-mypy extra from tests-no-zope extra
sed -i "/attrs\[tests-mypy\]/d" pyproject.toml
%generate_buildrequires
%pyproject_buildrequires %{?with_tests:-x tests}
%build %build
%pyproject_wheel %py3_build
%install %install
%pyproject_install %py3_install
%pyproject_save_files attr attrs
%check
%pyproject_check_import
%if %{with tests} %if %{with tests}
%pytest %check
PYTHONPATH=%{buildroot}/%{python3_sitelib} py.test-3 -v
%endif %endif
%files -n python%{python3_pkgversion}-%{modname} -f %{pyproject_files} %files -n python%{python3_pkgversion}-%{modname}
%license LICENSE %license LICENSE
%doc README.md %doc AUTHORS.rst README.rst
%{python3_sitelib}/*
%changelog %changelog
* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 23.2.0-6 * Tue Feb 22 2022 Tomas Orsava <torsava@redhat.com> - 20.3.0-7
- Rebuilt for MSVSphere 10 - Add gating configuration and a simple smoke test
- Related: rhbz#1950291
* Wed Jun 26 2024 Ondřej Budai <obudai@redhat.com> - 23.2.0-6
- Drop unneeded build dependencies
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 23.2.0-5
- Bump release for June 2024 mass rebuild
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 15 2024 Miro Hrončok <mhroncok@redhat.com> - 23.2.0-2
- Remove undesired/optional test dependency on pympler
* Tue Jan 02 2024 Lumír Balhar <lbalhar@redhat.com> - 23.2.0-1
- Update to 23.2.0 (rhbz#2256322)
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 23.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 04 2023 Python Maint <python-maint@redhat.com> - 23.1.0-3
- Rebuilt for Python 3.12
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 23.1.0-2
- Bootstrap for Python 3.12
* Wed May 17 2023 Lumír Balhar <lbalhar@redhat.com> - 23.1.0-1
- Update to 23.1.0 (rhbz#2187066)
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 22.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Dec 21 2022 Lumír Balhar <lbalhar@redhat.com> - 22.2.0-1
- Update to 22.2.0 (rhbz#2155469)
* Fri Jul 29 2022 Lumír Balhar <lbalhar@redhat.com> - 22.1.0-1
- Update to 22.1.0
Resolves: rhbz#2112006
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.4.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jun 24 2022 Lumír Balhar <lbalhar@redhat.com> - 21.4.0-5
- Fixed compatibility with Python 3.11 beta 3
Resolves: rhbz#2039259
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 21.4.0-4
- Rebuilt for Python 3.11
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 21.4.0-3
- Bootstrap for Python 3.11
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Jan 03 2022 Lumír Balhar <lbalhar@redhat.com> - 21.4.0-1
- Update to 21.4.0
Resolves: rhbz#2035864
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 21.2.0-3 * Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 20.3.0-6
- Rebuilt for Python 3.10 - Add automatically generated Obsoletes tag with the python39- prefix
for smoother upgrade from RHEL8
- Related: rhbz#1990421
* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 21.2.0-2 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 20.3.0-5
- Bootstrap for Python 3.10 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri May 07 2021 Lumír Balhar <lbalhar@redhat.com> - 21.2.0-1 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 20.3.0-4
- Update to 21.2.0 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
Resolves: rhbz#1957660
* Wed May 05 2021 Lumír Balhar <lbalhar@redhat.com> - 20.3.0-3 * Wed Mar 10 2021 Charalampos Stratakis <cstratak@redhat.com> - 20.3.0-3
- Fix tests with Python 3.10 - Disable tests on RHEL9 to avoid pulling in the test dependencies
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.3.0-2 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save