Re: [gentoo-portage-dev] [PATCH] Mark EAPIs "4-python" and "5-progress" as deprecated
On 3/4/21 11:35 AM, Matt Turner wrote: > Signed-off-by: Matt Turner > --- > I've asked Arfrever multiple times if these are still used anywhere, and > he seemingly has not responded intentionally. > > According to https://bugs.gentoo.org/174536#c27 these EAPIs were only > used in Arfrever's personal overlay, and even in 2012 there were > questions about why they were supported in portage. > > The "Progress Overlay" does contain ebuilds using these EAPIs but it has > not been updated since 2018 and doesn't look like it is useful at this > point. > > lib/portage/__init__.py | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py > index 24c9d8b89..184db6ae2 100644 > --- a/lib/portage/__init__.py > +++ b/lib/portage/__init__.py > @@ -465,16 +465,16 @@ def abssymlink(symlink, target=None): > _doebuild_manifest_exempt_depend = 0 > > _testing_eapis = frozenset([ > - "4-python", > - "5-progress", > ]) > _deprecated_eapis = frozenset([ > + "3_pre1", > + "3_pre2", > "4_pre1", > + "4-python", > "4-slot-abi", > - "3_pre2", > - "3_pre1", > "5_pre1", > "5_pre2", > + "5-progress", > "6_pre1", > "7_pre1", > ]) > Merged, thanks! https://gitweb.gentoo.org/proj/portage.git/commit/?id=67cf9c2b05042de37f36f5b6840c450128a065bd -- Thanks, Zac signature.asc Description: OpenPGP digital signature
Re: [gentoo-portage-dev] [PATCH] Use asyncio.subprocess.Process directly
On 3/4/21 11:24 AM, Matt Turner wrote:
> With no need to support Python 2, we can remove our private
> implementation.
>
> Signed-off-by: Matt Turner
> ---
> I don't know how to test this. I intentionally broke the return value of
> create_subprocess_exec and didn't see any bad results.
>
> lib/portage/util/futures/_asyncio/__init__.py | 8 +-
> lib/portage/util/futures/_asyncio/process.py | 116 --
> 2 files changed, 4 insertions(+), 120 deletions(-)
> delete mode 100644 lib/portage/util/futures/_asyncio/process.py
Merged, thanks!
https://gitweb.gentoo.org/proj/portage.git/commit/?id=1e843f853a9afe82d599e6ab09064147ddc1d271
> diff --git a/lib/portage/util/futures/_asyncio/__init__.py
> b/lib/portage/util/futures/_asyncio/__init__.py
> index 5590963f1..207e7205d 100644
> --- a/lib/portage/util/futures/_asyncio/__init__.py
> +++ b/lib/portage/util/futures/_asyncio/__init__.py
> @@ -25,6 +25,7 @@ import types
> import weakref
>
> import asyncio as _real_asyncio
> +from asyncio.subprocess import Process
>
> try:
> import threading
> @@ -138,7 +138,7 @@ def create_subprocess_exec(*args, **kwargs):
>
> result = loop.create_future()
>
> - result.set_result(_Process(subprocess.Popen(
> + result.set_result(Process(subprocess.Popen(
> args,
> stdin=kwargs.pop('stdin', None),
> stdout=kwargs.pop('stdout', None),
The above area is actually no longer used, since we should always have a
_AsyncioEventLoop instance here, and we can remove the EventLoop class now.
--
Thanks,
Zac
signature.asc
Description: OpenPGP digital signature
Re: [gentoo-portage-dev] [PATCH 3/3] lib: Remove outdated Python 2 comments
On 3/4/21 11:23 AM, Matt Turner wrote:
> Fixes: 788c0e8bb ("Remove from __future__ import unicode_literals")
> Signed-off-by: Matt Turner
> ---
> bin/egencache | 2 --
> lib/_emerge/Package.py | 9 -
> lib/_emerge/Scheduler.py| 2 --
> lib/_emerge/UseFlagDisplay.py | 2 --
> lib/_emerge/resolver/output.py | 2 --
> lib/portage/cache/flat_hash.py | 3 ---
> lib/portage/tests/unicode/test_string_format.py | 9 -
> lib/portage/util/digraph.py | 3 ---
> 8 files changed, 32 deletions(-)
Series looks good. Merged. Thanks!
https://gitweb.gentoo.org/proj/portage.git/commit/?id=9003c5201c6503ddad9237bcffbc6f775567661b
https://gitweb.gentoo.org/proj/portage.git/commit/?id=af100c65ebf7fd84307a84819602a934ebb0741c
https://gitweb.gentoo.org/proj/portage.git/commit/?id=21c6c0c1088ded78397594bfd78102361f8d837b
--
Thanks,
Zac
signature.asc
Description: OpenPGP digital signature
