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.

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

Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies #46383

Merged
merged 5 commits into from
Nov 26, 2023

Conversation

ar-jan
Copy link
Contributor

@ar-jan ar-jan commented Oct 2, 2023

Testing the changes

  • I tested the changes in this PR: briefly

New package

  • This new package conforms to the package requirements: YES

    New package: python3-aiosignal-1.3.1: needed for python3-aiohttp v3.8+
    New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
    python3-aiohttp: update to 3.9.0: needed for passing python3-aiohttp_socks tests; 3.9.0 needed for Python 3.12 compatibility
    python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8

    Removed these packages added only for satisfying tests from the PR:
    python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
    python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
    python3-proxy.py-2.4.3: needed for python3-aiohttp tests
    python3-re_assert-1.1.0: needed for python3-aiohttp tests

@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?

@ar-jan ar-jan force-pushed the aiohttp-socks083 branch 2 times, most recently from 0925822 to 0206a11 Compare October 2, 2023 13:57
@ar-jan
Copy link
Contributor Author

ar-jan commented Oct 2, 2023

Hmm, all tests pass locally. Some missing dependency for CI?

@ar-jan ar-jan force-pushed the aiohttp-socks083 branch 6 times, most recently from 42c6f8f to 80a5244 Compare October 3, 2023 16:21
@ahesford
Copy link
Member

I suggest dropping all of the new packages added just to support checks. If those checks requiring these packages can be skipped, great; otherwise, just skip all of the checks.

@ar-jan
Copy link
Contributor Author

ar-jan commented Oct 16, 2023

OK, I've removed these new dependencies:

New package: python3-httpx-socks-0.7.8
New package: python3-tiny-proxy-0.2.0
New package: python3-re_assert-1.1.0
New package: python3-proxy.py-2.4.3

But python3-aiosignal is required for python3-aiohttp, and depends on python3-frozenlist (not just for tests). Previously tests were passing, now I get this for python3-aiosignal:

$ ./xbps-src pkg -Q python3-aiosignal
...
=> python3-aiosignal-1.3.1_1: building with [python3-module] [python3] for x86_64...
...
[check] python3-frozenlist-1.4.0_1: found (/host/binpkgs/aiohttp-socks084-fewer-deps)
[runtime] python3-frozenlist-1.4.0_1: found (/host/binpkgs/aiohttp-socks084-fewer-deps)
...
==================================== ERRORS ====================================
____________________ ERROR collecting tests/test_signals.py ____________________
ImportError while importing test module '/builddir/python3-aiosignal-1.3.1/tests/test_signals.py'.
Hint: make sure your test modules/packages have valid Python names.
Traceback:
/usr/lib/python3.12/importlib/__init__.py:90: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
tests/test_signals.py:6: in <module>
    from aiosignal import Signal
aiosignal/__init__.py:1: in <module>
    from frozenlist import FrozenList
E   ModuleNotFoundError: No module named 'frozenlist'

Could this have anything to do with the move to Python 3.12?

@ar-jan ar-jan changed the title python3-aiohttp_socks: update to 0.8.3 and add required dependencies python3-aiohttp_socks: update to 0.8.4 and add required dependencies Oct 16, 2023
@ar-jan
Copy link
Contributor Author

ar-jan commented Nov 13, 2023

I bumped python3-aiohttp to prerelease 3.9.0b1 for compatibility with Python 3.12. Version 3.8.6 or earlier do not compile.

I don't know why frozenlist module cannot be imported in the tests for python3-aiosignal (I believe these tests ran successfully before Python 3.12, not sure), but used make_check=no.

srcpkgs/python3-aiohttp/template Show resolved Hide resolved
srcpkgs/python3-aiosignal/template Outdated Show resolved Hide resolved
@ar-jan
Copy link
Contributor Author

ar-jan commented Nov 13, 2023

Updated. After nuking my masterdir and hostdir, tests using frozenlist worked again. No idea how that got messed up.

@ar-jan ar-jan requested a review from ahesford November 13, 2023 17:37
Copy link
Member

@ahesford ahesford left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems fine to me, notwithstanding my objection to the very existence of the frozenlist Python package.

@ar-jan
Copy link
Contributor Author

ar-jan commented Nov 15, 2023

aiohttp-3.9.0rc0 was just released, I'll bump it.

@ar-jan ar-jan force-pushed the aiohttp-socks083 branch 2 times, most recently from 49726eb to 4208ff2 Compare November 15, 2023 21:32
@ar-jan ar-jan changed the title python3-aiohttp_socks: update to 0.8.4 and add required dependencies Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies Nov 17, 2023
Version 3.9 is required for Python 3.12
Requires python3-async-timeout>=4
Depends on python3-aiosignal
Disable tests which now depend on proxy.py and re_assert
Use GitHub for distfiles since PyPI package does not include tests
@ar-jan
Copy link
Contributor Author

ar-jan commented Nov 26, 2023

Updated to aiohttp-3.9.1.

@ahesford ahesford merged commit 7a2ec4d into void-linux:master Nov 26, 2023
8 checks passed
@ar-jan ar-jan deleted the aiohttp-socks083 branch September 24, 2024 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants