pulp-python 3.12.0__py3-none-any.whl → 3.12.2__py3-none-any.whl

pulp_python/app/__init__.py

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

pulp_python/app/models.py

@@ -17,6 +17,7 @@ from pulpcore.plugin.responses import ArtifactResponse
 
 from pathlib import PurePath
 from .utils import (
+    canonicalize_name,
     get_project_metadata_from_artifact,
     parse_project_metadata,
     python_content_to_json,
@@ -87,6 +88,8 @@ class PythonDistribution(Distribution, AutoAddObjPermsMixin):
                         ).latest("pulp_created")
                     except ObjectDoesNotExist:
                         return None
+                    if len(path.parts) == 2:
+                        path = PurePath(f"simple/{canonicalize_name(path.parts[1])}")
                     rel_path = f"{path}/index.html"
                     try:
                         ca = (
@@ -103,8 +106,9 @@ class PythonDistribution(Distribution, AutoAddObjPermsMixin):
                     return ArtifactResponse(ca.artifact, headers=headers)
 
         if name:
+            normalized = canonicalize_name(name)
             package_content = PythonPackageContent.objects.filter(
-                pk__in=self.publication.repository_version.content, name__iexact=name
+                pk__in=self.publication.repository_version.content, name__normalize=normalized
             )
             # TODO Change this value to the Repo's serial value when implemented
             headers = {PYPI_LAST_SERIAL: str(PYPI_SERIAL_CONSTANT)}

pulp_python/app/pypi/views.py

@@ -327,7 +327,8 @@ class MetadataView(PyPIMixin, ViewSet):
         elif meta_path.match("*/json"):
             name = meta_path.parts[0]
         if name:
-            package_content = content.filter(name__iexact=name)
+            normalized = canonicalize_name(name)
+            package_content = content.filter(name__normalize=normalized)
             # TODO Change this value to the Repo's serial value when implemented
             headers = {PYPI_LAST_SERIAL: str(PYPI_SERIAL_CONSTANT)}
             if settings.DOMAIN_ENABLED:

pulp_python/app/tasks/sync.py

@@ -83,7 +83,7 @@ def create_bandersnatch_config(remote):
         config["plugins"]["enabled"] += "prerelease_release\n"
     if remote.package_types:
         rrfm = "regex_release_file_metadata"
-        config["plugins"]["enabled"] += rrfm
+        config["plugins"]["enabled"] += f"{rrfm}\n"
         if not config.has_section(rrfm):
             config.add_section(rrfm)
         config[rrfm]["any:release_file.packagetype"] = "\n".join(remote.package_types)

pulp_python/tests/functional/api/test_download_content.py

@@ -87,3 +87,32 @@ def test_full_pulp_to_pulp_sync(
     repo3 = python_repo_with_sync(remote3)
     summary2 = python_content_summary(repository_version=repo3.latest_version_href)
     assert summary2.present["python.python"]["count"] == PYTHON_MD_PACKAGE_COUNT
+
+
+@pytest.mark.parallel
+def test_pulp2pulp_sync_with_oddities(
+    python_repo_with_sync,
+    python_remote_factory,
+    python_publication_factory,
+    python_distribution_factory,
+    python_content_summary,
+):
+    """Test that Pulp can handle syncing packages with wierd names."""
+    remote = python_remote_factory(includes=["oslo.utils"], url="https://pypi.org")
+    repo = python_repo_with_sync(remote)
+    distro = python_distribution_factory(repository=repo)
+    summary = python_content_summary(repository_version=repo.latest_version_href)
+    # Test pulp 2 pulp full sync w/ live pypi apis
+    remote2 = python_remote_factory(includes=[], url=distro.base_url)
+    repo2 = python_repo_with_sync(remote2)
+    summary2 = python_content_summary(repository_version=repo2.latest_version_href)
+    assert summary2.present["python.python"]["count"] > 0
+    assert summary.present["python.python"]["count"] == summary2.present["python.python"]["count"]
+    # Test w/ publication
+    pub = python_publication_factory(repository=repo)
+    distro2 = python_distribution_factory(publication=pub)
+    remote3 = python_remote_factory(includes=[], url=distro2.base_url)
+    repo3 = python_repo_with_sync(remote3)
+    summary3 = python_content_summary(repository_version=repo3.latest_version_href)
+    assert summary3.present["python.python"]["count"] > 0
+    assert summary.present["python.python"]["count"] == summary3.present["python.python"]["count"]

pulp_python/tests/functional/api/test_sync.py

@@ -264,6 +264,23 @@ def test_sync_platform_exclude(
     assert summary.present["python.python"]["count"] == SCIPY_COUNTS["no_os"]
 
 
+@pytest.mark.parallel
+def test_sync_multiple_filters(
+    python_repo_with_sync, python_remote_factory, python_content_summary
+):
+    """Tests sync with multiple filters."""
+    remote = python_remote_factory(
+        includes=PYTHON_LG_PROJECT_SPECIFIER,
+        package_types=["bdist_wheel"],
+        keep_latest_packages=1,
+        prereleases=False
+    )
+    repo = python_repo_with_sync(remote)
+
+    summary = python_content_summary(repository_version=repo.latest_version_href)
+    assert summary.present["python.python"]["count"] == PYTHON_LG_FIXTURE_COUNTS["multi"]
+
+
 @pytest.mark.parallel
 def test_proxy_sync(
     python_bindings,

pulp_python/tests/functional/constants.py

@@ -135,6 +135,7 @@ PYTHON_LG_FIXTURE_COUNTS = {
     "latest_3": 49,
     "sdist": 27,
     "bdist_wheel": 63,
+    "multi": 33,  # keep_latest=1, package_types="bdist_wheel", prereleases=False
 }
 
 DJANGO_LATEST_3 = 4  # latest version has 2 dists, each other has 1

{pulp_python-3.12.0.dist-info → pulp_python-3.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.12.0
+Version: 3.12.2
 Summary: pulp-python plugin for the Pulp Project
 Home-page: https://www.pulpproject.org
 Author: Pulp Project Developers
@@ -16,10 +16,10 @@ Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pulpcore <3.70.0,>=3.49.0
-Requires-Dist: pkginfo <1.9.7,>=1.8.2
-Requires-Dist: bandersnatch <6.2,>=6.1
-Requires-Dist: pypi-simple <1.0.0,>=0.9.0
+Requires-Dist: pulpcore<3.70.0,>=3.49.0
+Requires-Dist: pkginfo<1.9.7,>=1.8.2
+Requires-Dist: bandersnatch<6.2,>=6.1
+Requires-Dist: pypi-simple<1.0.0,>=0.9.0
 
 # pulp_python
 

{pulp_python-3.12.0.dist-info → pulp_python-3.12.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pulp_python/__init__.py,sha256=BfGFMACxdZWJMiAhkn0BW-k_iKULe-nVCcQ6g0sX89k,65
 pulp_python/pytest_plugin.py,sha256=MdbAKZjcYvypT2-E1bJGaBsIDIaZuJkh6g45ZhWuKR4,7510
-pulp_python/app/__init__.py,sha256=gXsLGAnwNVcDoV6vmqU32-htBZuN9ulcgSN-BBXNOcw,2488
+pulp_python/app/__init__.py,sha256=fjNk4QE2S2I3S07JHtk69FHoXH14pBRRcvr2T3zsSvQ,2488
 pulp_python/app/global_access_conditions.py,sha256=y8NwdgAoaB5iY7EzSBoCQOgVopSHpVMc55FKJmCGGlI,1081
 pulp_python/app/modelresource.py,sha256=dogoBWibBmQyFpcV-Hp1lu7D2WwSECa5PEShWSIg7mg,1248
-pulp_python/app/models.py,sha256=v-ziV8Ae9W3pSwotIfxGtuQ0DNxeZx_gL_9xO7BN7mE,10586
+pulp_python/app/models.py,sha256=veoWVnGgpjn2yiuOdC5-IiXo9PJrlO5AAAuszpepOmg,10798
 pulp_python/app/replica.py,sha256=CJOSvYp7kwsF269g9Rje9jnbCWTkG_6s25UL9W1Vxuw,1583
 pulp_python/app/serializers.py,sha256=a_5Bul0NBtkxyHpgmqq8eJ6gR_3V8GtzkD2lr7muuHc,15280
 pulp_python/app/settings.py,sha256=F-TFLcol3nXK2IHpb9yIv-KIXj2OPibQ8FuyCCCFCT0,227
@@ -26,17 +26,17 @@ pulp_python/app/migrations/0013_add_rbac_permissions.py,sha256=ynnxHNW4SXo5YL7hR
 pulp_python/app/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/pypi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/pypi/serializers.py,sha256=6ivjOQx0cuokiyy4DZNPHR7YnMAZLQ-rnr_7i9sGtwM,3295
-pulp_python/app/pypi/views.py,sha256=tk1vBTTZL9Um1RF5oTHn16lA5n3nLcT9ttPc8ZTv5p4,15657
+pulp_python/app/pypi/views.py,sha256=TDUNhZdvikzMKeUBsKlog5FOz6fIgJutntfKavsWRpI,15715
 pulp_python/app/tasks/__init__.py,sha256=wAbWAJEZDXPRChUjdxDXNHP1KVnWgH5Q_P_cHeG8LH4,172
 pulp_python/app/tasks/publish.py,sha256=H-7uqzHNqfCbkh7D5DmZqy060paTLGk3XpyGVCmVeHQ,4064
-pulp_python/app/tasks/sync.py,sha256=nSKuEhRrCv236wN_QXZN3Hv4INY2jMEvS2rMxm2AZec,11178
+pulp_python/app/tasks/sync.py,sha256=q1RaIb58GojoighbmgSCYVbm6V0Zh0dI_9Ejyu6t91I,11185
 pulp_python/app/tasks/upload.py,sha256=7kn3q3DN7GufRZJpOdybXdJ6qDhFShz9lto-rtUF4t4,3836
 pulp_python/app/webserver_snippets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/webserver_snippets/apache.conf,sha256=3frHSl2YV_8pJPscaFxMVo7HmxGJdb8XVmfdLtCxzoA,97
 pulp_python/app/webserver_snippets/nginx.conf,sha256=gMqZGFefsTJVVx9YRxpHVS7NMEll9CzOseYdtLr3Avc,344
 pulp_python/tests/__init__.py,sha256=4Yz43a8s-KyhdHFb5eEhIIvH72807Y84uAHnG5bO5y0,31
 pulp_python/tests/functional/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulp_python/tests/functional/constants.py,sha256=gxbHT6EMvt4kpJOie1RsqFWxnqjCGUK7j4_So9traeg,12239
+pulp_python/tests/functional/constants.py,sha256=sARzSILWCTBeG0Gimj-c4_C1vAkPArVa0objTIqZTqM,12321
 pulp_python/tests/functional/utils.py,sha256=JPCEAqdbLFx89OC8J0WBtot1QD4go7hgUhG-8CWg8tQ,2705
 pulp_python/tests/functional/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/tests/functional/api/test_auto_publish.py,sha256=uCIt4LsO61oMk3bDs3LMQDJI8zkKqvY0b1uX16bTxzM,1747
@@ -45,17 +45,17 @@ pulp_python/tests/functional/api/test_crud_content_unit.py,sha256=PUpnfkCzlp39zd
 pulp_python/tests/functional/api/test_crud_publications.py,sha256=FyjkyM3qMzo-Um6GZP-qGssz4sZPBx34dD2Oux3qlm0,4448
 pulp_python/tests/functional/api/test_crud_remotes.py,sha256=1O5QiN5JK-xM-PSrZlXJDZOAr2KLMq3JFHIXV6zOVJw,5487
 pulp_python/tests/functional/api/test_domains.py,sha256=euQM0XIt2jTnJJCSXl2pw-tNzBBKkgQ_rksZ1rd7l6c,9468
-pulp_python/tests/functional/api/test_download_content.py,sha256=9bii7Y9PqfjlC-xvrDnsllHywGI5bx9LadbsZTBqRu8,3502
+pulp_python/tests/functional/api/test_download_content.py,sha256=msnsKpU6TGT8eNu6e0uFa4fte6hj85OTexwOHdf66-c,4950
 pulp_python/tests/functional/api/test_export_import.py,sha256=-nxRdaG_adFgJTkilLLsVmAeH6f74ludb6qqZrm_bGA,4597
 pulp_python/tests/functional/api/test_full_mirror.py,sha256=_ECJAQDOYtGC3EKMHjW7ACLDLDC7OdcxY-8RriMwMIg,2929
 pulp_python/tests/functional/api/test_pypi_apis.py,sha256=vYEqpCq-oSpDlW2KSKox--s3rU5zh6HiGEehqimWjtQ,12676
 pulp_python/tests/functional/api/test_rbac.py,sha256=p9x_E14BkhWwRww1GcApOtRsiyF6U-cTcKZYrrLKNas,10285
-pulp_python/tests/functional/api/test_sync.py,sha256=0CbPGXcKeLBLIUEu7PsrHn3kDfwcCCW2yihfePEvEK8,12070
+pulp_python/tests/functional/api/test_sync.py,sha256=EYMnscBllEQxzZAKRv2QcrT2n_r5ny0NJzsH5XrjsSY,12645
 pulp_python/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/tests/unit/test_models.py,sha256=TBI0yKsrdbnJSPeBFfxSqhXK7zaNvR6qg5JehGH3Pds,229
-pulp_python-3.12.0.dist-info/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_python-3.12.0.dist-info/METADATA,sha256=9DD0NhGOJDUQ98ikN5Pt3RQRpoGmZ4JmjjcexDrdrjo,1175
-pulp_python-3.12.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pulp_python-3.12.0.dist-info/entry_points.txt,sha256=HvqLEXjw_dS5jqAwnE5JiRZFE6f-y5SRtitKLPml2To,115
-pulp_python-3.12.0.dist-info/top_level.txt,sha256=X0hXgXc_bpbiKqVrkt8jD5_QEiQviKbHDwveQcOcJjo,12
-pulp_python-3.12.0.dist-info/RECORD,,
+pulp_python-3.12.2.dist-info/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pulp_python-3.12.2.dist-info/METADATA,sha256=mCacBmG67vMD9Gv86jKUW42rK56hD3Lg5c_t8tmQ_wc,1171
+pulp_python-3.12.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+pulp_python-3.12.2.dist-info/entry_points.txt,sha256=HvqLEXjw_dS5jqAwnE5JiRZFE6f-y5SRtitKLPml2To,115
+pulp_python-3.12.2.dist-info/top_level.txt,sha256=X0hXgXc_bpbiKqVrkt8jD5_QEiQviKbHDwveQcOcJjo,12
+pulp_python-3.12.2.dist-info/RECORD,,

{pulp_python-3.12.0.dist-info → pulp_python-3.12.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: bdist_wheel (0.44.0)
 Root-Is-Purelib: true
 Tag: py3-none-any