Skip to content

Commit 2db2339

Browse files
authored
Merge pull request pulp#674 from pulp/update-ci/main
Update CI files for branch main
2 parents 915b198 + b7b3730 commit 2db2339

File tree

8 files changed

+492
-630
lines changed

8 files changed

+492
-630
lines changed

.ci/scripts/collect_changes.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/env python3
12
# WARNING: DO NOT EDIT!
23
#
34
# This file was generated by plugin_template, and is managed by it. Please use
@@ -8,13 +9,14 @@
89
import itertools
910
import os
1011
import re
12+
import tomllib
1113

12-
import toml
1314
from git import GitCommandError, Repo
1415
from packaging.version import parse as parse_version
1516

1617
# Read Towncrier settings
17-
tc_settings = toml.load("pyproject.toml")["tool"]["towncrier"]
18+
with open("pyproject.toml", "rb") as fp:
19+
tc_settings = tomllib.load(fp)["tool"]["towncrier"]
1820

1921
CHANGELOG_FILE = tc_settings.get("filename", "NEWS.rst")
2022
START_STRING = tc_settings.get(
@@ -79,7 +81,7 @@ def main():
7981
old_length = len(main_changes)
8082

8183
for branch in branches:
82-
print(f"Looking at branch {branch}")
84+
print(f"Looking for './{CHANGELOG_FILE}' at branch {branch}")
8385
try:
8486
changelog = get_changelog(repo, branch)
8587
except GitCommandError:

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-335-gdf91f79
1+
2021.08.26-337-g7c7a09a

0 commit comments

Comments
 (0)