backlogops 0.4__tar.gz → 0.6__tar.gz

{backlogops-0.4 → backlogops-0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: backlogops
-Version: 0.4
+Version: 0.6
 Summary: Library with backlog operations.
 Author: Tom Björkholm
 Author-email: Tom Björkholm <klausuler_linnet0q@icloud.com>
@@ -14,7 +14,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
-Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Office/Business :: Scheduling
@@ -23,10 +22,11 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: config-as-json>=1.4
-Requires-Dist: cryptography>=49.0.0
+Requires-Dist: cryptography>=50.0.0
 Requires-Dist: jira[cli,opt]>=3.10.5
 Requires-Dist: tableio>=1.1
-Requires-Dist: tableio-cfg-json>=0.9
+Requires-Dist: tableio-cfg-json>=1.1
+Requires-Dist: wizard-ui-bridge[textual]>=1.1
 Requires-Dist: versionreporter>=0.4
 Dynamic: author
 Dynamic: license-file
@@ -51,15 +51,11 @@ There are 3 related packages for backlog operations:
 
 ## Project status
 
-backlogops is in beta. The algorithms intended for its initial scope are in
-place, so the main work from here is on the user experience rather than on new
-core functionality. The three packages share a version number and are released
-together.
+The three packages share a version number and are released together.
 
 The library is not meant to ever be "finished": using it for real planning keeps
 surfacing new ideas. Some of those will be added to backlogops itself, and
-others will fit better in separate packages built on top of backlogops. Early
-adopters are very welcome, and their feedback shapes what comes next.
+others will fit better in separate packages built on top of backlogops.
 
 ## Available functionality
 
@@ -316,9 +312,10 @@ For the full set of public names see the API documentation linked above.
 
 ## Test summary
 
-- Test result: 2638 passed, 7 deselected in 51s
+- Test result: 2450 passed, 9 deselected in 39s
 - No flake8 warnings.
 - No mypy errors found.
+- No pylint warnings.
 - No python layout warnings.
-- Built version(s): 0.4
+- Built version(s): 0.6
 - Build and test using Python 3.14.6

{backlogops-0.4 → backlogops-0.6}/README_pypi.md

@@ -16,15 +16,11 @@ There are 3 related packages for backlog operations:
 
 ## Project status
 
-backlogops is in beta. The algorithms intended for its initial scope are in
-place, so the main work from here is on the user experience rather than on new
-core functionality. The three packages share a version number and are released
-together.
+The three packages share a version number and are released together.
 
 The library is not meant to ever be "finished": using it for real planning keeps
 surfacing new ideas. Some of those will be added to backlogops itself, and
-others will fit better in separate packages built on top of backlogops. Early
-adopters are very welcome, and their feedback shapes what comes next.
+others will fit better in separate packages built on top of backlogops.
 
 ## Available functionality
 
@@ -281,9 +277,10 @@ For the full set of public names see the API documentation linked above.
 
 ## Test summary
 
-- Test result: 2638 passed, 7 deselected in 51s
+- Test result: 2450 passed, 9 deselected in 39s
 - No flake8 warnings.
 - No mypy errors found.
+- No pylint warnings.
 - No python layout warnings.
-- Built version(s): 0.4
+- Built version(s): 0.6
 - Build and test using Python 3.14.6

{backlogops-0.4 → backlogops-0.6}/backlogops.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: backlogops
-Version: 0.4
+Version: 0.6
 Summary: Library with backlog operations.
 Author: Tom Björkholm
 Author-email: Tom Björkholm <klausuler_linnet0q@icloud.com>
@@ -14,7 +14,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
-Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Office/Business :: Scheduling
@@ -23,10 +22,11 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: config-as-json>=1.4
-Requires-Dist: cryptography>=49.0.0
+Requires-Dist: cryptography>=50.0.0
 Requires-Dist: jira[cli,opt]>=3.10.5
 Requires-Dist: tableio>=1.1
-Requires-Dist: tableio-cfg-json>=0.9
+Requires-Dist: tableio-cfg-json>=1.1
+Requires-Dist: wizard-ui-bridge[textual]>=1.1
 Requires-Dist: versionreporter>=0.4
 Dynamic: author
 Dynamic: license-file
@@ -51,15 +51,11 @@ There are 3 related packages for backlog operations:
 
 ## Project status
 
-backlogops is in beta. The algorithms intended for its initial scope are in
-place, so the main work from here is on the user experience rather than on new
-core functionality. The three packages share a version number and are released
-together.
+The three packages share a version number and are released together.
 
 The library is not meant to ever be "finished": using it for real planning keeps
 surfacing new ideas. Some of those will be added to backlogops itself, and
-others will fit better in separate packages built on top of backlogops. Early
-adopters are very welcome, and their feedback shapes what comes next.
+others will fit better in separate packages built on top of backlogops.
 
 ## Available functionality
 
@@ -316,9 +312,10 @@ For the full set of public names see the API documentation linked above.
 
 ## Test summary
 
-- Test result: 2638 passed, 7 deselected in 51s
+- Test result: 2450 passed, 9 deselected in 39s
 - No flake8 warnings.
 - No mypy errors found.
+- No pylint warnings.
 - No python layout warnings.
-- Built version(s): 0.4
+- Built version(s): 0.6
 - Build and test using Python 3.14.6

{backlogops-0.4 → backlogops-0.6}/backlogops.egg-info/requires.txt

@@ -1,6 +1,7 @@
 config-as-json>=1.4
-cryptography>=49.0.0
+cryptography>=50.0.0
 jira[cli,opt]>=3.10.5
 tableio>=1.1
-tableio-cfg-json>=0.9
+tableio-cfg-json>=1.1
+wizard-ui-bridge[textual]>=1.1
 versionreporter>=0.4

{backlogops-0.4 → backlogops-0.6}/pyproject.toml

@@ -21,7 +21,6 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
     "Operating System :: OS Independent",
-    "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Office/Business :: Scheduling",

{backlogops-0.4 → backlogops-0.6}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup
 
 setup(
   name='backlogops',
-  version='0.4',
+  version='0.6',
   description='Library with backlog operations.',
   author='Tom Björkholm',
   author_email='klausuler_linnet0q@icloud.com',
@@ -15,10 +15,11 @@ setup(
   package_data={'backlogops': ['src/py.typed']},
   install_requires=[
     'config-as-json >= 1.4',
-    'cryptography >= 49.0.0',
+    'cryptography >= 50.0.0',
     'jira[cli,opt] >= 3.10.5',
     'tableio >= 1.1',
-    'tableio-cfg-json >= 0.9',
+    'tableio-cfg-json >= 1.1',
+    'wizard-ui-bridge[textual] >= 1.1',
     'versionreporter >= 0.4'
   ]
 )

{backlogops-0.4 → backlogops-0.6}/src/backlogops/backlog_ops_wizard.py

@@ -6,9 +6,9 @@ The public helpers :func:`available_teams_wizard` and
 persons and their personal work-hour exceptions, the teams with their
 members, and, for the full configuration, the named TableIO presets, the
 backlog item levels, the status-name map, the GUI display and the Jira
-integration. They drive any ``WizardUiBridge``
-of ``tableio_cfg_json``, so the same wizard logic runs on a console text
-interface, a Textual full-screen interface or a graphical user interface.
+integration. They drive any ``WizardUiBridge`` of ``wizard_ui_bridge``,
+so the same wizard logic runs on a console text interface, a Textual
+full-screen interface or a graphical user interface.
 
 Each repeated part is asked by first requesting a count and then collecting
 exactly that many items, so there are no open-ended "add another?" prompts.
@@ -22,7 +22,7 @@ in :mod:`backlogops.io_preset_wizard`.
 
 from functools import partial
 from typing import Optional
-from tableio_cfg_json import WizardAbort, WizardUiBridge
+from wizard_ui_bridge import WizardAbort, WizardUiBridge
 from backlogops.available_teams import AvailableTeams
 from backlogops.backlog_ops_config import BacklogOpsConfig, \
     DEF_STATUS_INPUT_MAP
@@ -31,7 +31,8 @@ from backlogops.levels import DEFAULT_LEVELS, Level
 from backlogops.person import Person
 from backlogops.table_rows import RELEASE_FIELDS
 from backlogops.team import FteException, Membership, Team
-from backlogops.work_hours import CompanyWorkHours, ExceptionWorkHours
+from backlogops.work_hours import CompanyWorkHours, DEFAULT_WORK_WEEK, \
+    ExceptionWorkHours, ScheduleWorkHours, WeekDay
 from backlogops.wizard_helpers import _backlog_map_fields
 from backlogops.wizard_navigator import _Navigator, _ask_level_display
 from backlogops.wizard_forms import FormField, FormResult, choice_field, \
@@ -220,29 +221,145 @@ def _levels_or_none(levels: list[Level]) -> Optional[list[Level]]:
     return levels
 
 
+_COMPANY_QUESTION = (
+    'Configure the company work hours.\n'
+    'Set the work hours for each week day, then, if there are any, the '
+    'first holiday, closure or special-work period and how many more '
+    'there are.')
+"""Instruction shown above the combined company work-hours form."""
+
+
+_MAX_EXCEPTIONS = 60
+"""Upper bound on the number of extra company periods the wizard adds."""
+
+
 def _build_company(nav: _Navigator,
                    default: Optional[AvailableTeams]) -> CompanyWorkHours:
     """Ask for the company weekly schedule and holiday periods.
 
-    The weekly schedule is one table and the holiday, closure and
-    special-work periods are a second table, so the whole company work
-    schedule is two screens.
+    The weekly work hours and the first holiday, closure or special-work
+    period are asked together on one form; any further periods each get
+    their own form whose question lists the periods entered so far.
     """
     company = default.company_work_hours if default else None
-    work_hours = nav.ask_schedule(seed=company.work_hours if company else None)
-    exceptions = nav.ask_exceptions(
-        'Company holiday, closure and special-work periods.',
-        seed=company.exceptions if company else None)
-    return CompanyWorkHours(work_hours=work_hours, exceptions=exceptions)
+    values = nav.ask_form(_COMPANY_QUESTION, _company_fields(), _company_rule,
+                          seed=_company_seed(company))
+    stored = company.exceptions if company else []
+    return CompanyWorkHours(work_hours=_schedule_from(values),
+                            exceptions=_build_exceptions(nav, values, stored))
+
+
+def _schedule_fields() -> list[FormField]:
+    """Return one work-hours field per week day, Monday first.
+
+    A day has between zero and twenty-four work hours, so the float field
+    enforces that inclusive range.
+    """
+    return [number_field(day.name.lower(), day.name.capitalize(),
+                         default=DEFAULT_WORK_WEEK[day], minimum=0.0,
+                         maximum=24.0)
+            for day in WeekDay]
+
+
+def _company_fields() -> list[FormField]:
+    """Return the combined company schedule and first-period fields."""
+    periods_q = 'Any holiday, closure or special-work periods?'
+    more_q = 'Number of additional such periods'
+    return (_schedule_fields()
+            + [yes_no_field('has_periods', periods_q, False)]
+            + _exception_fields()
+            + [int_field('more', more_q, default=0, minimum=0,
+                         maximum=_MAX_EXCEPTIONS)])
+
+
+def _company_rule(values: FormResult) -> tuple[Optional[str], set[str]]:
+    """Disable the period fields with no periods, else order-check them."""
+    if not values.flag('has_periods'):
+        return None, {'start', 'end', 'hours', 'new_days', 'more'}
+    return _period_rule(values)
+
+
+def _company_seed(company: Optional[CompanyWorkHours]) -> Optional[FormResult]:
+    """Return the combined company form values from stored work hours."""
+    if company is None:
+        return None
+    values: dict[str, object] = {
+        day.name.lower(): company.work_hours.get(day, DEFAULT_WORK_WEEK[day])
+        for day in WeekDay}
+    periods = company.exceptions
+    values['has_periods'] = bool(periods)
+    values['more'] = max(len(periods) - 1, 0)
+    if periods:
+        values.update(_period_values(periods[0]))
+    return FormResult(values)
+
+
+def _schedule_from(values: FormResult) -> ScheduleWorkHours:
+    """Return the weekly schedule read from the combined company form."""
+    return {day: values.number(day.name.lower()) for day in WeekDay}
+
+
+def _build_exceptions(nav: _Navigator, values: FormResult,
+                      stored: list[ExceptionWorkHours]
+                      ) -> list[ExceptionWorkHours]:
+    """Return the company periods, the first from the combined form."""
+    if not values.flag('has_periods'):
+        return []
+    first = _period_from(values)
+    rest = stored[1:] if len(stored) > 1 else []
+    return [first] + _more_exceptions(nav, values.whole('more'), first, rest)
+
+
+def _more_exceptions(nav: _Navigator, count: int, first: ExceptionWorkHours,
+                     seeds: list[ExceptionWorkHours]
+                     ) -> list[ExceptionWorkHours]:
+    """Collect the additional company periods after the first one.
+
+    Each period is asked on its own form whose question lists the periods
+    entered so far. The running list is reset on the first item, so a
+    replayed sub-level after a back or cancel request does not double it.
+    """
+    shown = [first]
+
+    def build(item: Optional[tuple[int, Optional[ExceptionWorkHours]]]
+              ) -> ExceptionWorkHours:
+        """Ask one additional period, shown after the earlier ones."""
+        assert item is not None
+        index, seed = item
+        if index == 0:
+            del shown[1:]
+        values = nav.ask_form(_more_question(shown), _exception_fields(),
+                              _period_rule, seed=_exc_seed(seed))
+        shown.append(_period_from(values))
+        return shown[-1]
+    indexed: list[tuple[int, Optional[ExceptionWorkHours]]] = [
+        (k, seeds[k] if k < len(seeds) else None) for k in range(count)]
+    return nav.counted(count, indexed, build)
+
+
+def _more_question(shown: list[ExceptionWorkHours]) -> str:
+    """Return the next-period question listing the periods entered so far."""
+    lines = ['Configure the next holiday, closure or special-work period.',
+             'Periods entered so far:']
+    return '\n'.join(lines + [_period_line(period) for period in shown])
+
+
+def _period_line(period: ExceptionWorkHours) -> str:
+    """Return a one-line summary of one exception period."""
+    extra = ' (adds free-day work)' if period.new_work_days else ''
+    return (f'  {period.start_date} to {period.end_date}: '
+            f'{period.hours_per_day:g} h/day{extra}')
+
+
+def _period_values(period: ExceptionWorkHours) -> dict[str, object]:
+    """Return the form values for one work-hour exception period."""
+    return {'start': period.start_date, 'end': period.end_date,
+            'hours': period.hours_per_day, 'new_days': period.new_work_days}
 
 
 def _exc_seed(exc: Optional[ExceptionWorkHours]) -> Optional[FormResult]:
     """Return the work-hour exception form values from an exception."""
-    if exc is None:
-        return None
-    return FormResult({'start': exc.start_date, 'end': exc.end_date,
-                       'hours': exc.hours_per_day,
-                       'new_days': exc.new_work_days})
+    return None if exc is None else FormResult(_period_values(exc))
 
 
 def _period_rule(values: FormResult) -> tuple[Optional[str], set[str]]:
@@ -265,16 +382,21 @@ def _exception_fields() -> list[FormField]:
                      'normally free?', False)]
 
 
+def _period_from(values: FormResult) -> ExceptionWorkHours:
+    """Return one exception period from a form's period fields."""
+    return ExceptionWorkHours(start_date=values.day('start'),
+                              end_date=values.day('end'),
+                              hours_per_day=values.number('hours'),
+                              new_work_days=values.flag('new_days'))
+
+
 def _ask_exception(nav: _Navigator, seed: Optional[ExceptionWorkHours] = None
                    ) -> ExceptionWorkHours:
     """Ask for one work-hour exception period on a single form."""
     values = nav.ask_form('Configure the work-hour exception period.',
                           _exception_fields(), _period_rule,
                           seed=_exc_seed(seed))
-    return ExceptionWorkHours(start_date=values.day('start'),
-                              end_date=values.day('end'),
-                              hours_per_day=values.number('hours'),
-                              new_work_days=values.flag('new_days'))
+    return _period_from(values)
 
 
 def _build_persons(nav: _Navigator,

{backlogops-0.4 → backlogops-0.6}/src/backlogops/blo_version_reporter.py

@@ -16,8 +16,8 @@ class BloVersionReporter(VersionReporter):
     @override
     def package_names(self) -> list[str]:
         """Return the package names that this package reports."""
-        ret = ['backlogops', 'tableio', 'tableio-cfg-json', 'config-as-json',
-               'mformat']
+        ret = ['backlogops', 'tableio', 'tableio-cfg-json', 'wizard-ui-bridge',
+               'config-as-json', 'mformat']
         ret += super().package_names()
         return ret
 

{backlogops-0.4 → backlogops-0.6}/src/backlogops/io_preset_wizard.py

@@ -19,7 +19,7 @@ wizard, where each preset additionally has a name.
 from functools import partial
 from typing import Optional
 from tableio import FileAccess
-from tableio_cfg_json import WizardAbort, WizardUiBridge
+from wizard_ui_bridge import WizardAbort, WizardUiBridge
 from backlogops.io_config import InputFormatConfig, OutputFormatConfig, \
     _FormatConfig, make_input_config, make_output_config
 from backlogops.table_rows import RELEASE_FIELDS

{backlogops-0.4 → backlogops-0.6}/src/backlogops/jira_wizard.py

@@ -25,7 +25,7 @@ token is visible while typed; the pass phrases are masked.
 from dataclasses import dataclass
 from functools import partial
 from typing import Callable, Optional, TypeVar
-from tableio_cfg_json import WizardPathKind
+from wizard_ui_bridge import PrefillValueType, WizardPathKind
 from backlogops.jira_io_config import DEF_BACKLOG_COLUMN_MAP, \
     DEF_RELEASE_COLUMN_MAP, JiraColumnMap, JiraConnectConfig, JiraIOConfig, \
     JiraIssueTypeMap, JiraPreset, JiraType, TokenStorage, _FILE_MODES, \
@@ -364,8 +364,9 @@ _ISSUE_MAP_Q = ('Use a level-to-issue-type map when writing (otherwise the '
 
 _FILTER_EG = default_jira_filter('<project key>')
 """Illustrative blank-filter default shown in the filter help text."""
-_FILTER_HELP = ('Leave blank to select the default project in rank '
-                f'order, i.e. {_FILTER_EG}.')
+_FILTER_HELP = ('Leave blank to select the whole project in rank order; '
+                f'the default {_FILTER_EG} is offered once the project key '
+                'is set.')
 """Help shown for the blank-defaulting issue filter field."""
 
 
@@ -417,6 +418,40 @@ def _preset_rule(has_issue_type: bool
     return rule
 
 
+# pylint: disable-next=too-few-public-methods
+class _FilterPrefill:
+    """Offer the default rank filter while the preset filter stays blank.
+
+    While the user has not written their own issue filter, every change to
+    the project key re-derives the default filter and offers it to the
+    filter field, so the filter tracks the project as it is typed. The
+    moment the filter holds text the user placed there, tracking stops and
+    the filter is left alone. The last value offered is remembered so the
+    bridge writing that value back does not look like the user typing it.
+    """
+
+    def __init__(self) -> None:
+        """Start with nothing offered and the filter not yet user-owned."""
+        self._taken_over = False
+        self._last_fill: Optional[str] = None
+
+    def __call__(self, values: FormResult,
+                 changed: str) -> list[tuple[str, PrefillValueType]]:
+        """Return a filter prefill for a project change, or nothing."""
+        self._note_user_filter(values)
+        project = values.opt_text('def_project')
+        if self._taken_over or changed != 'def_project' or not project:
+            return []
+        self._last_fill = default_jira_filter(project)
+        return [('def_filter', self._last_fill)]
+
+    def _note_user_filter(self, values: FormResult) -> None:
+        """Mark the filter user-owned once it holds text we did not offer."""
+        current = values.opt_text('def_filter')
+        if current and current != self._last_fill:
+            self._taken_over = True
+
+
 def _preset_seed(name: Optional[str], preset: Optional[JiraPreset],
                  choices: _PresetChoices) -> Optional[FormResult]:
     """Return the preset form values from a stored preset."""
@@ -444,6 +479,7 @@ def _ask_preset(nav: _Navigator, choices: _PresetChoices, used: set[str],
     values = nav.ask_form('Configure the Jira preset.',
                           _preset_fields(used, choices),
                           _preset_rule(bool(choices.issue_type_maps)),
+                          prefill=_FilterPrefill(),
                           seed=_preset_seed(seed_name, seed_preset, choices))
     return _preset_from(nav, values, choices)