Skip to content

Commit 89f9b94

Browse files
authored
Merge pull request #297 from gerrod3/bandersync
Syncing with Bandersnatch
2 parents 8129ac9 + 5270947 commit 89f9b94

File tree

10 files changed

+234
-221
lines changed

10 files changed

+234
-221
lines changed

CHANGES/6875.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Pulp python is integrated with the core Bandersnatch features

CHANGES/6930.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Pulp Python now uses Bandersnatch to perform syncing and filtering of package metadata

CHANGES/985.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Pulp Python can now fully mirror all packages from PyPi

pulp_python/app/serializers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import shutil
44
import tempfile
55

6-
from requirements.requirement import Requirement
6+
from packaging.requirements import Requirement
77
from rest_framework import serializers
88

99
from pulpcore.plugin import models as core_models
@@ -272,7 +272,7 @@ def validate_includes(self, value):
272272
"""Validates the includes"""
273273
for pkg in value:
274274
try:
275-
Requirement.parse(pkg)
275+
Requirement(pkg)
276276
except ValueError as ve:
277277
raise serializers.ValidationError(
278278
_("includes specifier {} is invalid. {}".format(pkg, ve))
@@ -283,7 +283,7 @@ def validate_excludes(self, value):
283283
"""Validates the excludes"""
284284
for pkg in value:
285285
try:
286-
Requirement.parse(pkg)
286+
Requirement(pkg)
287287
except ValueError as ve:
288288
raise serializers.ValidationError(
289289
_("excludes specifier {} is invalid. {}".format(pkg, ve))

0 commit comments

Comments
 (0)