From 5350ddd21613c7bd48dabd5f565369861f1d941b Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 28 Jun 2023 04:32:53 +0200 Subject: [PATCH 01/16] debian-backport-cockpit: Move to bookworm --- debian-backport-cockpit | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian-backport-cockpit b/debian-backport-cockpit index 5b3df32..a0284ed 100755 --- a/debian-backport-cockpit +++ b/debian-backport-cockpit @@ -26,9 +26,8 @@ cd /tmp/backport apt-get source $PACKAGE cd ${PACKAGE}-* -# bullseye -series_ver bullseye-backports -[ ! -x debian/adjust-for-release ] || debian/adjust-for-release bullseye -dch --local ~bpo11+ --distribution bullseye-backports --force-distribution "No-change backport to Debian Bullseye" +# bookworm +series_ver bookworm-backports +dch --local ~bpo12+ --distribution bookworm-backports --force-distribution "No-change backport to Debian Bookworm" debuild -S -sd -nc -v$ver upload -- 2.39.2 From 7f495ed42f5540f1ff924505c2676718159285ae Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 3 Jul 2023 07:30:59 +0200 Subject: [PATCH 02/16] consors-report.py: Updates --- consors-report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consors-report.py b/consors-report.py index f791e9c..1239755 100755 --- a/consors-report.py +++ b/consors-report.py @@ -21,7 +21,7 @@ CATEGORIES = { 'Lebensmittel': re.compile('BIOS|Wolf|Ruta|Rewe', re.I), 'Eigentumswohnungen': re.compile('Rechnung Darl.-Leistung|Semmelweis', re.I), 'Hobby/Sport': re.compile('Holstein|Mrs. Sporty|Kieser|DJK', re.I), - 'Sparen': re.compile('Bausparkasse Mainz AG|FIL Fondsbank|MIG GmbH|Netfonds AG', re.I), + 'Sparen': re.compile('Bausparkasse Mainz AG|FIL Fondsbank|MIG (Fonds|GmbH)|Netfonds AG', re.I), 'Spenden': re.compile('Spende|Signal Foundation|nebenan.de|(paypal.*Sabine.Hossenf)|' 'Patreon|Umwelthilfe|Foerderer|Malteser|(Aktion Tier.*Mensch)|' 'campact', re.I), -- 2.39.2 From d64958e851d1e5727fc8aff4ca7abf102184d559 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 1 Aug 2023 14:42:01 +0200 Subject: [PATCH 03/16] consors-report: updates --- consors-report.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/consors-report.py b/consors-report.py index 1239755..f7c91ba 100755 --- a/consors-report.py +++ b/consors-report.py @@ -14,10 +14,11 @@ CATEGORIES = { 'Gehalt/Steuern': re.compile('Gehalt/Rente|RED HAT|Finanzamt|FK Guenzburg', re.I), 'Wohnung': re.compile('Telekom|hands4home|Goetzfried|Green Planet Energy|Beitragsservice.*Rundfunk', re.I), 'Medizin': re.compile(r'Apotheke|MVZ|\bmed\b|ZAB Abrechnung|Caika|HNOeins|PVS|Dr\..*Sellier|' - r'BFS Health|Streifeneder|Labor|Physio|(Drescher.*Lung)|(Debeka.*Überweisung)|(DKV.*Überweisung)', re.I), + r'BFS Health|Streifeneder|Labor|Physio|(Drescher.*Lung)|' + '(Dr.*Borchers)|(Debeka.*Überweisung)|(DKV.*Überweisung)|Beihilfe', re.I), 'Versicherung': re.compile('(debeka|DKV|Hallesche|Versicherung|Alte Leipziger|ConceptIF|' 'Baloise).*Lastschrift', re.I), - 'Transport': re.compile('DB Vertrieb|Deutsche Bahn|Nextbike', re.I), + 'Transport': re.compile('DB Vertrieb|Deutsche Bahn|Nextbike|Carsharing', re.I), 'Lebensmittel': re.compile('BIOS|Wolf|Ruta|Rewe', re.I), 'Eigentumswohnungen': re.compile('Rechnung Darl.-Leistung|Semmelweis', re.I), 'Hobby/Sport': re.compile('Holstein|Mrs. Sporty|Kieser|DJK', re.I), -- 2.39.2 From cfa73945fb7d66449a7fefa88d42ac3f6fb8450f Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 12 Sep 2023 09:43:46 +0200 Subject: [PATCH 04/16] build-cockpit-toolbox: Add fedpkg It was dropped from cockpit/tasks. --- build-cockpit-toolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox index 3cd6980..c13b763 100755 --- a/build-cockpit-toolbox +++ b/build-cockpit-toolbox @@ -22,7 +22,7 @@ sudo dnf install -y ansible bash-completion man-db man-pages moreutils fd-find r cargo rustfmt clippy \ calibre qt5-qtwayland \ dbus-daemon tmt tmt-provision-virtual flatpak-builder flatpak-spawn \ - centpkg + fedpkg centpkg # commands to forward to the host for cmd in podman toolbox nmcli eog evince; do -- 2.39.2 From 9c693323a8e2568330e019cbbf2653aa9d4fcfa8 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 21 Sep 2023 10:30:47 +0200 Subject: [PATCH 05/16] install-rhel-tools: Drop 1minutetip, does not exist any more --- install-rhel-tools | 7 ------- 1 file changed, 7 deletions(-) diff --git a/install-rhel-tools b/install-rhel-tools index 47b26f3..741e0cf 100755 --- a/install-rhel-tools +++ b/install-rhel-tools @@ -13,10 +13,3 @@ sudo dnf install -y rhel-packager # coverity sudo dnf copr enable -y copr.devel.redhat.com/kdudka/covscan sudo dnf install -y covscan-client - -# 1minutetip: https://wiki.test.redhat.com/BaseOs/Projects/1minuteTIP -if mountpoint /mnt; then sudo umount /mnt; fi # HACK: rhts-test-env-5.0-2.fc32eng.noarch wants to fiddle with it -. /etc/os-release -sudo curl -o /etc/yum.repos.d/qa-tools.repo https://copr.devel.redhat.com/coprs/lpol/qa-tools/repo/fedora-36/lpol-qa-tools-fedora-${VERSION_ID}.repo -sudo curl -o /etc/yum.repos.d/beaker-client.repo http://download.lab.bos.redhat.com/beakerrepos/beaker-client-Fedora.repo -sudo dnf install -y qa-tools-workstation-1minutetip tmt-redhat-provision-minute -- 2.39.2 From dde86d8c53ece7aefa70ee3cdd1b8ac3ab638581 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sun, 24 Sep 2023 09:46:53 +0200 Subject: [PATCH 06/16] install-tex: Add --- install-tex | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 install-tex diff --git a/install-tex b/install-tex new file mode 100755 index 0000000..62d2a6f --- /dev/null +++ b/install-tex @@ -0,0 +1,6 @@ +#!/bin/sh +if command -v apt; then + sudo apt install -y texlive-lang-german texlive-latex-base texlive-latex-extra +else + sudo dnf install texlive-german texlive-german texlive-a4wide texlive-dinbrief texlive-latex texlive-hyphen-german pandoc texlive-ec texlive-pdfjam texlive-beamer +fi -- 2.39.2 From 9b5b8ca311962bd61a726d33e14b85397a5920f4 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 28 Sep 2023 07:56:23 +0200 Subject: [PATCH 07/16] build-cockpit-toolbox: Install mypy --- build-cockpit-toolbox | 1 + 1 file changed, 1 insertion(+) diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox index c13b763..deff276 100755 --- a/build-cockpit-toolbox +++ b/build-cockpit-toolbox @@ -18,6 +18,7 @@ sudo sed -i s/nodocs// /etc/dnf/dnf.conf sudo dnf install -y ansible bash-completion man-db man-pages moreutils fd-find ripgrep gh git-delta neovim \ python3-boto python3-boto3 python3-openstacksdk python3-pytest-asyncio libnotify \ + python3-mypy \ simple-scan /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert pdfmerge \ cargo rustfmt clippy \ calibre qt5-qtwayland \ -- 2.39.2 From 3ee45886642a0872bdc45a7f40a43b05e53ccbed Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 4 Oct 2023 08:27:20 +0200 Subject: [PATCH 08/16] consors-report.py: Update --- consors-report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consors-report.py b/consors-report.py index f7c91ba..b921a3c 100755 --- a/consors-report.py +++ b/consors-report.py @@ -25,7 +25,7 @@ CATEGORIES = { 'Sparen': re.compile('Bausparkasse Mainz AG|FIL Fondsbank|MIG (Fonds|GmbH)|Netfonds AG', re.I), 'Spenden': re.compile('Spende|Signal Foundation|nebenan.de|(paypal.*Sabine.Hossenf)|' 'Patreon|Umwelthilfe|Foerderer|Malteser|(Aktion Tier.*Mensch)|' - 'campact', re.I), + 'campact|Amnesty', re.I), } -- 2.39.2 From a8348dd56b475d9d8086db7d82b4a0bb336db09f Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 30 Oct 2023 08:23:21 +0100 Subject: [PATCH 09/16] ubuntu-backport-cockpit: update releases --- ubuntu-backport-cockpit | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ubuntu-backport-cockpit b/ubuntu-backport-cockpit index f8e2427..c9e90e7 100755 --- a/ubuntu-backport-cockpit +++ b/ubuntu-backport-cockpit @@ -32,12 +32,11 @@ apt-get source $PACKAGE cd ${PACKAGE}-* case "$TARGET" in + noble) VER=24.04 ;; mantic) VER=23.10 ;; lunar) VER=23.04 ;; kinetic) VER=22.10 ;; jammy) VER=22.04 ;; - impish) VER=21.10 ;; - focal) VER=20.04 ;; *) echo "Unknown target $TARGET" >&2; exit 1 ;; esac -- 2.39.2 From c2223f6ec6bfeb9a1acc749e8207994a96902d4a Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 3 Nov 2023 08:35:38 +0100 Subject: [PATCH 10/16] consors-report.py: Updates --- consors-report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consors-report.py b/consors-report.py index b921a3c..89b24c1 100755 --- a/consors-report.py +++ b/consors-report.py @@ -15,7 +15,7 @@ CATEGORIES = { 'Wohnung': re.compile('Telekom|hands4home|Goetzfried|Green Planet Energy|Beitragsservice.*Rundfunk', re.I), 'Medizin': re.compile(r'Apotheke|MVZ|\bmed\b|ZAB Abrechnung|Caika|HNOeins|PVS|Dr\..*Sellier|' r'BFS Health|Streifeneder|Labor|Physio|(Drescher.*Lung)|' - '(Dr.*Borchers)|(Debeka.*Überweisung)|(DKV.*Überweisung)|Beihilfe', re.I), + '(Dr.*Borchers)|(Debeka.*Überweisung)|(DKV.*Überweisung)|Beihilfe|Klinik', re.I), 'Versicherung': re.compile('(debeka|DKV|Hallesche|Versicherung|Alte Leipziger|ConceptIF|' 'Baloise).*Lastschrift', re.I), 'Transport': re.compile('DB Vertrieb|Deutsche Bahn|Nextbike|Carsharing', re.I), -- 2.39.2 From 6da88a57b007c9abf88e82df8cf513bfba397593 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sun, 10 Dec 2023 15:40:15 +0100 Subject: [PATCH 11/16] consors-report.py: Convert to comma separated input Consorsbank changed its format from semicolon separator without quotes to comma separator with quotes. Move to the `csv` stdlib module for that. Convert old to new format with: ```py import csv import sys with open(sys.argv[1], 'r') as csvfile: reader = csv.reader(csvfile, delimiter=';', quotechar='"') writer = csv.writer(sys.stdout, delimiter=',', quotechar='"') for row in reader: writer.writerow(row) ``` --- consors-report.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/consors-report.py b/consors-report.py index 89b24c1..c3d505d 100755 --- a/consors-report.py +++ b/consors-report.py @@ -2,6 +2,7 @@ import argparse import collections +import csv import itertools import re from collections import namedtuple @@ -44,8 +45,8 @@ def get_category(item: str) -> str: return 'Sonstiges' -def parse_entry(line: str) -> Entry: - fields = [f.strip() for f in line.strip().split(';')] +def parse_entry(raw_fields: Iterable[str]) -> Entry: + fields = [f.strip() for f in raw_fields] # last field is the value, parse as float value = float(fields.pop().replace('.', '').replace(',', '.')) # match on who, IBAN, type, or desc @@ -63,9 +64,12 @@ def parse_csv(path: Path, date_filter: str) -> Iterable[Entry]: return filter_re.search(entry.date) with path.open() as f: + reader = csv.reader(f) + next(reader) # skip header # first line is the column headers, chop it off - entries = map(parse_entry, f.readlines()[1:]) - return filter(filter_entry, entries) + entries = map(parse_entry, reader) + # do the actual iteration here, as the files get closed afterwards + return list(filter(filter_entry, entries)) def main(): -- 2.39.2 From aa77966c4018e039afe10c2b56390186b9273c93 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 1 Jan 2024 10:47:03 +0100 Subject: [PATCH 12/16] consors-report.py: Updates --- consors-report.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/consors-report.py b/consors-report.py index c3d505d..2ed322e 100755 --- a/consors-report.py +++ b/consors-report.py @@ -15,14 +15,14 @@ CATEGORIES = { 'Gehalt/Steuern': re.compile('Gehalt/Rente|RED HAT|Finanzamt|FK Guenzburg', re.I), 'Wohnung': re.compile('Telekom|hands4home|Goetzfried|Green Planet Energy|Beitragsservice.*Rundfunk', re.I), 'Medizin': re.compile(r'Apotheke|MVZ|\bmed\b|ZAB Abrechnung|Caika|HNOeins|PVS|Dr\..*Sellier|' - r'BFS Health|Streifeneder|Labor|Physio|(Drescher.*Lung)|' + r'BFS Health|Streifeneder|Labor|Physio|(Drescher.*Lung)|Osteopath|' '(Dr.*Borchers)|(Debeka.*Überweisung)|(DKV.*Überweisung)|Beihilfe|Klinik', re.I), 'Versicherung': re.compile('(debeka|DKV|Hallesche|Versicherung|Alte Leipziger|ConceptIF|' 'Baloise).*Lastschrift', re.I), 'Transport': re.compile('DB Vertrieb|Deutsche Bahn|Nextbike|Carsharing', re.I), - 'Lebensmittel': re.compile('BIOS|Wolf|Ruta|Rewe', re.I), + 'Lebensmittel': re.compile('BIOS|Bäcker|Baecker|Ruta|Rewe', re.I), 'Eigentumswohnungen': re.compile('Rechnung Darl.-Leistung|Semmelweis', re.I), - 'Hobby/Sport': re.compile('Holstein|Mrs. Sporty|Kieser|DJK', re.I), + 'Hobby/Sport': re.compile('Holstein|Mrs. Sporty|Kieser|DJK|Dimaso', re.I), 'Sparen': re.compile('Bausparkasse Mainz AG|FIL Fondsbank|MIG (Fonds|GmbH)|Netfonds AG', re.I), 'Spenden': re.compile('Spende|Signal Foundation|nebenan.de|(paypal.*Sabine.Hossenf)|' 'Patreon|Umwelthilfe|Foerderer|Malteser|(Aktion Tier.*Mensch)|' -- 2.39.2 From 986919e19b9b9569d025aa3c4ec136d9dfaed630 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 1 Mar 2024 11:43:22 +0100 Subject: [PATCH 13/16] consors-report.py: Updates --- consors-report.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/consors-report.py b/consors-report.py index 2ed322e..f76deb3 100755 --- a/consors-report.py +++ b/consors-report.py @@ -17,8 +17,8 @@ CATEGORIES = { 'Medizin': re.compile(r'Apotheke|MVZ|\bmed\b|ZAB Abrechnung|Caika|HNOeins|PVS|Dr\..*Sellier|' r'BFS Health|Streifeneder|Labor|Physio|(Drescher.*Lung)|Osteopath|' '(Dr.*Borchers)|(Debeka.*Überweisung)|(DKV.*Überweisung)|Beihilfe|Klinik', re.I), - 'Versicherung': re.compile('(debeka|DKV|Hallesche|Versicherung|Alte Leipziger|ConceptIF|' - 'Baloise).*Lastschrift', re.I), + 'Versicherung': re.compile('((debeka|DKV|Hallesche|Versicherung|Alte Leipziger|ConceptIF|' + 'Baloise).*Lastschrift)|Hallesche.*Bonu', re.I), 'Transport': re.compile('DB Vertrieb|Deutsche Bahn|Nextbike|Carsharing', re.I), 'Lebensmittel': re.compile('BIOS|Bäcker|Baecker|Ruta|Rewe', re.I), 'Eigentumswohnungen': re.compile('Rechnung Darl.-Leistung|Semmelweis', re.I), -- 2.39.2 From f0dbdd6aa6ead8bd28afe703e65d8e177b2dc428 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 13 Mar 2024 10:19:16 +0100 Subject: [PATCH 14/16] build-cockpit-toolbox: Add hashbang to flatpak-spawn wrappers So that these can be called from Python. --- build-cockpit-toolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox index deff276..222d4b5 100755 --- a/build-cockpit-toolbox +++ b/build-cockpit-toolbox @@ -27,7 +27,7 @@ sudo dnf install -y ansible bash-completion man-db man-pages moreutils fd-find r # commands to forward to the host for cmd in podman toolbox nmcli eog evince; do - printf "flatpak-spawn --host $cmd \42\$@\42\n" | sudo tee /usr/local/bin/$cmd >/dev/null + printf "#!/bin/sh\nexec flatpak-spawn --host $cmd \42\$@\42\n" | sudo tee /usr/local/bin/$cmd >/dev/null sudo chmod a+x /usr/local/bin/$cmd done ' -- 2.39.2 From 4e3bd8279c701a0051a158a675497ab714abc2ba Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 9 Apr 2024 11:10:05 +0200 Subject: [PATCH 15/16] build-cockpit-toolbox: tasks container moved to ghcr.io --- build-cockpit-toolbox | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox index 222d4b5..16a81c3 100755 --- a/build-cockpit-toolbox +++ b/build-cockpit-toolbox @@ -4,8 +4,8 @@ NAME=${NAME:-cockpit} TAG=${TAG:-latest} toolbox rm --force $NAME || true -podman pull quay.io/cockpit/tasks:${TAG} -yes | toolbox create --image quay.io/cockpit/tasks:${TAG} -c $NAME +podman pull ghcr.io/cockpit-project/tasks:${TAG} +yes | toolbox create --image ghcr.io/cockpit-project/tasks:${TAG} -c $NAME # install some extra development and desktop tools toolbox run -c "$NAME" sh -exc ' -- 2.39.2 From 22da5c79e5e1edf75b0899268d7528a71d0b5139 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 26 Apr 2024 08:10:34 +0200 Subject: [PATCH 16/16] build-cockpit-toolbox: Drop obsolete packages tmt-provision-virtual got merged into tmt, the others are already in the tasks container. --- build-cockpit-toolbox | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox index 16a81c3..39844bd 100755 --- a/build-cockpit-toolbox +++ b/build-cockpit-toolbox @@ -17,12 +17,11 @@ sudo hostname -F /etc/hostname sudo sed -i s/nodocs// /etc/dnf/dnf.conf sudo dnf install -y ansible bash-completion man-db man-pages moreutils fd-find ripgrep gh git-delta neovim \ - python3-boto python3-boto3 python3-openstacksdk python3-pytest-asyncio libnotify \ - python3-mypy \ + python3-boto python3-boto3 python3-openstacksdk libnotify \ simple-scan /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert pdfmerge \ cargo rustfmt clippy \ calibre qt5-qtwayland \ - dbus-daemon tmt tmt-provision-virtual flatpak-builder flatpak-spawn \ + tmt flatpak-builder flatpak-spawn \ fedpkg centpkg # commands to forward to the host -- 2.39.2