Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Py3.11 Support [Take 2] #64458

Merged
merged 13 commits into from
Jun 19, 2023
Merged

[master] Py3.11 Support [Take 2] #64458

merged 13 commits into from
Jun 19, 2023

Commits on Jun 17, 2023

  1. Don't hide output 

    Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    8e15911 View commit details
    Browse the repository at this point in the history

  2. Switch to FullArgSpec since Py 3.11 no longer has ArgSpec, deprec… 

    …ated since Py 3.0

Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    d92b542 View commit details
    Browse the repository at this point in the history

  3. Stop using the deprecated cgi module. 

    Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    60b3648 View commit details
    Browse the repository at this point in the history

  4. Stop using the deprecated pipes module 

    Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    eee0eca View commit details
    Browse the repository at this point in the history

  5. Add __getstate__ to blacklisted methods, present in Py 3.11 

    Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    2688c86 View commit details
    Browse the repository at this point in the history

  6. Backport locale.getdefaultlocale() into Salt. It's getting removed … 

    …in Py 3.13

Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    991f7cf View commit details
    Browse the repository at this point in the history

  7. Stop using the deprecated imp module 

    Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    f0baa08 View commit details
    Browse the repository at this point in the history

  8. Switch onedir to Py3.11 

    Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    d60036f View commit details
    Browse the repository at this point in the history

  9. Use proper keys since Python's base64 in Py3.11 is more picky 

    ```
❯ artifacts/salt/bin/python3
Python 3.10.11 (main, May  5 2023, 02:31:54) [GCC 11.2.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import base64
>>> base64.b64decode("AAAAB3NzaC1kcQ9J5bYTEyZ==", validate=True)
b'\x00\x00\x00\x07ssh-dq\x0fI\xe5\xb6\x13\x13&'
```
```
$ artifacts/salt/bin/python3
Python 3.11.3 (main, May  5 2023, 02:31:40) [GCC 11.2.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import base64
>>> base64.b64decode("AAAAB3NzaC1kcQ9J5bYTEyZ==", validate=True)
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/tmp/testing/artifacts/salt/lib/python3.11/base64.py", line 88, in b64decode
    return binascii.a2b_base64(s, strict_mode=validate)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
binascii.Error: Excess data after padding
```

Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    a1873a1 View commit details
    Browse the repository at this point in the history

  10. Generate 3.11 requirements for the package tests 

    Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    535e7be View commit details
    Browse the repository at this point in the history

  11. Added changelog entry and updated release notes 

    Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    3601a40 View commit details
    Browse the repository at this point in the history

  12. Don't hardcode the python version in the test. 

    Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    1a59d74 View commit details
    Browse the repository at this point in the history

  13. Don't hardcode the python version on pkg/debian/salt-cloud.postinst 

    Signed-off-by: Pedro Algarvio <[email protected]>
    @s0undt3ch
    s0undt3ch committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    e755847 View commit details
    Browse the repository at this point in the history