Move spreadsheet excluded paths to config

This commit is contained in:
Avram Lubkin 2023-07-10 10:22:10 -04:00 коммит произвёл Avram Lubkin
Родитель fd8710fe8f
Коммит 1f380a397e
3 изменённых файлов: 21 добавлений и 6 удалений

Просмотреть файл

@ -25,4 +25,9 @@ downstream:
- repo: Debian9-backport
reference: stretch-backports
- repo: Debian10-backport
reference: bullseye-backports
reference: bullseye-backports
spreadsheet:
excluded_paths:
- '%fs/cifs%'
- '%tools/hv/%'

Просмотреть файл

@ -31,6 +31,14 @@ class Upstream(BaseModel):
sections: Tuple[str, ...]
class Spreadsheet(BaseModel):
"""
Model for spreadsheet configuration
"""
excluded_paths: Optional[Tuple[str, ...]]
class BasicConfig(BaseModel):
"""
Minimal configuration model
@ -61,6 +69,7 @@ class FullConfig(BasicConfig):
repos: Dict[str, AnyUrl]
upstream: Upstream
downstream: Optional[Tuple[Target, ...]]
spreadsheet: Optional[Spreadsheet] = Spreadsheet()
@validator("repos")
def check_repo(cls, repos):

Просмотреть файл

@ -93,14 +93,14 @@ class Spreadsheet:
self.repo = repo
def get_db_commits(
self, since: Optional[float] = None, exclude_files: Optional[Iterable[str]] = None
self, since: Optional[float] = None, excluded_paths: Optional[Iterable[str]] = None
) -> Dict[str, int]:
"""Query the 'PatchData' table for all commit hashes and IDs."""
with self.database.get_session() as session:
query = session.query(PatchData.commitID, PatchData.patchID)
if exclude_files:
for entry in exclude_files:
if excluded_paths:
for entry in excluded_paths:
query = query.filter(~PatchData.affectedFilenames.like(entry))
if since:
@ -130,7 +130,8 @@ class Spreadsheet:
# Get commits in database, but not in spreadsheet
# Exclude ~1000 CIFS patches and anything that touches tools/hv # pylint: disable=wrong-spelling-in-comment
missing_commits = self.get_db_commits(
since=self.config.upstream_since.epoch, exclude_files=("%fs/cifs%", "%tools/hv/%")
since=self.config.upstream_since.epoch,
excluded_paths=self.config.spreadsheet.excluded_paths,
).keys() - {cell.value for cell in worksheet.get_column_cells("Commit ID")}
exported = 0
@ -175,7 +176,7 @@ class Spreadsheet:
"""Update each row with the 'Fixes' and distro information."""
workbook, worksheet = get_workbook(in_file)
# Exclude ~1000 CIFS patches
db_commits = self.get_db_commits(exclude_files=("%fs/cifs%",))
db_commits = self.get_db_commits(excluded_paths=self.config.spreadsheet.excluded_paths)
targets = {}
with self.database.get_session() as session: