Skip to content

Add pulpcore-storage-s3 subpackage to pulpcore - #1760

Open
ekohl wants to merge 1 commit into
theforeman:rpm/developfrom
ekohl:rpm/develop-add-storages-subpackage
Open

ekohl wants to merge 1 commit into
theforeman:rpm/developfrom
ekohl:rpm/develop-add-storages-subpackage

Conversation

@ekohl

@ekohl ekohl commented Apr 2, 2025

Copy link
Copy Markdown
Member

This meta package pulls in the correct dependencies. This avoids the need for the installer to install a package that includes the Python version in the name.

@ekohl

ekohl commented Apr 2, 2025

Copy link
Copy Markdown
Member Author

I think repoclosure is broken, but not because of me.

@ekohl
ekohl force-pushed the rpm/develop-add-storages-subpackage branch from 5f743a4 to 9de9bb0 Compare April 8, 2025 09:16
This meta package pulls in the correct dependencies. This avoids the
need for the installer to install a package that includes the Python
version in the name.
@ekohl
ekohl force-pushed the rpm/develop-add-storages-subpackage branch from 9de9bb0 to 4bd0a3d Compare April 8, 2025 09:18
@Odilhao

Odilhao commented Apr 8, 2025

Copy link
Copy Markdown
Member

Can you update to something like this?

%package -n python%{python3_pkgversion}-%{pypi_name}+s3
Summary: Metapackage for python%{python3_pkgversion}-pulpcore: s3 compatible extra
Requires: python%{python3_pkgversion}-django-storages+s3
Provides: pulpcore-storage-s3

%description -n python%{python3_pkgversion}-%{pypi_name}+s3
This is a metapackage bringing in filecache extra requires for python%{python3_pkgversion}-%{pypi_name}
It contains no code, just makes sure the dependencies are installed.

%files -n python%{python3_pkgversion}-%{pypi_name}+s3
%ghost %{python3_sitelib}/%{pypi_name}-%{version}.dist-info/

We also need one comps entry with:

      <packagereq type="default">python3.12-pulpcore+s3</packagereq>

This PR will add the required packages #1848

Now we have the packages with rich dependencies after merge:

Provides: python3.12-django-storages = 1.14.5-4.el9 python3.12dist(django-storages) = 1.14.5
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PartialHardlinkSets) <= 4.0.4-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Requires: python(abi) = 3.12 python3.12dist(django) >= 3.2
Obsoletes: python3.11-django-storages < 1.14.5-4.el9
Processing files: python3.12-django-storages+s3-1.14.5-4.el9.noarch
Provides: python3.12-django-storages+s3 = 1.14.5-4.el9 python3.12dist(django-storages[s3]) = 1.14.5
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Requires: python(abi) = 3.12 python3.12dist(boto3) >= 1.4.4
Processing files: python3.12-django-storages+azure-1.14.5-4.el9.noarch
Provides: python3.12-django-storages+azure = 1.14.5-4.el9 python3.12dist(django-storages[azure]) = 1.14.5
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Requires: python(abi) = 3.12 python3.12dist(azure-core) >= 1.13 python3.12dist(azure-storage-blob) >= 12
Processing files: python3.12-django-storages+google-1.14.5-4.el9.noarch
Provides: python3.12-django-storages+google = 1.14.5-4.el9 python3.12dist(django-storages[google]) = 1.14.5
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Requires: python(abi) = 3.12 python3.12dist(google-cloud-storage) >= 1.32
Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/python3.12-django-storages-1.14.5-4.el9.x86_64

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants