Patchwork [STABLE] inno: bump keyring to 18.0.1 to avoid AttributeError (issue6043)

login
register
mail settings
Submitter Matt Harbison
Date April 27, 2019, 4:08 a.m.
Message ID <723ed44028963db5a657.1556338080@Envy>
Download mbox | patch
Permalink /patch/39839/
State Accepted
Headers show

Comments

Matt Harbison - April 27, 2019, 4:08 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1556337169 14400
#      Fri Apr 26 23:52:49 2019 -0400
# Branch stable
# Node ID 723ed44028963db5a657578ac358acd07e546daa
# Parent  14589f1989e91a455597cee754ae8587f3725394
inno: bump keyring to 18.0.1 to avoid AttributeError (issue6043)

The error seems to be harmless, because it happens after closing the connection.
For whatever reason, this isn't bundled with the Wix installer.

https://github.com/jaraco/keyring/issues/386
https://bitbucket.org/Mekk/mercurial_keyring/issues/63/attributeerror-during-process-finish-with
Gregory Szorc - April 27, 2019, 4:25 a.m.
On Fri, Apr 26, 2019 at 9:10 PM Matt Harbison <mharbison72@gmail.com> wrote:

> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1556337169 14400
> #      Fri Apr 26 23:52:49 2019 -0400
> # Branch stable
> # Node ID 723ed44028963db5a657578ac358acd07e546daa
> # Parent  14589f1989e91a455597cee754ae8587f3725394
> inno: bump keyring to 18.0.1 to avoid AttributeError (issue6043)
>

Queued for stable, thanks.

The Windows packaging code copied what was being done in the wild by
current package maintainers, hence why keyring is present in the Inno
installer but not WiX. We should definitely talk about consolidating
behavior. To what I'm not sure: I'm not sure why various dependencies are
included...


>
> The error seems to be harmless, because it happens after closing the
> connection.
> For whatever reason, this isn't bundled with the Wix installer.
>
> https://github.com/jaraco/keyring/issues/386
>
> https://bitbucket.org/Mekk/mercurial_keyring/issues/63/attributeerror-during-process-finish-with
>
> diff --git a/contrib/packaging/inno/requirements.txt
> b/contrib/packaging/inno/requirements.txt
> --- a/contrib/packaging/inno/requirements.txt
> +++ b/contrib/packaging/inno/requirements.txt
> @@ -22,9 +22,9 @@ entrypoints==0.3 \
>
>  --hash=sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19
> \
>
>  --hash=sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451
> \
>      # via keyring
> -keyring==18.0.0 \
> -
> --hash=sha256:12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d
> \
> -
> --hash=sha256:ca33f5ccc542b9ffaa196ee9a33488069e5e7eac77d5b81969f8a3ce74d0230c
> +keyring==18.0.1 \
> +
> --hash=sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838
> \
> +
> --hash=sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6
>  pygments==2.3.1 \
>
>  --hash=sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a
> \
>
>  --hash=sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
Matt Harbison - April 27, 2019, 4:45 a.m.
On Sat, 27 Apr 2019 00:25:45 -0400, Gregory Szorc  
<gregory.szorc@gmail.com> wrote:

> On Fri, Apr 26, 2019 at 9:10 PM Matt Harbison <mharbison72@gmail.com>  
> wrote:
>
>> # HG changeset patch
>> # User Matt Harbison <matt_harbison@yahoo.com>
>> # Date 1556337169 14400
>> #      Fri Apr 26 23:52:49 2019 -0400
>> # Branch stable
>> # Node ID 723ed44028963db5a657578ac358acd07e546daa
>> # Parent  14589f1989e91a455597cee754ae8587f3725394
>> inno: bump keyring to 18.0.1 to avoid AttributeError (issue6043)
>>
>
> Queued for stable, thanks.
>
> The Windows packaging code copied what was being done in the wild by
> current package maintainers, hence why keyring is present in the Inno
> installer but not WiX. We should definitely talk about consolidating
> behavior. To what I'm not sure: I'm not sure why various dependencies are
> included...

I know I asked the Weeds2000 (who builds the macOS installer for  
TortoiseHg) to include this so that mercurial_keyring would work with  
`--config extensions.mercurial_keyring=/path/to/repo` type setups.  (He  
went one further and bundled the extension too.)

It seems that if it isn't installed into the bundled python, it isn't  
available to mercurial_keyring at all.  I assume that's what's going on  
here.  I haven't used the WiX installer in an environment where I need  
keyring, so IDK if it's broke.  I use the thg installer than bundles it  
and the extension at work.

(As an aside, I kinda wish we would bundle the extension with the  
installer, or even vendor it in hgext3rd.  But it sounds like maintaining  
it is a bit of a pain.)

Patch

diff --git a/contrib/packaging/inno/requirements.txt b/contrib/packaging/inno/requirements.txt
--- a/contrib/packaging/inno/requirements.txt
+++ b/contrib/packaging/inno/requirements.txt
@@ -22,9 +22,9 @@  entrypoints==0.3 \
     --hash=sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19 \
     --hash=sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451 \
     # via keyring
-keyring==18.0.0 \
-    --hash=sha256:12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d \
-    --hash=sha256:ca33f5ccc542b9ffaa196ee9a33488069e5e7eac77d5b81969f8a3ce74d0230c
+keyring==18.0.1 \
+    --hash=sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838 \
+    --hash=sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6
 pygments==2.3.1 \
     --hash=sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a \
     --hash=sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d