diff --git a/.github/workflows/debs.yml b/.github/workflows/debs.yml index ae5b1b6..b044e3a 100644 --- a/.github/workflows/debs.yml +++ b/.github/workflows/debs.yml @@ -65,8 +65,8 @@ jobs: - name: Fetch debian files run: | - wget https://launchpad.net/~nerdboy/+archive/ubuntu/embedded/+sourcefiles/timew-addons/0.1.1-1ubuntu1.22.04.1/timew-addons_0.1.1-1ubuntu1.22.04.1.debian.tar.xz - tar xf timew-addons_0.1.1-1ubuntu1.22.04.1.debian.tar.xz && rm *debian.tar.xz + wget https://launchpad.net/~nerdboy/+archive/ubuntu/embedded/+sourcefiles/timew-addons/0.3.0-1ubuntu1.20.04.1/timew-addons_0.3.0-1ubuntu1.20.04.1.debian.tar.xz + tar xf timew-addons_0.3.0-1ubuntu1.20.04.1.debian.tar.xz && rm *debian.tar.xz ls - name: Install deps and update debian changelog diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 85fbd0f..5b0c4ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,8 +122,8 @@ jobs: - name: Fetch debian files run: | - wget https://launchpad.net/~nerdboy/+archive/ubuntu/embedded/+sourcefiles/timew-addons/0.1.1-1ubuntu1.22.04.1/timew-addons_0.1.1-1ubuntu1.22.04.1.debian.tar.xz - tar xf timew-addons_0.1.1-1ubuntu1.22.04.1.debian.tar.xz && rm *debian.tar.xz + wget https://launchpad.net/~nerdboy/+archive/ubuntu/embedded/+sourcefiles/timew-addons/0.3.0-1ubuntu1.20.04.1/timew-addons_0.3.0-1ubuntu1.20.04.1.debian.tar.xz + tar xf timew-addons_0.3.0-1ubuntu1.20.04.1.debian.tar.xz && rm *debian.tar.xz ls - name: Install deps and update debian changelog diff --git a/.gitignore b/.gitignore index 671afcf..97f8d8e 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,7 @@ instance/ # Sphinx documentation docs/_build/ +docs/source/api/ # not-Sphinx documentation (externel) docs/sum/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4e2c8f1..fdf77e6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,6 +12,7 @@ repos: rev: v4.6.0 hooks: - id: check-added-large-files + args: ["--maxkb=2000"] - id: check-case-conflict - id: check-merge-conflict - id: check-symlinks diff --git a/README.rst b/README.rst index d51ef5a..99b4a6d 100644 --- a/README.rst +++ b/README.rst @@ -65,9 +65,10 @@ and package overlays for Gentoo_ and Ubuntu. Installing using system package manager is currently only supported on Gentoo_ and requires `this portage overlay`_. Use one of the overlay -install methods shown in the readme_ file and sync the overlay; following -the overlay sync, install the package and dependencies:: +install methods shown in the overlay readme_ file and sync the overlay; +following the overlay sync, install the package and dependencies:: + $ sudo emaint sync -r embedded-overlay $ sudo emerge timew-addons -v --ask When available, use the following `Ubuntu PPA`_ to install on at least @@ -82,6 +83,28 @@ installed and then add the PPA: See `Adding this PPA to your system`_ for more info. +A somewhat manual approach using pre-built packages is available for debian +*bookworm*, *trixie*, and *sid*. First install the ``gdebi`` package:: + + $ sudo apt install gdebi + +Next download the ``.deb`` packages for timew-report and timew-addons from +GitHub for your Debian version, eg, for bookworm do:: + + $ wget https://github.com/sarnold/timew-addons/releases/download/0.3.0/timew-addons_0.3.0-3+g478e08a-bookworm_all.deb + $ wget https://github.com/sarnold/timew-report/releases/download/v1.4.0/timew-report_1.4.0-10+gc66c7b7-bookworm_amd64.deb + +Then install the ``.deb`` packages for timew-report and timew-addons from +GitHub using gdebi:: + + $ sudo gedbi timew-report_1.4.0-10+gc66c7b7-bookworm_amd64.deb + $ sudo gedbi timew-addons_0.3.0-3+g478e08a-bookworm_all.deb + +.. important:: The exact package names and Debian release will be different. + Substitute the name of your Debian release and use the most + recent Github release page available. + + .. _Adding this PPA to your system: .. _this PPA: .. _Ubuntu PPA: https://launchpad.net/~nerdboy/+archive/ubuntu/embedded diff --git a/docs/source/conf.py b/docs/source/conf.py index 52271ba..49d72da 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -39,6 +39,7 @@ extensions = [ 'rst2pdf.pdfbuilder', 'sphinxcontrib.apidoc', + 'sphinx.ext.napoleon', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sphinx.ext.coverage', diff --git a/extensions/csv_rpt.py b/extensions/csv_rpt.py index 6736d34..26f3110 100755 --- a/extensions/csv_rpt.py +++ b/extensions/csv_rpt.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys diff --git a/extensions/onelineday.py b/extensions/onelineday.py index 2787ded..4a2cfc4 100755 --- a/extensions/onelineday.py +++ b/extensions/onelineday.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ''' Modified from upstream example; extract a job-tag from the first comma-separated split of the full tag string and produce subtotals diff --git a/scripts/timew-status-indicator b/scripts/timew-status-indicator index 5b888e4..aa30e8c 100755 --- a/scripts/timew-status-indicator +++ b/scripts/timew-status-indicator @@ -9,7 +9,7 @@ import subprocess import time import typing from collections import Counter -from datetime import timedelta +from datetime import datetime, timedelta from decimal import Decimal from threading import Thread from typing import cast @@ -180,11 +180,13 @@ class Indicator: return menu def about(self, source): + year = datetime.now().year + cpr_str = f'© {year} Stephen L Arnold' dlg = Gtk.AboutDialog() dlg.set_name('About...') dlg.set_program_name('Timew Status Indicator') dlg.set_version(APP_VERSION) - dlg.set_copyright('© 2024 Stephen L Arnold') + dlg.set_copyright(cpr_str) dlg.set_license_type(Gtk.License.GPL_3_0) dlg.set_logo_icon_name(get_state_icon('APP', CFG)) dlg.set_website('https://github.com/sarnold/timew-addons')