Skip to content

Commit

Permalink
chg: usr: add config option to select symbolic icons instead of default
Browse files Browse the repository at this point in the history
* revert the .keepdir bits and cleanup sphinx config and index
* update changelog and get ready for release version, cleanup
  docs CI workflows

Signed-off-by: Steve Arnold <[email protected]>
  • Loading branch information
sarnold committed Aug 20, 2024
1 parent cfe86cf commit 6295328
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: ApiDocsHTML
path: "docs/build/html/"
path: "docs/_build/html/"

- name: set nojekyll for github
run: |
sudo touch docs/build/html/.nojekyll
sudo touch docs/_build/html/.nojekyll
- name: Deploy docs to gh-pages
if: ${{ github.event_name == 'push' }}
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: docs/build/html/
folder: docs/_build/html/
6 changes: 3 additions & 3 deletions .github/workflows/sphinx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: ApiDocsHTML
path: "docs/build/html/"
path: "docs/_build/html/"

- name: set nojekyll for github
run: |
sudo touch docs/build/html/.nojekyll
sudo touch docs/_build/html/.nojekyll
- name: Deploy docs to gh-pages
if: ${{ github.event_name == 'push' }}
uses: JamesIves/github-pages-deploy-action@v4
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: docs/build/html/
FOLDER: docs/_build/html/
SINGLE_COMMIT: true
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ instance/
.scrapy

# Sphinx documentation
docs/build/
docs/_build/

# not-Sphinx documentation (externel)
docs/sum/
Expand Down
23 changes: 21 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
Changelog
=========

0.0.1.dev25 (2024-08-16)
------------------------

0.1.1 (2024-08-19)
------------------

New
~~~
- Update readme, add sphinx docs build, cleanup docstrings. [Stephen L
Arnold]

* add example extension based on totals for use without jtag split
* update base config with extension_script key for script name
- Add a changelog plus .gitchangelog.rc and update tox env. [Stephen L
Arnold]
- Reset seat counter on stop after err, plus cleanup. [Stephen L Arnold]

* abstract out delta_limits, hide some prints behind DEBUG
Expand All @@ -21,6 +29,11 @@ New

Changes
~~~~~~~
- Add config option to select symbolic icons instead of default. [Steve
Arnold]

* revert the .keepdir bits and cleanup sphinx config and index
- Still more readme updates and a docstring tweak. [Stephen L Arnold]
- Try setting position and gravity options, cleanup entry window bits.
[Stephen L Arnold]
- Try rounding a Decimal for timer status. [Stephen L Arnold]
Expand All @@ -44,6 +57,12 @@ Changes

* prints CSV rows of per-jobtag totals plus total total

Fixes
~~~~~
- Even more docstring and readme/rst doc cleanup. [Stephen L Arnold]
- Cleanup some oddball link anchors flagged by sphinx check. [Stephen L
Arnold]

Other
~~~~~
- Enable pre-commit and apply some cleanup. [Stephen L Arnold]
Expand Down
Empty file removed docs/_build/.keepdir
Empty file.
1 change: 1 addition & 0 deletions docs/source/CHANGELOG.rst
Empty file removed docs/source/_static/.keepdir
Empty file.
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output

html_theme = 'sphinx_rtd_theme'
html_static_path = ['_static']
#html_static_path = ['_static']
html_sidebars = {'**': ['globaltoc.html', 'relations.html', 'sourcelink.html', 'searchbox.html']}

source_suffix = {'.rst': 'restructuredtext'}
Expand All @@ -81,7 +81,7 @@

pdf_documents = [
#('filename', u'output filename', 'Title', 'author(s)'),
('index_pdf', u'timew_status', u'Timew Status Indicator and Report Extensions', u"Stephen L Arnold"),
('index', u'timew_status', u'Timew Status Indicator and Report Extensions', u"Stephen L Arnold"),
]

# A comma-separated list of custom stylesheets. Example:
Expand Down
6 changes: 3 additions & 3 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Documentation for timew-addons
==============================
Developer/User Overview for Timew-Addons
========================================

The primary timewarrior_ addon bits included here are written in Python_:

Expand All @@ -24,7 +24,7 @@ The primary timewarrior_ addon bits included here are written in Python_:

README
modules

CHANGELOG

Indices and tables
==================
Expand Down
3 changes: 2 additions & 1 deletion src/timew_status/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"seat_snooze": "00:40",
"seat_reset_on_stop": False,
"use_last_tag": False,
"use_symbolic_icons": False,
"extension_script": "onelineday",
"default_jtag_str": "vct-sw,implement skeleton timew indicator",
"jtag_separator": ",",
Expand Down Expand Up @@ -91,7 +92,7 @@ def get_state_icon(state):

state_dict = timew_dict
app_icon = Path(install_path).joinpath(icon_name)
if not app_icon.exists():
if CFG["use_symbolic_icons"] or not app_icon.exists():
state_dict = fallback_dict

return state_dict.get(state, state_dict['INACTIVE'])
Expand Down

0 comments on commit 6295328

Please sign in to comment.