PR#7: Add cachecontrol[filecache] and cachecontrol[redis] subpackages - rpms/python-CacheControl

rpms / python-CacheControl

#7 Add cachecontrol[filecache] and cachecontrol[redis] subpackages

Merged 9 months ago by decathorpe. Opened 9 months ago by churchyard.

rpms/ churchyard/python-CacheControl extras into master

Add cachecontrol[filecache] and cachecontrol[redis] subpackages

Miro Hrončok • 9 months ago

66795aa

python-CacheControl.spec

file modified

+10 -3

		`@@ -12,7 +12,7 @@`
		`Name: python-%{pypi_name}`
		`Summary: httplib2 caching for requests`
		`Version: 0.12.6`
		`- Release: 4%{?dist}`
		`+ Release: 5%{?dist}`
		`License: MIT`

		`URL: https://github.com/ionrock/cachecontrol`
		`@@ -43,11 +43,15 @@`
		`BuildRequires: python3-requests`

		`# optional dependencies`
		`- Recommends: python3dist(lockfile) >= 0.9`
		`- Recommends: python3dist(redis) >= 2.10.5`
		`+ %{?python_extras_subpkg:Recommends: python3-%{pypi_name}+filecache}`
		`+ %{!?python_extras_subpkg:Recommends: python3dist(lockfile) >= 0.9}`
		`+`
		`+ %{?python_extras_subpkg:Recommends: python3-%{pypi_name}+redis}`
		`+ %{!?python_extras_subpkg:Recommends: python3dist(redis) >= 2.10.5}`

		`%description -n python3-%{pypi_name} %{common_description}`

		`+ %{?python_extras_subpkg:%python_extras_subpkg -n python3-%{pypi_name} -i %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info filecache redis}`

		`%prep`
		`%autosetup -n %{pypi_name_lower}-%{version} -p1`
		`@@ -77,6 +81,9 @@`


		`%changelog`
		`+ * Fri Jul 10 2020 Miro Hrončok <mhroncok@redhat.com> - 0.12.6-5`
		`+ - Add cachecontrol[filecache] and cachecontrol[redis] subpackages`
		`+`
		`* Fri Jun 05 2020 Miro Hrončok <mhroncok@redhat.com> - 0.12.6-4`
		`- Rebuilt with cherrypy tests`

churchyard commented 9 months ago

https://fedoraproject.org/wiki/Changes/PythonExtras

rebased onto 66795aa

9 months ago

churchyard commented 9 months ago

I've amended the PR to add [redis] as well and to recommend the extras subpackages if possible. Feel free to drop the %{!?python_extras_subpkg:...} parts as soon as you definitively diverge from F32.

decathorpe commented 9 months ago

rawhide / f32 branches will diverge after the f33 branch point, so that's soon anyway. So from my point of view we could even drop the conditional expansions right now :shrug:

Anyway, I think I understand what the change does, and the diff looks sane. Have the new macros landed in rawhide already?

And, once this PR is merged and built, I can drop the manual dependency for lockfile / python3-CacheControl+filecache in poetry, right?

churchyard commented 9 months ago

So from my point of view we could even drop the conditional expansions right now :shrug:

Given the :shrug: I will keep them for now. They can be dropped later.

Have the new macros landed in rawhide already?

Yes, see the results.

And, once this PR is merged and built, I can drop the manual dependency for lockfile / python3-CacheControl+filecache in poetry, right?

Yes, but please verify poetry requires python3.9dist(cachecontrol[filecache]) once rebuilt. It should:

$ repoquery --repo=python-extras --requires python3-poetry | grep filecache
(python3.9dist(cachecontrol[filecache]) < 0.13 with python3.9dist(cachecontrol[filecache]) >= 0.12.4)

decathorpe commented 9 months ago

Great. Thanks for confirming.