Update Python dependencies #158

renovate · 2023-10-19T01:58:07Z

This PR contains the following updates:

Package	Change	Age	Adoption	Passing	Confidence
black (changelog)	`23.9.1` -> `23.11.0`
cryptography (changelog)	`41.0.4` -> `41.0.5`
cryptography (changelog)	`==41.0.4` -> `==41.0.5`
httpx (changelog)	`==0.25.0` -> `==0.25.1`
importlib-resources	`==6.1.0` -> `==6.1.1`
jsonschema (changelog)	`4.19.1` -> `4.20.0`
jsonschema (changelog)	`==4.19.1` -> `==4.20.0`
jsonschema-specifications	`==2023.7.1` -> `==2023.11.1`
lightkube	`0.14.0` -> `0.15.0`
lightkube	`==0.14.0` -> `==0.15.0`
ops	`2.7.0` -> `2.8.0`
ops	`==2.7.0` -> `==2.8.0`
poetry-core	`1.7.0` -> `1.8.1`
poetry-core	`==1.7.0` -> `==1.8.1`
pytest (source, changelog)	`7.4.2` -> `7.4.3`
pytest-operator	`0.29.0` -> `0.31.0`
referencing	`==0.30.2` -> `==0.31.0`
rpds-py	`==0.10.6` -> `==0.13.0`
ruff (source, changelog)	`0.0.292` -> `0.1.5`

Release Notes

psf/black (black)

`v23.11.0`

Compare Source

Highlights

Support formatting ranges of lines with the new --line-ranges command-line option
(#4020)

Stable style

Fix crash on formatting bytes strings that look like docstrings (#4003)
Fix crash when whitespace followed a backslash before newline in a docstring (#4008)
Fix standalone comments inside complex blocks crashing Black (#4016)
Fix crash on formatting code like await (a ** b) (#3994)
No longer treat leading f-strings as docstrings. This matches Python's behaviour and
fixes a crash (#4019)

Preview style

Multiline dicts and lists that are the sole argument to a function are now indented
less (#3964)
Multiline unpacked dicts and lists as the sole argument to a function are now also
indented less (#3992)
In f-string debug expressions, quote types that are visible in the final string are
now preserved (#4005)
Fix a bug where long case blocks were not split into multiple lines. Also enable
general trailing comma rules on case blocks (#4024)
Keep requiring two empty lines between module-level docstring and first function or
class definition (#4028)
Add support for single-line format skip with other comments on the same line (#3959)

Configuration

Consistently apply force exclusion logic before resolving symlinks (#4015)
Fix a bug in the matching of absolute path names in --include (#3976)

Performance

Fix mypyc builds on arm64 on macOS (#4017)

Integrations

Black's pre-commit integration will now run only on git hooks appropriate for a code
formatter (#3940)

`v23.10.1`

Compare Source

Highlights

Maintenance release to get a fix out for GitHub Action edge case (#3957)

Preview style

Fix merging implicit multiline strings that have inline comments (#3956)
Allow empty first line after block open before a comment or compound statement (#3967)

Packaging

Change Dockerfile to hatch + compile black (#3965)

Integrations

The summary output for GitHub workflows is now suppressible using the summary
parameter. (#3958)
Fix the action failing when Black check doesn't pass (#3957)

Documentation

It is known Windows documentation CI is broken
https://github.com/psf/black/issues/39683968

`v23.10.0`

Compare Source

Stable style

Fix comments getting removed from inside parenthesized strings (#3909)

Preview style

Fix long lines with power operators getting split before the line length (#3942)
Long type hints are now wrapped in parentheses and properly indented when split across
multiple lines (#3899)
Magic trailing commas are now respected in return types. (#3916)
Require one empty line after module-level docstrings. (#3932)
Treat raw triple-quoted strings as docstrings (#3947)

Configuration

Fix cache versioning logic when BLACK_CACHE_DIR is set (#3937)

Parser

Fix bug where attributes named type were not acccepted inside match statements
(#3950)
Add support for PEP 695 type aliases containing lambdas and other unusual expressions
(#3949)

Output

Black no longer attempts to provide special errors for attempting to format Python 2
code (#3933)
Black will more consistently print stacktraces on internal errors in verbose mode
(#3938)

Integrations

The action output displayed in the job summary is now wrapped in Markdown (#3914)

pyca/cryptography (cryptography)

`v41.0.5`

Compare Source

encode/httpx (httpx)

`v0.25.1`

Compare Source

Add support for Python 3.12. (#2854)
Add support for httpcore 1.0 (#2885)

Fixed

Raise ValueError on Response.encoding being set after Response.text has been accessed. (#2852)

python/importlib_resources (importlib-resources)

`v6.1.1`

Compare Source

python-jsonschema/jsonschema (jsonschema)

`v4.20.0`

Compare Source

=======

Properly consider items (and properties) to be evaluated by unevaluatedItems (resp. unevaluatedProperties) when behind a $dynamicRef as specified by the 2020 and 2019 specifications.
jsonschema.exceptions.ErrorTree.__setitem__ is now deprecated.
More broadly, in general users of jsonschema should never be mutating objects owned by the library.

`v4.19.2`

Compare Source

=======

Fix the error message for additional items when used with heterogeneous arrays.
Don't leak the additionalItems keyword into JSON Schema draft 2020-12, where it was replaced by items.

python-jsonschema/jsonschema-specifications (jsonschema-specifications)

`v2023.11.1`

Compare Source

Full Changelog: python-jsonschema/jsonschema-specifications@v2023.07.1...v2023.11.1

gtsystem/lightkube (lightkube)

`v0.15.0`

Compare Source

What's Changed

Resolve #54: Exposes resource_registry.register(…) by @gtsystem in https://github.com/gtsystem/lightkube/pull/55

Full Changelog: gtsystem/lightkube@v0.14.0...v0.15.0

canonical/operator (ops)

`v2.8.0`

Compare Source

Added Unit.reboot() and `Harness.reboot_count``
Added RelationMeta.optional
The type of a Handle's key was expanded from str to str|None
Narrowed types of app and unit in relation events to exclude None where applicable

python-poetry/poetry-core (poetry-core)

`v1.8.1`

Compare Source

Fixed

Fix an issue where git URLs starting with git+ could not be parsed anymore (#657).

`v1.8.0`

Compare Source

Added

Add 3.12 to the list of available Python versions (#631).
Add support for creating packages dynamically in the build script (#629).

Changed

Improve marker logic for extra markers (#636).
Update list of supported licenses (#635,
#646).
Deprecate Dependency.transitive_python_versions (#648).
Deprecate Dependency.transitive_python_constraint (#649).

Fixed

Fix an issue where projects with extension modules were not installed in editable mode (#633).
Fix an issue where the wrong or no lib folder was added to the wheel (#634).

Vendoring

Replace jsonschema with fastjsonschema.
lark==1.1.8
packaging==23.2

pytest-dev/pytest (pytest)

`v7.4.3`: pytest 7.4.3 (2023-10-24)

Compare Source

Bug Fixes

#10447: Markers are now considered in the reverse mro order to ensure base class markers are considered first -- this resolves a regression.
#11239: Fixed := in asserts impacting unrelated test cases.
#11439: Handled an edge case where :data:sys.stderr might already be closed when :ref:faulthandler is tearing down.

python-jsonschema/referencing (referencing)

`v0.31.0`

Compare Source

Full Changelog: python-jsonschema/referencing@v0.30.2...v0.31.0

crate-py/rpds (rpds-py)

astral-sh/ruff (ruff)

`v0.1.5`

Compare Source

Preview features

[flake8-bandit] Implement mako-templates (S702) (#8533)
[flake8-trio] Implement TRIO105 (#8490)
[flake8-trio] Implement TRIO109 (#8534)
[flake8-trio] Implement TRIO110 (#8537)
[flake8-trio] Implement TRIO115 (#8486)
[refurb] Implement type-none-comparison (FURB169) (#8487)
Flag all comparisons against builtin types in E721 (#8491)
Make SIM118 fix as safe when the expression is a known dictionary (#8525)

Formatter

Fix multiline lambda expression statement formatting (#8466)

CLI

Add hidden --extension to override inference of source type from file extension (#8373)

Configuration

Account for selector specificity when merging extend_unsafe_fixes and override extend_safe_fixes (#8444)
Add support for disabling cache with RUFF_NO_CACHE environment variable (#8538)

Bug fixes

[E721] Flag comparisons to memoryview (#8485)
Allow collapsed-ellipsis bodies in other statements (#8499)
Avoid D301 autofix for u prefixed strings (#8495)
Only flag flake8-trio rules when trio import is present (#8550)
Reject more syntactically invalid Python programs (#8524)
Avoid raising TRIO115 violations for trio.sleep(...) calls with non-number values (#8532)
Fix F841 false negative on assignment to multiple variables (#8489)

Documentation

Fix link to isort known-first-party (#8562)
Add notes on fix safety to a few rules (#8500)
Add missing toml config tabs (#8512)
Add instructions for configuration of Emacs (#8488)
Improve detail link contrast in dark mode (#8548)
Fix typo in example (#8506)
Added tabs for configuration files in the documentation (#8480)
Recommend project.requires-python over target-version (#8513)
Add singleton escape hatch to B008 documentation (#8501)
Fix tab configuration docs (#8502)

`v0.1.4`

Compare Source

Preview features

[flake8-trio] Implement timeout-without-await (TRIO001) (#8439)
[numpy] Implement NumPy 2.0 migration rule (NPY200) (#7702)
[pylint] Implement bad-open-mode (W1501) (#8294)
[pylint] Implement import-outside-toplevel (C0415) rule (#5180)
[pylint] Implement useless-with-lock (W2101) (#8321)
[pyupgrade] Implement timeout-error-alias (UP041) (#8476)
[refurb] Implement isinstance-type-none (FURB168) (#8308)
Detect confusable Unicode-to-Unicode units in RUF001, RUF002, and RUF003 (#4430)
Add newline after module docstrings in preview style (#8283)

Formatter

Add a note on line-too-long to the formatter docs (#8314)
Preserve trailing statement semicolons when using fmt: skip (#8273)
Preserve trailing semicolons when using fmt: off (#8275)
Avoid duplicating linter-formatter compatibility warnings (#8292)
Avoid inserting a newline after function docstrings (#8375)
Insert newline between docstring and following own line comment (#8216)
Split tuples in return positions by comma first (#8280)
Avoid treating byte strings as docstrings (#8350)
Add --line-length option to format command (#8363)
Avoid parenthesizing unsplittable because of comments (#8431)

CLI

Add --output-format to ruff rule and ruff linter (#8203)

Bug fixes

Respect --force-exclude in lint.exclude and format.exclude (#8393)
Respect --extend-per-file-ignores on the CLI (#8329)
Extend bad-dunder-method-name to permit __index__ (#8300)
Fix panic with 8 in octal escape (#8356)
Avoid raising D300 when both triple quote styles are present (#8462)
Consider unterminated f-strings in FStringRanges (#8154)
Avoid including literal shell=True for truthy, non-True diagnostics (#8359)
Avoid triggering single-element test for starred expressions (#8433)
Detect and ignore Jupyter automagics (#8398)
Fix invalid E231 error with f-strings (#8369)
Avoid triggering NamedTuple rewrite with starred annotation (#8434)
Avoid un-setting bracket flag in logical lines (#8380)
Place 'r' prefix before 'f' for raw format strings (#8464)
Remove trailing periods from NumPy 2.0 code actions (#8475)
Fix bug where PLE1307 was raised when formatting %c with characters (#8407)
Remove unicode flag from comparable (#8440)
Improve B015 message (#8295)
Use fixedOverflowWidgets for playground popover (#8458)
Mark byte_bounds as a non-backwards-compatible NumPy 2.0 change (#8474)

Internals

Add a dedicated cache directory per Ruff version (#8333)
Allow selective caching for --fix and --diff (#8316)
Improve performance of comment parsing (#8193)
Improve performance of string parsing (#8227)
Use a dedicated sort key for isort import sorting (#7963)

`v0.1.3`

Compare Source

This release includes a variety of improvements to the Ruff formatter, removing several known and
unintentional deviations from Black.

Formatter

Avoid space around pow for None, True and False (#8189)
Avoid sorting all paths in the format command (#8181)
Insert necessary blank line between class and leading comments (#8224)
Avoid introducing new parentheses in annotated assignments (#8233)
Refine the warnings about incompatible linter options (#8196)
Add test and basic implementation for formatter preview mode (#8044)
Refine warning about incompatible isort settings (#8192)
Only omit optional parentheses for starting or ending with parentheses (#8238)
Use source type to determine parser mode for formatting (#8205)
Don't warn about magic trailing comma when isort.force-single-line is true (#8244)
Use SourceKind::diff for formatter (#8240)
Fix fmt:off with trailing child comment (#8234)
Formatter parentheses support for IpyEscapeCommand (#8207)

Linter

[pylint] Add buffer methods to bad-dunder-method-name (PLW3201) exclusions (#8190)
Match rule prefixes from external codes setting in unused-noqa (#8177)
Use line-length setting for isort in lieu of pycodestyle.max-line-length (#8235)
Update fix for unnecessary-paren-on-raise-exception to unsafe for unknown types (#8231)
Correct quick fix message for W605 (#8255)

Documentation

Fix typo in max-doc-length documentation (#8201)
Improve documentation around linter-formatter conflicts (#8257)
Fix link to error suppression documentation in unused-noqa (#8172)
Add external option to unused-noqa documentation (#8171)
Add title attribute to icons (#8060)
Clarify unsafe case in RSE102 (#8256)
Fix skipping formatting examples (#8210)
docs: fix name of magic-trailing-comma option in README (#8200)
Add note about scope of rule changing in versioning policy (#8169)
Document: Fix default lint rules (#8218)
Fix a wrong setting in configuration.md (#8186)
Fix misspelled TOML headers in the tutorial (#8209)

`v0.1.2`

Compare Source

This release includes the Beta version of the Ruff formatter — an extremely fast, Black-compatible Python formatter.
Try it today with ruff format! Check out the blog post and read the docs.

Preview features

[pylint] Implement non-ascii-module-import (C2403) (#8056)
[pylint] implement non-ascii-name (C2401) (#8038)
[pylint] Implement unnecessary-lambda (W0108) (#7953)
[refurb] Implement read-whole-file (FURB101) (#7682)
Add fix for E223, E224, and E242 (#8143)
Add fix for E225, E226, E227, and E228 (#8136)
Add fix for E252 (#8142)
Add fix for E261 (#8114)
Add fix for E273 and E274 (#8144)
Add fix for E275 (#8133)
Update SIM401 to catch ternary operations (#7415)
Update E721 to allow is and is not for direct type comparisons (#7905)

Rule changes

Add backports.strenum to deprecated-imports (#8113)
Update SIM112 to ignore https_proxy, http_proxy, and no_proxy (#8140)
Update fix for literal-membership (PLR6201) to be unsafe (#8097)
Update fix for mutable-argument-defaults (B006) to be unsafe (#8108)

Formatter

Change line-ending default to auto (#8057)
Respect parenthesized generators in has_own_parentheses (#8100)
Add caching to formatter (#8089)
Remove --line-length option from format command (#8131)
Add formatter to line-length documentation (#8150)
Warn about incompatible formatter options (#8088)
Fix range of unparenthesized tuple subject in match statement (#8101)
Remove experimental formatter warning (#8148)
Don't move type param opening parenthesis comment (#8163)
Update versions in format benchmark script (#8110)
Avoid loading files for cached format results (#8134)

CLI

Show the ruff format command in help menus (#8167)
Add ruff version command with long version display (#8034)

Configuration

New pycodestyle.max-line-length option (#8039)

Bug fixes

Detect sys.version_info slices in outdated-version-block (#8112)
Avoid if-else simplification for TYPE_CHECKING blocks (#8072)
Avoid false-positive print separator diagnostic with starred argument (#8079)

Documentation

Fix message for too-many-arguments lint (#8092)
Fix extend-unsafe-fixes and extend-safe-fixes example (#8139)
Add links to flake8-import-conventions options (#8115)
Rework the documentation to incorporate the Ruff formatter (#7732)
Fix Options JSON schema description (#8081)
Fix typo (pytext -> pytest) (#8117)
Improve magic-value-comparison example in docs (#8111)

`v0.1.1`

Compare Source

Rule changes

Add unsafe fix for escape-sequence-in-docstring (D301) (#7970)

Configuration

Respect #(deprecated) attribute in configuration options (#8035)
Add [format|lint].exclude options (#8000)
Respect tab-size setting in formatter (#8006)
Add lint.preview (#8002)

Preview features

[pylint] Implement literal-membership (PLR6201) (#7973)
[pylint] Implement too-many-boolean-expressions (PLR0916) (#7975)
[pylint] Implement misplaced-bare-raise (E0704) (#7961)
[pylint] Implement global-at-module-level (W0604) (#8058)
[pylint] Implement unspecified-encoding (PLW1514) (#7939)
Add fix for triple-single-quotes (D300) (#7967)

Formatter

New code style badge for ruff format (#7878)
Fix comments outside expression parentheses (#7873)
Add --target-version to ruff format (#8055)
Skip over parentheses when detecting in keyword (#8054)
Add --diff option to ruff format (#7937)
Insert newline after nested function or class statements (#7946)
Use pass over ellipsis in non-function/class contexts (#8049)

Bug fixes

Lazily evaluate all PEP 695 type alias values (#8033)
Avoid failed assertion when showing fixes from stdin (#8029)
Avoid flagging HTTP and HTTPS literals in urllib-open (#8046)
Avoid flagging bad-dunder-method-name for _ (#8015)
Remove Python 2-only methods from URLOpen audit (#8047)
Use set bracket replacement for iteration-over-set to preserve whitespace and comments (#8001)

Documentation

Update tutorial to match revised Ruff defaults (#8066)
Update rule B005 docs (#8028)
Update GitHub actions example in docs to use --output-format (#8014)
Document lint.preview and format.preview (#8032)
Clarify that new rules should be added to RuleGroup::Preview. (#7989)

`v0.1.0`

Compare Source

This is the first release which uses the CHANGELOG file. See GitHub Releases for prior changelog entries.

Read Ruff's new versioning policy.

Breaking changes

Unsafe fixes are no longer displayed or applied without opt-in (#7769)
Drop formatting specific rules from the default set (#7900)
The deprecated format setting has been removed (#7984)
- The format setting cannot be used to configure the output format, use output-format instead
- The RUFF_FORMAT environment variable is ignored, use RUFF_OUTPUT_FORMAT instead
- The --format option has been removed from ruff check, use --output-format instead

Rule changes

Extend reimplemented-starmap (FURB140) to catch calls with a single and starred argument (#7768)
Improve cases covered by RUF015 (#7848)
Update SIM15 to allow open followed by close (#7916)
Respect msgspec.Struct default-copy semantics in RUF012 (#7786)
Add sqlalchemy methods to `flake8-boolean-trap`` exclusion list (#7874)
Add fix for PLR1714 (#7910)
Add fix for PIE804 (#7884)
Add fix for PLC0208 (#7887)
Add fix for PYI055 (#7886)
Update non-pep695-type-alias to require --unsafe-fixes outside of stub files (#7836)
Improve fix message for UP018 (#7913)
Update PLW3201 to support Enum sunder names (#7987)

Preview features

Only show warnings for empty preview selectors when enabling rules (#7842)
Add unnecessary-key-check to simplify key in dct and dct[key] to dct.get(key) (#7895)
Add assignment-in-assert to prevent walrus expressions in assert statements (#7856)
[refurb] Add single-item-membership-test (FURB171) (#7815)
[pylint] Add and-or-ternary (R1706) (#7811)

New rules are added in preview.

Configuration

Add unsafe-fixes setting (#7769)
Add extend-safe-fixes and extend-unsafe-fixes for promoting and demoting fixes (#7841)

CLI

Added --unsafe-fixes option for opt-in to display and apply unsafe fixes (#7769)
Fix use of deprecated --format option in warning (#7837)
Show changed files when running under --check (#7788)
Write summary messages to stderr when fixing via stdin instead of omitting them (#7838)
Update fix summary message in check --diff to include unsafe fix hints (#7790)
Add notebook cell field to JSON output format (#7664)
Rename applicability levels to Safe, Unsafe, and Display (#7843)

Bug fixes

Fix bug where f-strings were allowed in match pattern literal (#7857)
Fix SIM110 with a yield in the condition (#7801)
Preserve trailing comments in C414 fixes (#7775)
Check sequence type before triggering unnecessary-enumerate len suggestion (#7781)
Use correct start location for class/function clause header (#7802)
Fix incorrect fixes for SIM101 (#7798)
Format comment before parameter default correctly (#7870)
Fix E251 false positive inside f-strings (#7894)
Allow bindings to be created and referenced within annotations (#7885)
Show per-cell diffs when analyzing notebooks over stdin (#7789)
Avoid curly brace escape in f-string format spec (#7780)
Fix lexing single-quoted f-string with multi-line format spec (#7787)
Consider nursery rules to be in-preview for ruff rule (#7812)
Report precise location for invalid conversion flag (#7809)
Visit pattern match guard as a boolean test (#7911)
Respect --unfixable in ISC rules (#7917)
Fix edge case with PIE804 (#7922)
Show custom message in PTH118 for Path.joinpath with starred arguments (#7852)
Fix false negative in outdated-version-block when using greater than comparisons (#7920)
Avoid converting f-strings within Django gettext calls (#7898)
Fix false positive in PLR6301 (#7933)
Treat type aliases as typing-only expressions e.g. resolves false positive in TCH004 (#7968)
Resolve cache-dir relative to project root (#7962)
Respect subscripted base classes in type-checking rules e.g. resolves false positive in TCH003 (#7954)
Fix JSON schema limit for line-length (#7883)
Fix commented-out coalesce keyword (#7876)

Documentation

Document reimplemented-starmap performance effects (#7846)
Default to following the system dark/light mode (#7888)
Add documentation for fixes ([#7901](https://togithub.com/as

Configuration

📅 Schedule: Branch creation - "after 1am and before 2am every weekday" in timezone Etc/UTC, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

👻 Immortal: This PR will be recreated if closed unmerged. Get config help if that's undesired.

If you want to rebase/retry this PR, check this box

This PR has been generated by Mend Renovate. View repository job log here.

renovate bot requested review from dragomirp, marceloneppel and taurus-forever October 19, 2023 01:58

github-actions bot added the Libraries: Out of sync label Oct 19, 2023

taurus-forever approved these changes Oct 19, 2023

View reviewed changes

renovate bot force-pushed the renovate/python-dependencies branch 5 times, most recently from 426718b to 2b8dfb1 Compare October 25, 2023 04:09

renovate bot force-pushed the renovate/python-dependencies branch from 2b8dfb1 to bde689a Compare October 26, 2023 23:02

renovate bot force-pushed the renovate/python-dependencies branch 3 times, most recently from 00fd80c to 3a6f806 Compare November 9, 2023 00:43

renovate bot force-pushed the renovate/python-dependencies branch 3 times, most recently from fcb274b to 46eb779 Compare November 16, 2023 15:24

Update Python dependencies

2322c0c

renovate bot force-pushed the renovate/python-dependencies branch from 46eb779 to 2322c0c Compare November 16, 2023 18:41

dragomirp approved these changes Nov 17, 2023

View reviewed changes

dragomirp merged commit a80dfd8 into main Nov 17, 2023
20 checks passed

dragomirp deleted the renovate/python-dependencies branch November 17, 2023 11:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Python dependencies #158

Update Python dependencies #158

renovate bot commented Oct 19, 2023 •

edited

Loading

Update Python dependencies #158

Update Python dependencies #158

Conversation

renovate bot commented Oct 19, 2023 • edited Loading

Release Notes

Highlights

Stable style

Preview style

Configuration

Performance

Integrations

Highlights

Preview style

Packaging

Integrations

Documentation

Stable style

Preview style

Configuration

Parser

Output

Integrations

Fixed

What's Changed

Fixed

Added

Changed

Fixed

Vendoring

v7.4.3: pytest 7.4.3 (2023-10-24)

Bug Fixes

What's Changed

New Contributors

New Contributors

Preview features

Formatter

CLI

Configuration

Bug fixes

Documentation

Preview features

Formatter

CLI

Bug fixes

Internals

Formatter

Linter

Documentation

Preview features

Rule changes

Formatter

CLI

Configuration

Bug fixes

Documentation

Rule changes

Configuration

Preview features

Formatter

Bug fixes

Documentation

Breaking changes

Rule changes

Preview features

Configuration

CLI

Bug fixes

Documentation

Configuration

renovate bot commented Oct 19, 2023 •

edited

Loading

`v7.4.3`: pytest 7.4.3 (2023-10-24)