pulp-python 3.19.2__py3-none-any.whl → 3.19.3__py3-none-any.whl

pulp_python/app/__init__.py

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

pulp_python/app/pypi/views.py

@@ -15,6 +15,7 @@ from django.http.response import (
     HttpResponse,
     HttpResponseBadRequest,
     HttpResponseForbidden,
+    HttpResponseNotFound,
     StreamingHttpResponse,
 )
 from django.shortcuts import redirect
@@ -255,7 +256,7 @@ class SimpleView(PackageUploadMixin, ViewSet):
 
         rfilter = get_remote_package_filter(remote)
         if not rfilter.filter_project(package):
-            raise Http404(f"{package} does not exist.")
+            return {}
 
         url = remote.get_remote_artifact_url(f"simple/{package}/")
         remote.headers = remote.headers or []
@@ -263,19 +264,19 @@ class SimpleView(PackageUploadMixin, ViewSet):
         downloader = remote.get_downloader(url=url, max_retries=1)
         try:
             d = downloader.fetch()
-        except ClientError:
-            return HttpResponse(f"Failed to fetch {package} from {remote.url}.", status=502)
-        except TimeoutException:
-            return HttpResponse(f"{remote.url} timed out while fetching {package}.", status=504)
+        except (ClientError, TimeoutException):
+            log.info(f"Failed to fetch {package} simple page from {remote.url}")
+            return {}
 
         if d.headers["content-type"] == "application/vnd.pypi.simple.v1+json":
             page = ProjectPage.from_json_data(json.load(open(d.path, "rb")), base_url=url)
         else:
             page = ProjectPage.from_html(package, open(d.path, "rb").read(), base_url=url)
-        packages = [
-            parse_package(p) for p in page.packages if rfilter.filter_release(package, p.version)
-        ]
-        return HttpResponse(write_simple_detail(package, packages))
+        return {
+            p.filename: parse_package(p)
+            for p in page.packages
+            if rfilter.filter_release(package, p.version)
+        }
 
     @extend_schema(operation_id="pypi_simple_package_read", summary="Get package simple page")
     def retrieve(self, request, path, package):
@@ -283,24 +284,25 @@ class SimpleView(PackageUploadMixin, ViewSet):
         repo_ver, content = self.get_rvc()
         # Should I redirect if the normalized name is different?
         normalized = canonicalize_name(package)
+        releases = {}
         if self.distribution.remote:
-            return self.pull_through_package_simple(normalized, path, self.distribution.remote)
-        if self.should_redirect(repo_version=repo_ver):
+            releases = self.pull_through_package_simple(normalized, path, self.distribution.remote)
+        elif self.should_redirect(repo_version=repo_ver):
             return redirect(urljoin(self.base_content_url, f"{path}/simple/{normalized}/"))
-        packages = (
-            content.filter(name__normalize=normalized)
-            .values_list("filename", "sha256", "name")
-            .iterator()
-        )
-        try:
-            present = next(packages)
-        except StopIteration:
-            raise Http404(f"{normalized} does not exist.")
-        else:
-            packages = chain([present], packages)
-            name = present[2]
-        releases = ((f, urljoin(self.base_content_url, f"{path}/{f}"), d) for f, d, _ in packages)
-        return StreamingHttpResponse(write_simple_detail(name, releases, streamed=True))
+        if content:
+            packages = content.filter(name__normalize=normalized).values("filename", "sha256")
+            local_releases = {
+                p["filename"]: (
+                    p["filename"],
+                    urljoin(self.base_content_url, f"{path}/{p['filename']}"),
+                    p["sha256"],
+                )
+                for p in packages
+            }
+            releases.update(local_releases)
+        if not releases:
+            return HttpResponseNotFound(f"{normalized} does not exist.")
+        return HttpResponse(write_simple_detail(normalized, releases.values()))
 
     @extend_schema(
         request=PackageUploadSerializer,

pulp_python/app/utils.py

@@ -458,7 +458,7 @@ class PackageIncludeFilter:
 
         try:
             version = parse(version)
-        except InvalidVersion:
+        except (InvalidVersion, TypeError):
             return False
 
         include_range = self._filter_includes.get("range", {})

pulp_python/tests/functional/api/test_full_mirror.py

@@ -66,7 +66,7 @@ def test_pull_through_filter(python_remote_factory, python_distribution_factory)
 
     r = requests.get(f"{distro.base_url}simple/pulpcore/")
     assert r.status_code == 404
-    assert r.json() == {"detail": "pulpcore does not exist."}
+    assert r.text == "pulpcore does not exist."
 
     r = requests.get(f"{distro.base_url}simple/shelf-reader/")
     assert r.status_code == 200
@@ -86,11 +86,11 @@ def test_pull_through_filter(python_remote_factory, python_distribution_factory)
 
     r = requests.get(f"{distro.base_url}simple/django/")
     assert r.status_code == 404
-    assert r.json() == {"detail": "django does not exist."}
+    assert r.text == "django does not exist."
 
     r = requests.get(f"{distro.base_url}simple/pulpcore/")
-    assert r.status_code == 502
-    assert r.text == f"Failed to fetch pulpcore from {remote.url}."
+    assert r.status_code == 404
+    assert r.text == "pulpcore does not exist."
 
     r = requests.get(f"{distro.base_url}simple/shelf-reader/")
     assert r.status_code == 200
@@ -138,3 +138,49 @@ def test_pull_through_with_repo(
     assert r.status_code == 200
     tasks = pulpcore_bindings.TasksApi.list(reserved_resources=repo.prn)
     assert tasks.count == 3
+
+
+@pytest.mark.parallel
+def test_pull_through_local_only(
+    python_remote_factory, python_distribution_factory, python_repo_with_sync
+):
+    """Tests that pull-through checks the repository if the package is not present on the remote."""
+    remote = python_remote_factory(url=PYPI_URL, includes=["pulpcore"])
+    repo = python_repo_with_sync(remote=remote)
+    remote2 = python_remote_factory(includes=[])  # Fixtures does not have pulpcore
+    distro = python_distribution_factory(repository=repo.pulp_href, remote=remote2.pulp_href)
+
+    url = f"{distro.base_url}simple/pulpcore/"
+    r = requests.get(url)
+    assert r.status_code == 200
+    assert "?redirect=" not in r.text
+
+    url = f"{distro.base_url}simple/shelf-reader/"
+    r = requests.get(url)
+    assert r.status_code == 200
+    assert "?redirect=" in r.text
+
+    url = f"{distro.base_url}simple/pulp_python/"
+    r = requests.get(url)
+    assert r.status_code == 404
+    assert r.text == "pulp-python does not exist."
+
+
+@pytest.mark.parallel
+def test_pull_through_filtering_bad_names(python_remote_factory, python_distribution_factory):
+    """Tests that pull-through handles packages with invalid names gracefully."""
+    # ipython version 0.13.X has improper named bdist_wininst, e.g ipython-0.13.py2-win-amd64.exe
+    # pypi-simple expects the platform to go before the pyversion (for .exe), so when parsed the
+    # version and package type will be None.
+    remote = python_remote_factory(url=PYPI_URL, includes=["ipython"])
+    distro = python_distribution_factory(remote=remote.pulp_href)
+
+    url = f"{distro.base_url}simple/ipython/"
+    response = requests.get(url)
+
+    assert response.status_code == 200
+
+    project_page = ProjectPage.from_response(response, "ipython")
+    # Should have no packages with None version (they get filtered out)
+    assert len(project_page.packages) > 0
+    assert all(package.version is not None for package in project_page.packages)

{pulp_python-3.19.2.dist-info → pulp_python-3.19.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.19.2
+Version: 3.19.3
 Summary: pulp-python plugin for the Pulp Project
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_python-3.19.2.dist-info → pulp_python-3.19.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pulp_python/__init__.py,sha256=GIuTLoBTc-07dSLJUh8xrZPRz8x-jJ61pfR0J1IjnzI,65
 pulp_python/pytest_plugin.py,sha256=KqzB8Xv22_mA6itx0N1tYg9qXgEhHiOkX1ookAaJB8g,7525
-pulp_python/app/__init__.py,sha256=2B25Wu7fJHqNg9m8hmlZQmzvjZKyVzO2WYXb5xfA3vQ,2490
+pulp_python/app/__init__.py,sha256=JdmTFYu4U2rQFWWsQ_OoOYU_nYutRMPftjW8D7HH-8s,2490
 pulp_python/app/global_access_conditions.py,sha256=MZJtyoVsr-4hRaty6mKDqh3caOHd5UKJjEWLV2crOLs,1080
 pulp_python/app/modelresource.py,sha256=4SFAdqk6lozi_cZz4uqDIqhqPAZF-7l5jJwPn-xGZFs,1249
 pulp_python/app/models.py,sha256=Puvl1VhuCubtf_V0sq6U5nWAb94sUAVk_wTv-FkuvSs,11258
@@ -8,7 +8,7 @@ pulp_python/app/replica.py,sha256=cFMNdTDX_6k87PzEffDDN4Moh2iUu89rSqYgv0-Ta8c,18
 pulp_python/app/serializers.py,sha256=zHFxpmKQPJrKWaBADVbUsZKpxLuGqjyKpCDm_CHxfzU,19712
 pulp_python/app/settings.py,sha256=HXJK3rr0LVTOv1xBS5cZvVtz6j4SvFZl0PH3sLTcu2w,227
 pulp_python/app/urls.py,sha256=bnuW89roIlPipROo3QcJktvRPAxikI1tV7-XX425QQg,1089
-pulp_python/app/utils.py,sha256=eh9da0-iynwQRblmtwdDq6pFwFy7CJgjvnHkj3znXAk,18280
+pulp_python/app/utils.py,sha256=Xlxbv5oGahoEeK28uRjG__Tul9yox6NSyupa2cQiTtI,18293
 pulp_python/app/viewsets.py,sha256=S0VQIv4_pmDYzpsEwlze-pvyQ2yaT4Hpq3GeBiUdL3g,25103
 pulp_python/app/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,7 +32,7 @@ pulp_python/app/migrations/0015_alter_pythonpackagecontent_options.py,sha256=Ox2
 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=qU3lZEVs0luqMlYrG1KxxfGpNo9exYzWool1bERtLIY,3310
-pulp_python/app/pypi/views.py,sha256=u3WXI-VbJiW9ciu5Wq8t8FuWJVTpCFPP9b8C8c4eVZQ,16214
+pulp_python/app/pypi/views.py,sha256=y2HAzN-tZYgB6zTmonBpmc2bSmE220b5T_AQ8LrXVis,16126
 pulp_python/app/tasks/__init__.py,sha256=bG7P-IVJ_-tHJ6ciCeahrc8woIanAVOZ59_S_aQRVBE,212
 pulp_python/app/tasks/publish.py,sha256=PKiWDtGkOOvJwzbNIIhjvo77SXvKibcpAcYzZ3woncc,4153
 pulp_python/app/tasks/repair.py,sha256=58DEBhvdrBeMCjOdLrM7jUN5yjjWESz19iIlo1mb1EE,6988
@@ -54,7 +54,7 @@ pulp_python/tests/functional/api/test_crud_remotes.py,sha256=clFFhgG5udyKzWOLwxp
 pulp_python/tests/functional/api/test_domains.py,sha256=vMm7rZD96nlmVdpU-Y7mZVtj5j9xHfTs_NYgLJuRhAc,10469
 pulp_python/tests/functional/api/test_download_content.py,sha256=5IuaHXyLakPkjm5sLTxtTl7Dq0yl7N36HpObnIa0Sks,4950
 pulp_python/tests/functional/api/test_export_import.py,sha256=Lf_RS_WfQwVqA5FHeGrKtjVcqgGcGu78p0UdIjt64wg,4620
-pulp_python/tests/functional/api/test_full_mirror.py,sha256=f3PBGMv7e4OxYkIOYN7oANGUNYjNb7o3OxCl6v69Gqw,5583
+pulp_python/tests/functional/api/test_full_mirror.py,sha256=bY76kkKUyreRA_P2d4aCPNUlN11WwMvs4AyCDZICXK0,7481
 pulp_python/tests/functional/api/test_pypi_apis.py,sha256=lMPh7CbSNJqZaVkg6xZCs3CZa1YZsUkPQYJMbqLxx7k,12179
 pulp_python/tests/functional/api/test_rbac.py,sha256=-xNWqvKKU-v1uC6tCRGBK0aWaff25K9C-AfzQkdHhhI,10513
 pulp_python/tests/functional/api/test_repair.py,sha256=jqt6DFX4X45fYVT_xcrsSxEGEoiwdPOfd3K2QFjIbE4,7867
@@ -62,9 +62,9 @@ pulp_python/tests/functional/api/test_sync.py,sha256=oE2gJx9bnbQudq45dGVB7xE_ZBi
 pulp_python/tests/functional/api/test_upload.py,sha256=XJ6zUffw9A1avOJND5CfwL4xM0_ejiL_NCWszPe7fZY,1853
 pulp_python/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/tests/unit/test_models.py,sha256=TBI0yKsrdbnJSPeBFfxSqhXK7zaNvR6qg5JehGH3Pds,229
-pulp_python-3.19.2.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_python-3.19.2.dist-info/METADATA,sha256=Du2-VutZpd2KuVJVnJbngzYdEIQ-X94o-VzPELd0Q7M,1702
-pulp_python-3.19.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-pulp_python-3.19.2.dist-info/entry_points.txt,sha256=HvqLEXjw_dS5jqAwnE5JiRZFE6f-y5SRtitKLPml2To,115
-pulp_python-3.19.2.dist-info/top_level.txt,sha256=X0hXgXc_bpbiKqVrkt8jD5_QEiQviKbHDwveQcOcJjo,12
-pulp_python-3.19.2.dist-info/RECORD,,
+pulp_python-3.19.3.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pulp_python-3.19.3.dist-info/METADATA,sha256=3k148Rqt1ExmBuz72SGQzD0cUZvhu3CAM8V3R_bBR2c,1702
+pulp_python-3.19.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+pulp_python-3.19.3.dist-info/entry_points.txt,sha256=HvqLEXjw_dS5jqAwnE5JiRZFE6f-y5SRtitKLPml2To,115
+pulp_python-3.19.3.dist-info/top_level.txt,sha256=X0hXgXc_bpbiKqVrkt8jD5_QEiQviKbHDwveQcOcJjo,12
+pulp_python-3.19.3.dist-info/RECORD,,