Skip to content

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Jul 16, 2025

Forward-Port-Of: #219270

@robodoo
Copy link
Contributor

robodoo commented Jul 16, 2025

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Jul 16, 2025

@xmo-odoo cherrypicking of pull request #219270 failed.

stdout:

Auto-merging odoo/addons/test_http/tests/test_misc.py
Auto-merging odoo/http.py
CONFLICT (content): Merge conflict in odoo/http.py

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Jul 16, 2025
xmo-odoo added 6 commits July 17, 2025 07:48
`importlib.metadata.version` was made final (non-provisional) in
Python 3.10 which is the minver for odoo 18 so no need for a
conditional.
When 3.11 added PEP 657 fine-grained error locations, squiggles were
already possible[^1] but apparently we missed that in the cleanup
regex because those didn't show up in the messages we cared about.

With Python 3.13's improvements (sic...)[^2] this is not the case
anymore, and the tracebacks from testing the test suite do get a bunch
of squiggles which we need to learn to clean.

[^1]: https://docs.python.org/3/whatsnew/3.11.html#whatsnew311-pep657
[^2]: https://docs.python.org/3/whatsnew/3.13.html#improved-error-messages
Some libraries need to be bumped to be compatible with Python 3.13 (as
used in Trixie). In that case we update the requirements to the Trixie
version if possible, even if a lower version would be compatible with
3.13 itself.

- babel needs to be at least [2.11 to avoid usage of cgi][2] removed
  from 3.13
- freezegun needs to be [at least 1.5.0][3] to not call the
  now-removed `uuid._load_system_functions()`
- trixie ships gevent 24.11.1 and greenlet 3.1.0, but upstream [gevent
  24.11.1 requires greenlet 3.1.1][1] so basing the requirements off
  of trixie doesn't even install
- zeep needs to be [at least 4.3.0][4] to not use the `cgi` module

[1]: https://github.com/gevent/gevent/blob/24.11.1/setup.py#L200-L214
[2]: https://babel.pocoo.org/en/latest/changelog.html#version-2-11-0
[3]: spulec/freezegun#534
[4]: mvantellingen/python-zeep#1364
python/cpython#131568

Adapt the regex to handle both < 3.13 and >= 3.13 for this specific
test case.
Need to accept and forward size parameters in `addBlankPage`, used
by a test for some reason.
@xmo-odoo xmo-odoo force-pushed the 18.0-17.0-trixie-compat-xmo-450646-fw branch from 37b60ef to dbd39ee Compare July 17, 2025 06:01
@C3POdoo C3POdoo requested review from a team, Gorash, Julien00859 and ryv-odoo and removed request for a team July 17, 2025 06:03
@xmo-odoo
Copy link
Collaborator

@robodoo r+

@robodoo
Copy link
Contributor

robodoo commented Jul 17, 2025

@xmo-odoo you may want to rebuild or fix this PR as it has failed CI.

robodoo pushed a commit that referenced this pull request Jul 17, 2025
robodoo pushed a commit that referenced this pull request Jul 17, 2025
`importlib.metadata.version` was made final (non-provisional) in
Python 3.10 which is the minver for odoo 18 so no need for a
conditional.

Part-of: #219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
robodoo pushed a commit that referenced this pull request Jul 17, 2025
When 3.11 added PEP 657 fine-grained error locations, squiggles were
already possible[^1] but apparently we missed that in the cleanup
regex because those didn't show up in the messages we cared about.

With Python 3.13's improvements (sic...)[^2] this is not the case
anymore, and the tracebacks from testing the test suite do get a bunch
of squiggles which we need to learn to clean.

[^1]: https://docs.python.org/3/whatsnew/3.11.html#whatsnew311-pep657
[^2]: https://docs.python.org/3/whatsnew/3.13.html#improved-error-messages

Part-of: #219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
robodoo pushed a commit that referenced this pull request Jul 17, 2025
Some libraries need to be bumped to be compatible with Python 3.13 (as
used in Trixie). In that case we update the requirements to the Trixie
version if possible, even if a lower version would be compatible with
3.13 itself.

- babel needs to be at least [2.11 to avoid usage of cgi][2] removed
  from 3.13
- freezegun needs to be [at least 1.5.0][3] to not call the
  now-removed `uuid._load_system_functions()`
- trixie ships gevent 24.11.1 and greenlet 3.1.0, but upstream [gevent
  24.11.1 requires greenlet 3.1.1][1] so basing the requirements off
  of trixie doesn't even install
- zeep needs to be [at least 4.3.0][4] to not use the `cgi` module

[1]: https://github.com/gevent/gevent/blob/24.11.1/setup.py#L200-L214
[2]: https://babel.pocoo.org/en/latest/changelog.html#version-2-11-0
[3]: spulec/freezegun#534
[4]: mvantellingen/python-zeep#1364

Part-of: #219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
robodoo pushed a commit that referenced this pull request Jul 17, 2025
python/cpython#131568

Adapt the regex to handle both < 3.13 and >= 3.13 for this specific
test case.

Part-of: #219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
robodoo pushed a commit that referenced this pull request Jul 17, 2025
Need to accept and forward size parameters in `addBlankPage`, used
by a test for some reason.

Part-of: #219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
@robodoo robodoo closed this in 2e3ee77 Jul 17, 2025
robodoo added a commit that referenced this pull request Jul 23, 2025
closes #219478

Forward-port-of: #219300
Forward-port-of: #219270
Related: odoo/enterprise#90447
Signed-off-by: Xavier Morel (xmo) <[email protected]>
@fw-bot fw-bot deleted the 18.0-17.0-trixie-compat-xmo-450646-fw branch July 24, 2025 15:43
yodalberth pushed a commit to yodalberth/ERP_EMPRESAS that referenced this pull request Jul 26, 2025
Part-of: odoo#219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
yodalberth pushed a commit to yodalberth/ERP_EMPRESAS that referenced this pull request Jul 26, 2025
`importlib.metadata.version` was made final (non-provisional) in
Python 3.10 which is the minver for odoo 18 so no need for a
conditional.

Part-of: odoo#219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
yodalberth pushed a commit to yodalberth/ERP_EMPRESAS that referenced this pull request Jul 26, 2025
When 3.11 added PEP 657 fine-grained error locations, squiggles were
already possible[^1] but apparently we missed that in the cleanup
regex because those didn't show up in the messages we cared about.

With Python 3.13's improvements (sic...)[^2] this is not the case
anymore, and the tracebacks from testing the test suite do get a bunch
of squiggles which we need to learn to clean.

[^1]: https://docs.python.org/3/whatsnew/3.11.html#whatsnew311-pep657
[^2]: https://docs.python.org/3/whatsnew/3.13.html#improved-error-messages

Part-of: odoo#219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
yodalberth pushed a commit to yodalberth/ERP_EMPRESAS that referenced this pull request Jul 26, 2025
Some libraries need to be bumped to be compatible with Python 3.13 (as
used in Trixie). In that case we update the requirements to the Trixie
version if possible, even if a lower version would be compatible with
3.13 itself.

- babel needs to be at least [2.11 to avoid usage of cgi][2] removed
  from 3.13
- freezegun needs to be [at least 1.5.0][3] to not call the
  now-removed `uuid._load_system_functions()`
- trixie ships gevent 24.11.1 and greenlet 3.1.0, but upstream [gevent
  24.11.1 requires greenlet 3.1.1][1] so basing the requirements off
  of trixie doesn't even install
- zeep needs to be [at least 4.3.0][4] to not use the `cgi` module

[1]: https://github.com/gevent/gevent/blob/24.11.1/setup.py#L200-L214
[2]: https://babel.pocoo.org/en/latest/changelog.html#version-2-11-0
[3]: spulec/freezegun#534
[4]: mvantellingen/python-zeep#1364

Part-of: odoo#219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
yodalberth pushed a commit to yodalberth/ERP_EMPRESAS that referenced this pull request Jul 26, 2025
python/cpython#131568

Adapt the regex to handle both < 3.13 and >= 3.13 for this specific
test case.

Part-of: odoo#219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
yodalberth pushed a commit to yodalberth/ERP_EMPRESAS that referenced this pull request Jul 26, 2025
Need to accept and forward size parameters in `addBlankPage`, used
by a test for some reason.

Part-of: odoo#219300
Related: odoo/enterprise#90362
Signed-off-by: Xavier Morel (xmo) <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants