commit:     01245d7149703c4cfd84c7acf0baab83cafe38fc
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 02:25:16 2023 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 19:05:03 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=01245d71

CI: Upgrade pypy from 3.9 to 3.10

This solves an error I'm seeing just in
portage.utf8_mode CI runs for pypy-3.9:

/home/runner/work/portage/portage/lib/portage/tests/emerge/test_config_protect.py:294:
 AssertionError
----------------------------- Captured stderr call -----------------------------
Traceback (most recent call last):
  File "/home/runner/work/portage/portage/bin/emerge", line 59, in <module>
    retval = emerge_main()
  File "/home/runner/work/portage/portage/lib/_emerge/main.py", line 1265, in 
emerge_main
    emerge_config = load_emerge_config(action=myaction, args=myfiles, 
opts=myopts)
  File "/home/runner/work/portage/portage/lib/portage/proxy/objectproxy.py", 
line 31, in __call__
    return result(*args, **kwargs)
  File "/home/runner/work/portage/portage/lib/_emerge/actions.py", line 2914, 
in load_emerge_config
    setconfig = load_default_config(settings, root_trees)
  File "/home/runner/work/portage/portage/lib/portage/_sets/__init__.py", line 
382, in load_default_config
    return SetConfig(_getfiles(), settings, trees)
  File "/home/runner/work/portage/portage/lib/portage/_sets/__init__.py", line 
63, in __init__
    read_configs(self._parser, paths)
  File "/home/runner/work/portage/portage/lib/portage/util/configparser.py", 
line 49, in read_configs
    for p in paths:
  File "/home/runner/work/portage/portage/lib/portage/_sets/__init__.py", line 
377, in _getfiles
    if not f.startswith(dot) and not f.endswith(tilde):
TypeError: startswith first arg must be str or a tuple of str, not bytes

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc7ab93a2b..d2abc31cd0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
           - '3.10'
           - '3.11'
           - '3.12-dev'
-          - 'pypy-3.9'
+          - 'pypy-3.10'
       fail-fast: false
     steps:
       - uses: actions/checkout@v3

Reply via email to