Click >= 8.2 upgrade

[Copilot]

Click 8.2 introduced deprecated support on options, which collided with FlexMeasures’ custom DeprecatedOption attribute usage and broke multiple CLI commands. This PR removes that collision and lifts the temporary Click version pin.

• Problem summary

  • CLI commands using DeprecatedOptionsCommand failed with TypeError: argument of type 'bool' is not iterable when running with Click 8.2+.
  • Root cause: custom code stored deprecated aliases on option.deprecated, which now conflicts with Click’s own Option.deprecated boolean/string field.

• CLI compatibility fix

  • DeprecatedOption now stores deprecated aliases on a dedicated deprecated_options attribute.
  • DeprecatedOptionsCommand now reads deprecated_options when checking whether an invoked flag is deprecated.
  • Existing warning behavior for deprecated aliases is preserved.
  • Fix Python 3.10 MRO issue blocking test collection (see below)

• Dependency update

  • Updated project constraint from click<8.2.0 to click>=8.2.0.
  • Regenerated uv.lock accordingly.

• Regression coverage

  • Added focused tests for:
    • parsing a normal option on a command using DeprecatedOptionsCommand
    • parsing a deprecated alias and emitting the deprecation warning

# before: collided with Click's built-in Option.deprecated
self.deprecated = tuple(deprecated_aliases)

# after: dedicated storage for alias matching logic
self.deprecated_options = tuple(deprecated_aliases)

MRO issue

CI test collection on Python 3.10 started failing with TypeError: Cannot create a consistent method resolution order (MRO) for bases ABC, Generic after dependency updates. This PR removes the incompatible inheritance pattern.

• Root cause addressed: Marshmallow/Click type compatibility on Python 3.10

  • Removed click.ParamType inheritance from MarshmallowClickMixin to avoid ABC/Generic MRO conflicts with marshmallow fields.
  • Added callable support on the mixin (__call__) and a stable __name__ so Click can still consume field instances where it falls back to callable conversion.
  • Kept existing convert() behavior for CLI parameter handling.

• Field class inheritance cleanup

  • Reordered bases to consistently put MarshmallowClickMixin before marshmallow field classes in affected schema fields:
    • AccountIdField
    • DataSourceIdField
    • UserIdField
  • This keeps marshmallow behavior intact while avoiding problematic type-resolution paths.

• Click 8.2 compatibility clarity

  • Preserved the DeprecatedOption compatibility approach (deprecated_options instead of deprecated) and added an inline rationale comment for maintainability.

class MarshmallowClickMixin:
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
        self.name = self.__class__.__name__
        self.__name__ = self.name  # for click.FuncParamType fallback

    def convert(self, value, param, ctx, **kwargs):
        return self.deserialize(value, **kwargs)

    def __call__(self, value):
        return self.deserialize(value)

[socket-security]

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	click@​8.1.8 ⏵ 8.4.1

View full report

[nhoening]

LGTM

Was there also the option to move to Click's own (new) option.deprecated syntax? Or does that concern something else, actually?

[Flix6x]

This PR only avoids the naming conflict rather than rewriting the implementation to use Click’s native mechanism.

Click’s built-in deprecation support is about a whole parameter/option being deprecated, not about selectively deprecating one alias spelling while retaining another alias as first-class and giving a targeted replacement message.