pulp-python 3.11.0__tar.gz → 3.11.1__tar.gz

{pulp-python-3.11.0 → pulp-python-3.11.1}/CHANGES.rst

@@ -13,6 +13,19 @@ Changelog
 
 .. towncrier release notes start
 
+3.11.1 (2024-04-11)
+===================
+
+Bugfixes
+--------
+
+- Fixed tls_validation not being disabled when set to false on the remote.
+  `#653 <https://github.com/pulp/pulp_python/issues/653>`__
+
+
+----
+
+
 3.11.0 (2023-11-08)
 ===================
 
@@ -21,7 +34,6 @@ Features
 --------
 
 - Added pulpcore 3.40 compatibility.
-  `#40 <https://github.com/pulp/pulp_python/issues/40>`__
 - Added import export support of python content.
   `#579 <https://github.com/pulp/pulp_python/issues/579>`__
 

{pulp-python-3.11.0 → pulp-python-3.11.1}/PKG-INFO

@@ -1,21 +1,11 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.11.0
+Version: 3.11.1
 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+
-Description: # pulp_python
-        
-        ![Pulp Nightly CI/CD](https://github.com/pulp/pulp_python/actions/workflows/nightly.yml/badge.svg)
-        
-        A Pulp plugin to support hosting your own pip compatible Python packages.
-        
-        For more information, please see the [documentation](https://docs.pulpproject.org/pulp_python/) or the
-        [Pulp project page](https://pulpproject.org).
-        
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Development Status :: 5 - Production/Stable
@@ -26,3 +16,13 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# pulp_python
+
+![Pulp Nightly CI/CD](https://github.com/pulp/pulp_python/actions/workflows/nightly.yml/badge.svg)
+
+A Pulp plugin to support hosting your own pip compatible Python packages.
+
+For more information, please see the [documentation](https://docs.pulpproject.org/pulp_python/) or the
+[Pulp project page](https://pulpproject.org).

{pulp-python-3.11.0 → pulp-python-3.11.1}/functest_requirements.txt

@@ -1,5 +1,5 @@
 git+https://github.com/pulp/pulp-smash.git#egg=pulp-smash
-pytest
+pytest<8
 lxml
 twine
 pypi-simple

{pulp-python-3.11.0 → pulp-python-3.11.1}/pulp_python/app/__init__.py

@@ -8,5 +8,5 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_python.app"
     label = "python"
-    version = "3.11.0"
+    version = "3.11.1"
     python_package_name = "pulp-python"

{pulp-python-3.11.0 → pulp-python-3.11.1}/pulp_python/app/tasks/sync.py

@@ -1,9 +1,12 @@
 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, path
+from os import environ
 
 from rest_framework import serializers
 
@@ -111,9 +114,10 @@ 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 nonexistent file
+        # Prevent bandersnatch from reading actual .netrc file, set to empty file
         # See discussion on https://github.com/pulp/pulp_python/issues/581
-        environ["NETRC"] = f"{path.curdir}/.fake-netrc"
+        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:
@@ -126,7 +130,7 @@ class PythonBanderStage(Stage):
         # Bandersnatch includes leading slash when forming API urls
         url = self.remote.url.rstrip("/")
         # local & global timeouts defaults to 10secs and 5 hours
-        async with Master(url) as master:
+        async with PulpMaster(url, tls=self.remote.tls_validation) as master:
             deferred_download = self.remote.policy != Remote.IMMEDIATE
             workers = self.remote.download_concurrency or self.remote.DEFAULT_DOWNLOAD_CONCURRENCY
             async with ProgressReport(
@@ -148,6 +152,25 @@ class PythonBanderStage(Stage):
                 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
+
+
 class PulpMirror(Mirror):
     """
     Pulp Mirror Class to perform syncing using Bandersnatch
@@ -257,4 +280,4 @@ class PulpMirror(Mirror):
         TODO
         This should have some error checking
         """
-        pass
+        logger.error("Sync encountered an error: ", exc_info=exception)

{pulp-python-3.11.0 → pulp-python-3.11.1}/pulp_python.egg-info/PKG-INFO

@@ -1,21 +1,11 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.11.0
+Version: 3.11.1
 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+
-Description: # pulp_python
-        
-        ![Pulp Nightly CI/CD](https://github.com/pulp/pulp_python/actions/workflows/nightly.yml/badge.svg)
-        
-        A Pulp plugin to support hosting your own pip compatible Python packages.
-        
-        For more information, please see the [documentation](https://docs.pulpproject.org/pulp_python/) or the
-        [Pulp project page](https://pulpproject.org).
-        
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Development Status :: 5 - Production/Stable
@@ -26,3 +16,13 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# pulp_python
+
+![Pulp Nightly CI/CD](https://github.com/pulp/pulp_python/actions/workflows/nightly.yml/badge.svg)
+
+A Pulp plugin to support hosting your own pip compatible Python packages.
+
+For more information, please see the [documentation](https://docs.pulpproject.org/pulp_python/) or the
+[Pulp project page](https://pulpproject.org).

{pulp-python-3.11.0 → pulp-python-3.11.1}/pulp_python.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [pulpcore.plugin]
 pulp_python = pulp_python:default_app_config
-

{pulp-python-3.11.0 → pulp-python-3.11.1}/setup.py

@@ -10,7 +10,7 @@ with open("README.md") as f:
 
 setup(
     name="pulp-python",
-    version="3.11.0",
+    version="3.11.1",
     description="pulp-python plugin for the Pulp Project",
     long_description=long_description,
     long_description_content_type="text/markdown",

pulp-python-3.11.1/unittest_requirements.txt

@@ -0,0 +1,2 @@
+mock
+pytest<8

pulp-python-3.11.0/unittest_requirements.txt

@@ -1,2 +0,0 @@
-mock
-pytest