Merge pull request #226 from asmacdo/fix-content-upload

Use base serializer to create ContentArtifacts

Author: asmacdo

pulp_python/app/serializers.py

@@ -203,14 +203,15 @@ def create(self, validated_data):
         """
         classifiers = validated_data.pop('classifiers')
 
-        PythonPackageContent = python_models.PythonPackageContent.objects.create(**validated_data)
+        package_content = super().create(validated_data)
+
         for classifier in classifiers:
             python_models.Classifier.objects.create(
-                python_package_content=PythonPackageContent,
+                python_package_content=package_content,
                 **classifier
             )
 
-        return PythonPackageContent
+        return package_content
 
     class Meta:
         fields = core_serializers.SingleArtifactContentSerializer.Meta.fields + (

pulp_python/app/viewsets.py

@@ -11,7 +11,7 @@
 from rest_framework.response import Response
 
 from pulpcore.plugin import viewsets as platform
-from pulpcore.plugin.models import Artifact, ContentArtifact, RepositoryVersion
+from pulpcore.plugin.models import Artifact, RepositoryVersion
 from pulpcore.plugin.serializers import (
     AsyncOperationResponseSerializer,
     RepositoryPublishURLSerializer,
@@ -108,18 +108,11 @@ def create(self, request):
         data['version'] = metadata.version
         data['filename'] = filename
         data['_artifact'] = request.data['_artifact']
+        data['_relative_path'] = filename
 
         serializer = self.get_serializer(data=data)
         serializer.is_valid(raise_exception=True)
-        serializer.validated_data.pop('_artifact')
-        content = serializer.save()
-
-        if content.pk:
-            ContentArtifact.objects.create(
-                artifact=artifact,
-                content=content,
-                relative_path=filename
-            )
+        serializer.save()
 
         headers = self.get_success_headers(request.data)
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 requirements = [
-    'pulpcore-plugin>=0.1.0b18',
+    'pulpcore-plugin>=0.1.0b21',
     'pkginfo',
     'packaging',
 ]