[PATCH] packaging: revert `six` to 1.15.0

[Matt Harbison]

# HG changeset patch
# User Matt Harbison <matt_h...@yahoo.com>
# Date 1691719508 14400
# Thu Aug 10 22:05:08 2023 -0400
# Branch stable
# Node ID f516e98a01054768689ca5702940d867e6f75d47
# Parent cf1a7fdb4c412eab73df4cda631d8a0c8d355b36
packaging: revert `six` to 1.15.0

This partially backs out e686a069e141, because demandimport breaks the keyring
stuff if 1.16.0 is installed on Rocky 8.5 with the default py3.6.8. (There's a
message that roughly says the backend isn't working, "cannot import name
'range'",and it always falls back to the password prompt.)

I have no idea why, but confirmed it is not an issue if `HGDEMANDIMPORT=disable`
or if six==1.15.0 is installed, and that it breaks the vanilla Mercurial setup
if six==1.16.0 is installed in the user-site.

I left Windows at 1.16.0 because we haven't seen any issues there.

diff --git a/contrib/packaging/venv_py3/requirements-rhel.txt b/contrib/packaging/venv_py3/requirements-rhel.txt
--- a/contrib/packaging/venv_py3/requirements-rhel.txt
+++ b/contrib/packaging/venv_py3/requirements-rhel.txt
@@ -137,7 +137,7 @@
# via
# -r contrib/packaging/venv_py3/requirements-centos7.txt.in
# -r contrib/packaging/venv_py3/requirements.txt.in
-six==1.16.0 \
- --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
- --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
+six==1.15.0 \
+ --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
+ --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced
# via iniparse
diff --git a/contrib/packaging/venv_py3/requirements.txt b/contrib/packaging/venv_py3/requirements.txt
--- a/contrib/packaging/venv_py3/requirements.txt
+++ b/contrib/packaging/venv_py3/requirements.txt
@@ -146,7 +146,7 @@
--hash=sha256:d4eef7ee8e5e24403b5d362c13e43407b8d8719a79d3b2881d20810fe81373e6 \
--hash=sha256:f7f8df8f201d359657c4d6b72698d7b2e0b65b6a899311261770ff38ccd43eac
# via -r contrib/packaging/venv_py3/requirements.txt.in
-six==1.16.0 \
- --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
- --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
+six==1.15.0 \
+ --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
+ --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced
# via iniparse

[Yuya Nishihara]

On Thu, 10 Aug 2023 22:05:53 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_h...@yahoo.com>
> # Date 1691719508 14400
> # Thu Aug 10 22:05:08 2023 -0400
> # Branch stable
> # Node ID f516e98a01054768689ca5702940d867e6f75d47
> # Parent cf1a7fdb4c412eab73df4cda631d8a0c8d355b36
> packaging: revert `six` to 1.15.0

Queued for stable, thanks.

[Matt Harbison]

I guess we might as well do a release, because hg is up to 6.5.1 now.  The hg-git extension hasn't been updated for 6.5 yet, but IDK when that will happen.

[Yuya Nishihara]

On Thu, 10 Aug 2023 21:53:48 -0700 (PDT), 'Matt Harbison' via TortoiseHg Developers wrote:
> I guess we might as well do a release, because hg is up to 6.5.1 now. The
> hg-git extension hasn't been updated for 6.5 yet, but IDK when that will
> happen.

Tagged 6.5.1, thanks.