Merge pull request #983 from dkliban/982

Adds repository_version to the Python Distribution API.

Author: dkliban

CHANGES/982.feature

@@ -0,0 +1 @@
+Added ability to serve a specific repository version of a PyPI index.

pulp_python/app/pypi/views.py

@@ -105,10 +105,13 @@ def get_repository_version(distribution):
         """Finds the repository version this distribution is serving."""
         pub = distribution.publication
         rep = distribution.repository
+        rep_version = distribution.repository_version
         if pub:
             return pub.repository_version or pub.repository.latest_version()
         elif rep:
             return rep.latest_version()
+        elif rep_version:
+            return rep_version
         else:
             raise Http404("No repository associated with this index")
 

pulp_python/app/serializers.py

@@ -53,6 +53,9 @@ class PythonDistributionSerializer(core_serializers.DistributionSerializer):
         queryset=core_models.Publication.objects.exclude(complete=False),
         allow_null=True,
     )
+    repository_version = core_serializers.RepositoryVersionRelatedField(
+        required=False, help_text=_("RepositoryVersion to be served."), allow_null=True
+    )
     base_url = serializers.SerializerMethodField(read_only=True)
     allow_uploads = serializers.BooleanField(
         default=True, help_text=_("Allow packages to be uploaded to this index.")
@@ -74,6 +77,7 @@ def get_base_url(self, obj):
     class Meta:
         fields = core_serializers.DistributionSerializer.Meta.fields + (
             "publication",
+            "repository_version",
             "allow_uploads",
             "remote",
         )

pulp_python/pytest_plugin.py

@@ -73,7 +73,7 @@ def _gen_python_distribution(
                     ver_href = f"{repo_href}versions/{version}/"
                 else:
                     ver_href = get_href(version)
-                body = {"repository_version": ver_href}
+                body["repository_version"] = ver_href
             else:
                 body["repository"] = repo_href
         kwargs = {}

pulp_python/tests/functional/api/test_pypi_apis.py

@@ -267,6 +267,11 @@ def test_pypi_json(python_remote_factory, python_repo_with_sync, python_distribu
     distro = python_distribution_factory(repository=repo)
     response = requests.get(urljoin(distro.base_url, "pypi/shelf-reader/json"))
     assert_pypi_json(response.json())
+    # Test serving a repository version
+    distro = python_distribution_factory(repository=repo, version="1")
+    assert distro.repository is None
+    response = requests.get(urljoin(distro.base_url, "pypi/shelf-reader/json"))
+    assert_pypi_json(response.json())
 
 
 @pytest.mark.parallel