pulp-python 3.12.4__tar.gz → 3.13.0__tar.gz

{pulp-python-3.12.4 → pulp_python-3.13.0}/CHANGES.md

@@ -8,6 +8,45 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.13.0 (2025-02-05) {: #3.13.0 }
+
+#### Features {: #3.13.0-feature }
+
+- Added pulpcore 3.70 compatibility
+
+#### Bugfixes {: #3.13.0-bugfix }
+
+- Fixed uploads not supporting packages using metadata spec 2.3
+  [#682](https://github.com/pulp/pulp_python/issues/682)
+- Fixed the `package_types` filter breaking other remote filters.
+  [#691](https://github.com/pulp/pulp_python/issues/691)
+- Fixed package name normalization issue preventing syncing packages with "." or "_" in their names.
+  [#716](https://github.com/pulp/pulp_python/issues/716)
+- Fixed replicate failing on upstream on-demand repositories
+  [#718](https://github.com/pulp/pulp_python/issues/718)
+- Fixed `requires_python` field not being properly set on package upload.
+
+  Run the new `pulpcore-manager repair-python-metadata` command with repositories containing affected
+  packages to repair their metadata.
+  [#773](https://github.com/pulp/pulp_python/issues/773)
+- Fixed the JSONField specification so it doesn't break ruby bindings.
+  See context [here](https://github.com/pulp/pulp_rpm/issues/3639).
+
+#### Misc {: #3.13.0-misc }
+
+- [#774](https://github.com/pulp/pulp_python/issues/774)
+
+---
+
+## 3.12.5 (2024-10-25) {: #3.12.5 }
+
+#### Bugfixes {: #3.12.5-bugfix }
+
+- Fixed the JSONField specification so it doesn't break ruby bindings.
+  See context [here](https://github.com/pulp/pulp_rpm/issues/3639).
+
+---
+
 ## 3.12.4 (2024-10-14) {: #3.12.4 }
 
 #### Bugfixes {: #3.12.4-bugfix }
@@ -73,6 +112,27 @@
 
 ---
 
+## 3.11.3 (2024-08-21) {: #3.11.3 }
+
+#### Bugfixes {: #3.11.3-bugfix }
+
+- Fixed uploads not supporting packages using metadata spec 2.3
+  [#682](https://github.com/pulp/pulp_python/issues/682)
+- Fixed package name normalization issue preventing syncing packages with "." or "_" in their names.
+  [#716](https://github.com/pulp/pulp_python/issues/716)
+
+---
+
+## 3.11.2 (2024-06-27) {: #3.11.2 }
+
+
+#### Bugfixes {: #3.11.2-bugfix }
+
+- Fixed the `package_types` filter breaking other remote filters.
+  [#691](https://github.com/pulp/pulp_python/issues/691)
+
+---
+
 ## 3.11.1 (2024-04-11) {: #3.11.1 }
 
 ### Bugfixes

{pulp-python-3.12.4 → pulp_python-3.13.0}/MANIFEST.in

@@ -3,8 +3,10 @@ include requirements.txt
 include pyproject.toml
 include CHANGES.md
 include COMMITMENT
+exclude CONTRIBUTING.md
 include COPYRIGHT
 include functest_requirements.txt
 include test_requirements.txt
 include unittest_requirements.txt
 include pulp_python/app/webserver_snippets/*
+exclude releasing.md

{pulp-python-3.12.4 → pulp_python-3.13.0}/PKG-INFO

@@ -1,11 +1,13 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pulp-python
-Version: 3.12.4
+Version: 3.13.0
 Summary: pulp-python plugin for the Pulp Project
-Home-page: https://www.pulpproject.org
-Author: Pulp Project Developers
-Author-email: pulp-list@redhat.com
-License: GPLv2+
+Author-email: Pulp Team <pulp-list@redhat.com>
+Project-URL: Homepage, https://pulpproject.org
+Project-URL: Documentation, https://pulpproject.org/pulp_python/
+Project-URL: Repository, https://github.com/pulp/pulp_python
+Project-URL: Bug Tracker, https://github.com/pulp/pulp_python/issues
+Project-URL: Changelog, https://pulpproject.org/pulp_python/changes/
 Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Development Status :: 5 - Production/Stable
@@ -13,9 +15,16 @@ Classifier: Framework :: Django
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pulpcore<3.85,>=3.49.0
+Requires-Dist: pkginfo<1.12.0,>=1.10.0
+Requires-Dist: bandersnatch<7.0,>=6.3
+Requires-Dist: pypi-simple<2.0,>=1.5.0
 
 # pulp_python
 

{pulp-python-3.12.4 → pulp_python-3.13.0}/pulp_python/app/__init__.py

@@ -10,7 +10,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_python.app"
     label = "python"
-    version = "3.12.4"
+    version = "3.13.0"
     python_package_name = "pulp-python"
     domain_compatible = True
 

pulp_python-3.13.0/pulp_python/app/management/commands/repair-python-metadata.py

@@ -0,0 +1,118 @@
+import re
+import os
+from django.core.management import BaseCommand, CommandError
+from gettext import gettext as _
+
+from django.conf import settings
+
+from pulpcore.plugin.util import extract_pk
+from pulp_python.app.models import PythonPackageContent, PythonRepository
+from pulp_python.app.utils import artifact_to_python_content_data
+
+
+def repair_metadata(content):
+    """
+    Repairs the metadata for the passed in content queryset.
+    :param content: The PythonPackageContent queryset.
+    Return: number of content units that were repaired
+    """
+    # TODO: Add on_demand content repair?
+    os.chdir(settings.WORKING_DIRECTORY)
+    content = content.select_related("pulp_domain")
+    immediate_content = content.filter(contentartifact__artifact__isnull=False)
+    batch = []
+    set_of_update_fields = set()
+    total_repaired = 0
+    for package in immediate_content.prefetch_related('_artifacts').iterator(chunk_size=1000):
+        new_data = artifact_to_python_content_data(
+            package.filename, package._artifacts.get(), package.pulp_domain
+        )
+        changed = False
+        for field, value in new_data.items():
+            if getattr(package, field) != value:
+                setattr(package, field, value)
+                set_of_update_fields.add(field)
+                changed = True
+        if changed:
+            batch.append(package)
+        if len(batch) == 1000:
+            total_repaired += len(batch)
+            PythonPackageContent.objects.bulk_update(batch, set_of_update_fields)
+            batch = []
+            set_of_update_fields.clear()
+
+    if len(batch) > 0:
+        total_repaired += len(batch)
+        PythonPackageContent.objects.bulk_update(batch, set_of_update_fields)
+
+    return total_repaired
+
+
+def href_prn_list_handler(value):
+    """Common list parsing for a string of hrefs/prns."""
+    r = re.compile(
+        rf"""
+        (?:{settings.API_ROOT}(?:[-_a-zA-Z0-9]+/)?api/v3/repositories/python/python/[-a-f0-9]+/)
+        |(?:prn:python\.pythonrepository:[-a-f0-9]+)
+        """,
+        re.VERBOSE
+    )
+    values = []
+    for v in value.split(","):
+        if v:
+            if match := r.match(v.strip()):
+                values.append(match.group(0))
+            else:
+                raise CommandError(f"Invalid href/prn: {v}")
+    return values
+
+
+class Command(BaseCommand):
+    """
+    Management command to repair metadata of PythonPackageContent.
+    """
+
+    help = _("Repair the metadata of PythonPackageContent stored in PythonRepositories")
+
+    def add_arguments(self, parser):
+        """Set up arguments."""
+        parser.add_argument(
+            "--repositories",
+            type=href_prn_list_handler,
+            required=False,
+            help=_(
+                "List of PythonRepository hrefs/prns whose content's metadata will be repaired. "
+                "Leave blank to include all repositories in all domains. Mutually exclusive "
+                "with domain."
+            ),
+        )
+        parser.add_argument(
+            "--domain",
+            default=None,
+            required=False,
+            help=_(
+                "The pulp domain to gather the repositories from if specified. Mutually"
+                " exclusive with repositories."
+            ),
+        )
+
+    def handle(self, *args, **options):
+        """Implement the command."""
+        domain = options.get("domain")
+        repository_hrefs = options.get("repositories")
+        if domain and repository_hrefs:
+            raise CommandError(_("--domain and --repositories are mutually exclusive"))
+
+        repositories = PythonRepository.objects.all()
+        if repository_hrefs:
+            repos_ids = [extract_pk(r) for r in repository_hrefs]
+            repositories = repositories.filter(pk__in=repos_ids)
+        elif domain:
+            repositories = repositories.filter(pulp_domain__name=domain)
+
+        content_set = set()
+        for repository in repositories:
+            content_set.update(repository.latest_version().content.values_list("pk", flat=True))
+        content = PythonPackageContent.objects.filter(pk__in=content_set)
+        num_repaired = repair_metadata(content)
+        print(f"{len(content_set)} packages processed, {num_repaired} package metadata repaired.")

{pulp-python-3.12.4 → pulp_python-3.13.0}/pulp_python/app/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.2.3 on 2020-06-18 13:55
+# Generated by Django 4.2.16 on 2024-12-11 16:42
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
@@ -10,14 +10,14 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('core', '0032_export_to_chunks'),
+        ('core', '0091_systemid'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='PythonPublication',
             fields=[
-                ('publication_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonpublication', serialize=False, to='core.Publication')),
+                ('publication_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonpublication', serialize=False, to='core.publication')),
             ],
             options={
                 'default_related_name': '%(app_label)s_%(model_name)s',
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='PythonRemote',
             fields=[
-                ('remote_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonremote', serialize=False, to='core.Remote')),
+                ('remote_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonremote', serialize=False, to='core.remote')),
                 ('prereleases', models.BooleanField(default=False)),
                 ('includes', django.contrib.postgres.fields.jsonb.JSONField(default=list)),
                 ('excludes', django.contrib.postgres.fields.jsonb.JSONField(default=list)),
@@ -40,7 +40,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='PythonRepository',
             fields=[
-                ('repository_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonrepository', serialize=False, to='core.Repository')),
+                ('repository_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonrepository', serialize=False, to='core.repository')),
             ],
             options={
                 'default_related_name': '%(app_label)s_%(model_name)s',
@@ -50,7 +50,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='PythonPackageContent',
             fields=[
-                ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonpackagecontent', serialize=False, to='core.Content')),
+                ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonpackagecontent', serialize=False, to='core.content')),
                 ('filename', models.TextField(db_index=True, unique=True)),
                 ('packagetype', models.TextField(choices=[('bdist_dmg', 'bdist_dmg'), ('bdist_dumb', 'bdist_dumb'), ('bdist_egg', 'bdist_egg'), ('bdist_msi', 'bdist_msi'), ('bdist_rpm', 'bdist_rpm'), ('bdist_wheel', 'bdist_wheel'), ('bdist_wininst', 'bdist_wininst'), ('sdist', 'sdist')])),
                 ('name', models.TextField()),
@@ -85,8 +85,8 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='PythonDistribution',
             fields=[
-                ('basedistribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythondistribution', serialize=False, to='core.BaseDistribution')),
-                ('publication', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='python_pythondistribution', to='core.Publication')),
+                ('basedistribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythondistribution', serialize=False, to='core.basedistribution')),
+                ('publication', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='python_pythondistribution', to='core.publication')),
             ],
             options={
                 'default_related_name': '%(app_label)s_%(model_name)s',

{pulp-python-3.12.4 → pulp_python-3.13.0}/pulp_python/app/migrations/0004_DATA_swap_distribution_model.py

@@ -48,7 +48,6 @@ class Migration(migrations.Migration):
     atomic = False
 
     dependencies = [
-        ('core', '0062_add_new_distribution_mastermodel'),
         ('python', '0003_new_sync_filters'),
     ]
 

{pulp-python-3.12.4 → pulp_python-3.13.0}/pulp_python/app/models.py

@@ -17,9 +17,8 @@ from pulpcore.plugin.responses import ArtifactResponse
 
 from pathlib import PurePath
 from .utils import (
+    artifact_to_python_content_data,
     canonicalize_name,
-    get_project_metadata_from_artifact,
-    parse_project_metadata,
     python_content_to_json,
     PYPI_LAST_SERIAL,
     PYPI_SERIAL_CONSTANT,
@@ -189,14 +188,7 @@ class PythonPackageContent(Content):
     def init_from_artifact_and_relative_path(artifact, relative_path):
         """Used when downloading package from pull-through cache."""
         path = PurePath(relative_path)
-        metadata = get_project_metadata_from_artifact(path.name, artifact)
-        data = parse_project_metadata(vars(metadata))
-        data["packagetype"] = metadata.packagetype
-        data["version"] = metadata.version
-        data["filename"] = path.name
-        data["sha256"] = artifact.sha256
-        data["pulp_domain_id"] = artifact.pulp_domain_id
-        data["_pulp_domain_id"] = artifact.pulp_domain_id
+        data = artifact_to_python_content_data(path.name, artifact, domain=get_domain())
         return PythonPackageContent(**data)
 
     def __str__(self):

{pulp-python-3.12.4 → pulp_python-3.13.0}/pulp_python/app/pypi/views.py

@@ -23,7 +23,7 @@ from itertools import chain
 from packaging.utils import canonicalize_name
 from urllib.parse import urljoin, urlparse, urlunsplit
 from pathlib import PurePath
-from pypi_simple.parse_stream import parse_links_stream_response
+from pypi_simple import parse_links_stream_response
 
 from pulpcore.plugin.viewsets import OperationPostponedResponse
 from pulpcore.plugin.tasking import dispatch

{pulp-python-3.12.4 → pulp_python-3.13.0}/pulp_python/app/serializers.py

@@ -8,7 +8,7 @@ from pulpcore.plugin import serializers as core_serializers
 from pulpcore.plugin.util import get_domain
 
 from pulp_python.app import models as python_models
-from pulp_python.app.utils import get_project_metadata_from_artifact, parse_project_metadata
+from pulp_python.app.utils import artifact_to_python_content_data
 
 
 class PythonRepositorySerializer(core_serializers.RepositorySerializer):
@@ -216,7 +216,7 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
 
         artifact = data["artifact"]
         try:
-            metadata = get_project_metadata_from_artifact(filename, artifact)
+            _data = artifact_to_python_content_data(filename, artifact, domain=get_domain())
         except ValueError:
             raise serializers.ValidationError(_(
                 "Extension on {} is not a valid python extension "
@@ -230,14 +230,6 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
                 )}
             )
 
-        _data = parse_project_metadata(vars(metadata))
-        _data['packagetype'] = metadata.packagetype
-        _data['version'] = metadata.version
-        _data['filename'] = filename
-        _data['sha256'] = artifact.sha256
-        data["pulp_domain_id"] = artifact.pulp_domain_id
-        data["_pulp_domain_id"] = artifact.pulp_domain_id
-
         data.update(_data)
 
         return data

{pulp-python-3.12.4 → pulp_python-3.13.0}/pulp_python/app/tasks/sync.py

@@ -1,12 +1,8 @@
 import logging
-import tempfile
-from typing import Optional, Any, AsyncGenerator
 
-import aiohttp
 from aiohttp import ClientResponseError, ClientError
 from lxml.etree import LxmlError
 from gettext import gettext as _
-from os import environ
 
 from rest_framework import serializers
 
@@ -23,13 +19,13 @@ from pulp_python.app.models import (
     PythonRemote,
 )
 from pulp_python.app.utils import parse_metadata, PYPI_LAST_SERIAL
-from pypi_simple import parse_repo_index_page
+from pypi_simple import IndexPage
 
 from bandersnatch.mirror import Mirror
 from bandersnatch.master import Master
 from bandersnatch.configuration import BandersnatchConfig
 from packaging.requirements import Requirement
-from urllib.parse import urljoin, urlsplit, urlunsplit
+from urllib.parse import urljoin
 
 logger = logging.getLogger(__name__)
 
@@ -114,23 +110,14 @@ class PythonBanderStage(Stage):
         """
         If includes is specified, then only sync those,else try to sync all other packages
         """
-        # Prevent bandersnatch from reading actual .netrc file, set to empty file
-        # See discussion on https://github.com/pulp/pulp_python/issues/581
-        fake_netrc = tempfile.NamedTemporaryFile(dir=".", delete=False)
-        environ["NETRC"] = fake_netrc.name
-        # TODO Change Bandersnatch internal API to take proxy settings in from config parameters
-        if proxy_url := self.remote.proxy_url:
-            if self.remote.proxy_username or self.remote.proxy_password:
-                parsed_proxy = urlsplit(proxy_url)
-                creds = f"{self.remote.proxy_username}:{self.remote.proxy_password}"
-                netloc = f"{creds}@{parsed_proxy.netloc}"
-                proxy_url = urlunsplit((parsed_proxy.scheme, netloc, "", "", ""))
-            environ['http_proxy'] = proxy_url
-            environ['https_proxy'] = proxy_url
         # Bandersnatch includes leading slash when forming API urls
         url = self.remote.url.rstrip("/")
-        # local & global timeouts defaults to 10secs and 5 hours
-        async with PulpMaster(url, tls=self.remote.tls_validation) as master:
+        async with Master(url) as master:
+            # Replace the session with the remote's downloader session
+            old_session = master.session
+            factory = self.remote.download_factory
+            master.session = factory._session
+
             deferred_download = self.remote.policy != Remote.IMMEDIATE
             workers = self.remote.download_concurrency or self.remote.DEFAULT_DOWNLOAD_CONCURRENCY
             async with ProgressReport(
@@ -150,25 +137,8 @@ class PythonBanderStage(Stage):
                         Requirement(pkg).name for pkg in self.remote.includes
                     ]
                 await pmirror.synchronize(packages_to_sync)
-
-
-class PulpMaster(Master):
-    """
-    Pulp Master Class for Pulp specific overrides
-    """
-
-    def __init__(self, *args, tls=True, **kwargs):
-        self.tls = tls
-        super().__init__(*args, **kwargs)
-
-    async def get(
-        self, path: str, required_serial: Optional[int], **kw: Any
-    ) -> AsyncGenerator[aiohttp.ClientResponse, None]:
-        """Support tls=false"""
-        if not self.tls:
-            kw["ssl"] = False
-        async for r in super().get(path, required_serial, **kw):
-            yield r
+            # place back old session so that it is properly closed
+            master.session = old_session
 
 
 class PulpMirror(Mirror):
@@ -226,7 +196,7 @@ class PulpMirror(Mirror):
             downloader = self.python_stage.remote.get_downloader(url=url)
             result = await downloader.run()
             with open(result.path) as f:
-                index = parse_repo_index_page(f.read())
+                index = IndexPage.from_html(f.read())
                 self.packages_to_sync.update({p: 0 for p in index.projects})
                 self.target_serial = result.headers.get(PYPI_LAST_SERIAL, 0)
 

{pulp-python-3.12.4 → pulp_python-3.13.0}/pulp_python/app/tasks/upload.py

@@ -7,7 +7,7 @@ from pulpcore.plugin.models import Artifact, CreatedResource, ContentArtifact
 from pulpcore.plugin.util import get_domain
 
 from pulp_python.app.models import PythonPackageContent, PythonRepository
-from pulp_python.app.utils import get_project_metadata_from_artifact, parse_project_metadata
+from pulp_python.app.utils import artifact_to_python_content_data
 
 
 def upload(artifact_sha256, filename, repository_pk=None):
@@ -76,15 +76,7 @@ def create_content(artifact_sha256, filename, domain):
         queryset of the new created content
     """
     artifact = Artifact.objects.get(sha256=artifact_sha256, pulp_domain=domain)
-    metadata = get_project_metadata_from_artifact(filename, artifact)
-
-    data = parse_project_metadata(vars(metadata))
-    data['packagetype'] = metadata.packagetype
-    data['version'] = metadata.version
-    data['filename'] = filename
-    data['sha256'] = artifact.sha256
-    data['pulp_domain'] = domain
-    data['_pulp_domain'] = domain
+    data = artifact_to_python_content_data(filename, artifact, domain)
 
     @transaction.atomic()
     def create():

{pulp-python-3.12.4 → pulp_python-3.13.0}/pulp_python/app/utils.py

@@ -1,4 +1,5 @@
 import pkginfo
+import re
 import shutil
 import tempfile
 import json
@@ -51,6 +52,20 @@ DIST_EXTENSIONS = {
     ".zip": "sdist",
 }
 
+DIST_REGEXES = {
+    # regex from https://github.com/pypa/pip/blob/18.0/src/pip/_internal/wheel.py#L569
+    ".whl": re.compile(
+        r"""^(?P<name>.+?)-(?P<version>.*?)
+        ((-(?P<build>\d[^-]*?))?-(?P<pyver>.+?)-(?P<abi>.+?)-(?P<plat>.+?)
+        \.whl|\.dist-info)$""",
+        re.VERBOSE
+    ),
+    # regex based on https://setuptools.pypa.io/en/latest/deprecated/python_eggs.html#filename-embedded-metadata  # noqa: E501
+    ".egg": re.compile(r"^(?P<name>.+?)-(?P<version>.*?)(-(?P<pyver>.+?(-(?P<plat>.+?))?))?\.egg|\.egg-info$"),  # noqa: E501
+    # regex based on https://github.com/python/cpython/blob/v3.7.0/Lib/distutils/command/bdist_wininst.py#L292  # noqa: E501
+    ".exe": re.compile(r"^(?P<name>.+?)-(?P<version>.*?)\.(?P<plat>.+?)(-(?P<pyver>.+?))?\.exe$"),
+}
+
 DIST_TYPES = {
     "bdist_wheel": pkginfo.Wheel,
     "bdist_wininst": pkginfo.Distribution,
@@ -72,6 +87,8 @@ def parse_project_metadata(project):
     """
     package = {}
     package['name'] = project.get('name') or ""
+    package['version'] = project.get('version') or ""
+    package['packagetype'] = project.get('packagetype') or ""
     package['metadata_version'] = project.get('metadata_version') or ""
     package['summary'] = project.get('summary') or ""
     package['description'] = project.get('description') or ""
@@ -86,6 +103,7 @@ def parse_project_metadata(project):
     package['project_url'] = project.get('project_url') or ""
     package['platform'] = project.get('platform') or ""
     package['supported_platform'] = project.get('supported_platform') or ""
+    package['requires_python'] = project.get('requires_python') or ""
     package['requires_dist'] = json.dumps(project.get('requires_dist', []))
     package['provides_dist'] = json.dumps(project.get('provides_dist', []))
     package['obsoletes_dist'] = json.dumps(project.get('obsoletes_dist', []))
@@ -93,6 +111,7 @@ def parse_project_metadata(project):
     package['classifiers'] = json.dumps(project.get('classifiers', []))
     package['project_urls'] = json.dumps(project.get('project_urls', {}))
     package['description_content_type'] = project.get('description_content_type') or ""
+    package['python_version'] = project.get('python_version') or ""
 
     return package
 
@@ -113,17 +132,15 @@ def parse_metadata(project, version, distribution):
         dictionary: of useful python metadata
 
     """
-    package = {}
+    package = parse_project_metadata(project)
 
     package['filename'] = distribution.get('filename') or ""
     package['packagetype'] = distribution.get('packagetype') or ""
     package['version'] = version
     package['url'] = distribution.get('url') or ""
     package['sha256'] = distribution.get('digests', {}).get('sha256') or ""
-    package['python_version'] = distribution.get('python_version') or ""
-    package['requires_python'] = distribution.get('requires_python') or ""
-
-    package.update(parse_project_metadata(project))
+    package['python_version'] = distribution.get('python_version') or package.get('python_version')
+    package['requires_python'] = distribution.get('requires_python') or package.get('requires_python')  # noqa: E501
 
     return package
 
@@ -147,9 +164,30 @@ def get_project_metadata_from_artifact(filename, artifact):
         temp_file.flush()
         metadata = DIST_TYPES[packagetype](temp_file.name)
         metadata.packagetype = packagetype
+        if packagetype == "sdist":
+            metadata.python_version = "source"
+        else:
+            pyver = ""
+            regex = DIST_REGEXES[extensions[pkg_type_index]]
+            if bdist_name := regex.match(filename):
+                pyver = bdist_name.group("pyver") or ""
+            metadata.python_version = pyver
         return metadata
 
 
+def artifact_to_python_content_data(filename, artifact, domain=None):
+    """
+    Takes the artifact/filename and returns the metadata needed to create a PythonPackageContent.
+    """
+    metadata = get_project_metadata_from_artifact(filename, artifact)
+    data = parse_project_metadata(vars(metadata))
+    data['sha256'] = artifact.sha256
+    data['filename'] = filename
+    data['pulp_domain'] = domain or artifact.pulp_domain
+    data['_pulp_domain'] = data['pulp_domain']
+    return data
+
+
 def python_content_to_json(base_path, content_query, version=None, domain=None):
     """
     Converts a QuerySet of PythonPackageContent into the PyPi JSON format

{pulp-python-3.12.4 → pulp_python-3.13.0}/pulp_python/pytest_plugin.py

@@ -145,7 +145,7 @@ def download_python_file(tmp_path, http_get):
         file_path = tmp_path / relative_path
         with open(file_path, mode="wb") as f:
             f.write(http_get(url))
-        return file_path
+        return str(file_path)
 
     yield _download_python_file