Skip to content

Commit bf22950

Browse files
gerrod3dralley
authored andcommitted
Update Bandersnatch to 6.6.0
1 parent f1052ef commit bf22950

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

pulp_python/app/tasks/sync.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@ def sync(remote_pk, repository_pk, mirror):
5959

6060
def create_bandersnatch_config(remote):
6161
"""Modifies the global Bandersnatch config state for this sync"""
62-
config = BandersnatchConfig().config
62+
config = BandersnatchConfig()
6363
config["mirror"]["master"] = remote.url
6464
config["mirror"]["workers"] = str(remote.download_concurrency)
65+
config["mirror"]["allow_non_https"] = "true"
6566
if not config.has_section("plugins"):
6667
config.add_section("plugins")
6768
config["plugins"]["enabled"] = "blocklist_release\n"

pulp_python/app/viewsets.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from bandersnatch.configuration import BandersnatchConfig
22
from django.db import transaction
33
from drf_spectacular.utils import extend_schema
4+
from pathlib import Path
45
from rest_framework import status
56
from rest_framework.decorators import action
67
from rest_framework.response import Response
@@ -496,7 +497,7 @@ def from_bandersnatch(self, request):
496497
bander_config_file = serializer.validated_data.get("config")
497498
name = serializer.validated_data.get("name")
498499
policy = serializer.validated_data.get("policy")
499-
bander_config = BandersnatchConfig(bander_config_file.file.name).config
500+
bander_config = BandersnatchConfig(Path(bander_config_file.file.name))
500501
data = {
501502
"name": name,
502503
"policy": policy,

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ requires-python = ">=3.11"
2828
dependencies = [
2929
"pulpcore>=3.81.0,<3.100",
3030
"pkginfo>=1.12.0,<1.13.0",
31-
"bandersnatch>=6.3.0,<6.6", # 6.6 has breaking changes
31+
"bandersnatch>=6.6.0,<6.7",
3232
"pypi-simple>=1.5.0,<2.0",
3333
]
3434

0 commit comments

Comments
 (0)