Initial package for RHEL 8

python-tomli.spec

@@ -1,18 +1,18 @@
-# This package buildrequires flit_core to build the wheel, but flit_core requires tomli.
-# To bootstrap, we copy the files to appropriate locations manually and create a minimal dist-info metadata.
-# Note that as a pure Python package, the wheel contains no pre-built binary stuff.
-# When bootstrap is enabled, we don't run tests either, just an import check.
-%bcond_with     bootstrap
-
 Name:           python-tomli
 Version:        1.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A little TOML parser for Python
 
 License:        MIT
 URL:            https://pypi.org/project/tomli/
 %global forgeurl https://github.com/hukkin/tomli
 Source0:        %{forgeurl}/archive/%{version}/%{name}-%{version}.tar.gz
+
+# Upstream tomli uses flit, but we want to use setuptools on RHEL 8.
+# This a downstream-only setup.py manually created from pyproject.toml metadata.
+# It contains a @@VERSION@@ placeholder.
+Source1:        tomli-setup.py
+
 # RHEL 8's pytest is too old and does not support the tmp_path filter.
 Patch0:         0001-tests-Replace-tmp_path-with-tmpdir-pytest-fixture.patch
 # RHEL 8's old dateutil is missing parser.isoparse.
@@ -21,15 +21,10 @@ Patch1:         %{forgeurl}/commit/a54d95e.patch#/Remove_python-dateutil_test_de
 
 BuildArch:      noarch
 BuildRequires:  python3-devel
-# pip is needed for %%py3_install_wheel
+BuildRequires:  python3-setuptools
-BuildRequires:  python3-pip
 
-%if %{without bootstrap}
+# Upstream test requirements are in tests/requirements.txt
-BuildRequires:  python3-flit-core
-# Upstream test requirements are in tests/requirements.txt,
-# but they're mixed together with coverage ones. Tests only need:
 BuildRequires:  python3-pytest
-%endif
 
 %global _description %{expand:
 Tomli is a Python library for parsing TOML.
@@ -46,39 +41,19 @@ Summary:        %{summary}
 
 %prep
 %autosetup -p1 -n tomli-%{version}
+sed 's/@@VERSION@@/%{version}/' %{SOURCE1} > setup.py
+
 
 %build
-%if %{without bootstrap}
+%py3_build
-%{python3} -m flit_core.wheel
-%else
-%global distinfo tomli-%{version}+rpmbootstrap.dist-info
-mkdir %{distinfo}
-cat > %{distinfo}/METADATA << EOF
-Metadata-Version: 2.2
-Name: tomli
-Version: %{version}+rpmbootstrap
-EOF
-%endif
 
 
 %install
-%if %{without bootstrap}
+%py3_install
-%py3_install_wheel tomli-%{version}-py3-none-any.whl
-%else
-mkdir -p %{buildroot}%{python3_sitelib}
-cp -a tomli %{distinfo} %{buildroot}%{python3_sitelib}
-%endif
 
 
 %check
-%py3_check_import tomli
-%if %{without bootstrap}
-# assert the properly built package has no runtime requires
-# if it does, we need to change the bootstrap metadata
-test -f %{buildroot}%{python3_sitelib}/tomli-%{version}.dist-info/METADATA
-grep '^Requires-Dist:' %{buildroot}%{python3_sitelib}/tomli-%{version}.dist-info/METADATA && exit 1 || true
 %pytest
-%endif
 
 
 %files -n python3-tomli
@@ -86,36 +61,14 @@ grep '^Requires-Dist:' %{buildroot}%{python3_sitelib}/tomli-%{version}.dist-info
 %doc CHANGELOG.md
 %license LICENSE
 %{python3_sitelib}/tomli/
-%{python3_sitelib}/tomli-%{version}%{?with_bootstrap:+rpmbootstrap}.dist-info/
+%{python3_sitelib}/tomli-%{version}-py%{python3_version}.egg-info/
 
 
 %changelog
-* Sat Nov 12 2022 Maxwell G <gotmax@e.email> - 1.2.3-3
+* Wed Mar 08 2023 Miro Hrončok <mhroncok@redhat.com> - 1.2.3-4
-- Add missing build dependency on python3-pip
+- Initial package for RHEL 8
-
+- Resolves: rhbz#2175215
-* Tue Oct 11 2022 Maxwell G <gotmax@e.email> - 1.2.3-2
+- Fedora+EPEL contributions by:
-- Initial EPEL 8 build (rhbz#2133112).
+      Maxwell G <gotmax@e.email>
-
+      Miro Hrončok <miro@hroncok.cz>
-* Wed Feb 02 2022 Petr Viktorin <pviktori@redhat.com> - 1.2.3-1
+      Petr Viktorin <pviktori@redhat.com>
-- Update to 1.2.3
-  - Allow lower case "t" and "z" in datetimes
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Oct 29 2021 Miro Hrončok <mhroncok@redhat.com> - 1.2.2-2
-- Allow a bootstrap build without flit_core
-
-* Wed Oct 27 2021 Petr Viktorin <pviktori@redhat.com> - 1.2.2-1
-- Update to version 1.2.2
-
-* Wed Aug 18 2021 Petr Viktorin <pviktori@redhat.com> - 1.2.1-1
-- Update to version 1.2.1
-  - loading text (as opposed to binary) files is deprecated
-
-* Thu Jul 29 2021 Petr Viktorin <pviktori@redhat.com> - 1.1.0-1
-- Update to version 1.1.0
-  - `load` can now take a binary file object
-
-* Thu Jul 22 2021 Petr Viktorin <pviktori@redhat.com> - 1.0.4-1
-- Initial package

tomli-setup.py

@@ -0,0 +1,37 @@
+import pathlib
+from setuptools import setup
+
+setup(
+    name="tomli",
+    version="@@VERSION@@",
+    description="A lil' TOML parser",
+    long_description=pathlib.Path("README.md").read_text(),
+    long_description_content_type="text/markdown",
+    packages=["tomli"],
+    package_data={"tomli": ["py.typed"]},
+    python_requires=">=3.6",
+    author="Taneli Hukkinen",
+    author_email="hukkin@users.noreply.github.com",
+    license="MIT",
+    classifiers=[
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: MacOS",
+        "Operating System :: Microsoft :: Windows",
+        "Operating System :: POSIX :: Linux",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        "Typing :: Typed",
+    ],
+    keywords=["toml"],
+    project_urls={
+        "Homepage": "https://github.com/hukkin/tomli",
+        "Changelog": "https://github.com/hukkin/tomli/blob/master/CHANGELOG.md",
+    },
+)