Skip to content

Commit 385726c

Browse files
authored
Merge pull request #592 from gerrod3/includes-list-serializer
Fix includes & excludes openapi schema
2 parents 13da84c + 318fc0f commit 385726c

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

CHANGES/576.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Changed includes and excludes openapi schema to report as array of strings instead of object.

pulp_python/app/serializers.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,20 +279,21 @@ class PythonRemoteSerializer(core_serializers.RemoteSerializer):
279279
A Serializer for PythonRemote.
280280
"""
281281

282-
includes = serializers.JSONField(
282+
includes = serializers.ListField(
283+
child=serializers.CharField(allow_blank=False),
283284
required=False,
284-
default=list,
285+
allow_empty=True,
285286
help_text=_(
286-
"A JSON list containing project specifiers for Python packages to include."
287+
"A list containing project specifiers for Python packages to include."
287288
),
288289
)
289-
excludes = serializers.JSONField(
290+
excludes = serializers.ListField(
291+
child=serializers.CharField(allow_blank=False),
290292
required=False,
291-
default=list,
293+
allow_empty=True,
292294
help_text=_(
293-
"A JSON list containing project specifiers for Python packages to exclude."
295+
"A list containing project specifiers for Python packages to exclude."
294296
),
295-
296297
)
297298
prereleases = serializers.BooleanField(
298299
required=False,

pulp_python/tests/functional/api/test_download_content.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def test_full_fixtures_to_pulp_sync(self):
124124
This test checks that Pulp can fully sync another Python Package repository that is not
125125
PyPI. This reads the repository's simple page if XMLRPC isn't supported.
126126
"""
127-
remote = self._create_remote(includes="", prereleases=True)
127+
remote = self._create_remote(includes=[], prereleases=True)
128128
repo = self._create_repo_and_sync_with_remote(remote)
129129
self.assertEqual(get_content_summary(repo.to_dict()), PYTHON_LG_FIXTURE_SUMMARY)
130130

@@ -138,14 +138,14 @@ def test_full_pulp_to_pulp_sync(self):
138138
# Test using live generated simple pages
139139
distro = self._create_distribution_from_repo(repo)
140140

141-
remote = self._create_remote(includes="", url=distro.base_url)
141+
remote = self._create_remote(includes=[], url=distro.base_url)
142142
repo2 = self._create_repo_and_sync_with_remote(remote)
143143
self.assertEqual(get_content_summary(repo2.to_dict()), PYTHON_MD_FIXTURE_SUMMARY)
144144

145145
# Now test using publication simple pages
146146
pub = self._create_publication(repo)
147147
distro2 = self._create_distribution_from_publication(pub)
148-
remote = self._create_remote(includes="", url=distro2.base_url, prereleases=True)
148+
remote = self._create_remote(includes=[], url=distro2.base_url, prereleases=True)
149149

150150
repo3 = self._create_repo_and_sync_with_remote(remote)
151151
self.assertEqual(get_content_summary(repo3.to_dict()), PYTHON_MD_FIXTURE_SUMMARY)

0 commit comments

Comments
 (0)