diff --git a/.gitignore b/.gitignore index 6745d93..0c978d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /flexcache-0.2.tar.gz +/flexcache-0.3.tar.gz diff --git a/flexcache-0.2-setuptools.patch b/flexcache-0.2-setuptools.patch deleted file mode 100644 index 356eeae..0000000 --- a/flexcache-0.2-setuptools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur flexcache-0.2-original/setup.cfg flexcache-0.2/setup.cfg ---- flexcache-0.2-original/setup.cfg 2022-02-27 23:12:46.468990600 -0500 -+++ flexcache-0.2/setup.cfg 2024-03-11 08:32:50.998736526 -0400 -@@ -26,6 +26,8 @@ - zip_safe = True - include_package_data = True - python_requires = >=3.7 -+install_requires = -+ setuptools - setup_requires = - setuptools - setuptools_scm diff --git a/python-flexcache.spec b/python-flexcache.spec index 53e5fdf..90a60a3 100644 --- a/python-flexcache.spec +++ b/python-flexcache.spec @@ -1,5 +1,5 @@ Name: python-flexcache -Version: 0.2 +Version: 0.3 Release: %autorelease Summary: Cache on disk the result of expensive calculations @@ -7,18 +7,10 @@ License: BSD-3-Clause URL: https://github.com/hgrecco/flexcache Source: %{pypi_source flexcache} -# Add setuptools to the runtime dependencies -# -# This is needed for the “import pkg_resources” in the top-level -# __init__.py. -# -# Downstream-only because version 0.3 of flexcache does not use pkg_resources, -# so this is a temporary patch for version 0.2 only. -Patch: flexcache-0.2-setuptools.patch - BuildArch: noarch BuildRequires: python3-devel +BuildRequires: tomcli %global common_description %{expand: A robust and extensible package to cache on disk the result of expensive @@ -34,9 +26,10 @@ Summary: %{summary} %prep -%autosetup -n flexcache-%{version} -p1 +%autosetup -n flexcache-%{version} # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters -sed -r -i 's/^([[:blank:]]*)\b(pytest-cov)\b/\1# \2/' setup.cfg +tomcli set pyproject.toml lists delitem project.optional-dependencies.test \ + 'pytest-cov*' %generate_buildrequires diff --git a/sources b/sources index bf2b8f3..902a79c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flexcache-0.2.tar.gz) = d06f854e32ee8b5449e695bb51968f5b674fe32f553d8357c1854b90d200cdde6d48c8d91ddce121b7cd2b1fd7d3b12cc91e708ebd9f4a1b5d622610c9302321 +SHA512 (flexcache-0.3.tar.gz) = 2e555694d7d3f613843bbcc74ae873972c90683b1fc4408507d5053bae67b5302e80c83be9170481e43c663be90f5dad24be31e08db9d5c2e2024009ba77debd