warehouse icon indicating copy to clipboard operation
warehouse copied to clipboard

Published 20 hours ago • verified publisher icon pypi

PEP 694 (resolved merge conflicts from PR #8941)

Open warsaw opened this issue 1 year ago • 1 comments

Resolves all merge conflicts that have crept in from #8941 since the last commit to that branch.

This commit does not attempt to resolve any comments on the original PR, nor have I even run the tests on this branch yet. No promises that I haven't botched the merge conflict resolutions either.

warsaw avatar Jul 13 '24 00:07 warsaw 

Results (887.91s (0:14:47)):
    2242 passed
       2 failed
         - tests/unit/test_routes.py:19 test_routes[None]
         - tests/unit/test_routes.py:19 test_routes[pypi.io]
    1815 error

warsaw avatar Jul 13 '24 01:07 warsaw