This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12400

pytype: drop py3.6 support
ClosedPublic

Authored by mharbison72 on Mar 24 2022, 11:36 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG455dce344c56: pytype: drop py3.6 support
Summary

Pytype 2022.01.07 only supports 3.7+.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Mar 24 2022, 11:36 AM
mharbison72 added a comment.Mar 24 2022, 11:37 PM

I guess this stack can go on stable. There are a few other things that get flagged that I worked around for now by disabling the modules (hgweb/__init__.py, subrepo.py, and url.py), and it would be nice to just upgrade the CI image to one thing that makes both branches happy.

Alphare added a subscriber: Alphare.Mar 25 2022, 5:36 AM
In D12400#189836, @mharbison72 wrote:

it would be nice to just upgrade the CI image to one thing that makes both branches happy.

Is there something to be done in the CI images? We're about to change them anyway due to D12368 needing a new version of black.

mharbison72 added a comment.Mar 25 2022, 11:10 AM
In D12400#189918, @Alphare wrote:
In D12400#189836, @mharbison72 wrote:

it would be nice to just upgrade the CI image to one thing that makes both branches happy.

Is there something to be done in the CI images? We're about to change them anyway due to D12368 needing a new version of black.

Updating to a new version of pytype would be a good idea then. I think what's there is ~a year old. Before doing that, we'll either need to apply this patch or fix the underlying issues:

diff --git a/tests/test-check-pytype.t b/tests/test-check-pytype.t
--- a/tests/test-check-pytype.t
+++ b/tests/test-check-pytype.t
@@ -45,6 +45,7 @@ development, but may be a hinderance for
   >    -x mercurial/debugcommands.py \
   >    -x mercurial/dispatch.py \
   >    -x mercurial/exchange.py \
+  >    -x mercurial/hgweb/__init__.py \
   >    -x mercurial/hgweb/hgweb_mod.py \
   >    -x mercurial/hgweb/server.py \
   >    -x mercurial/hgweb/wsgicgi.py \
@@ -57,10 +58,12 @@ development, but may be a hinderance for
   >    -x mercurial/pure/osutil.py \
   >    -x mercurial/pure/parsers.py \
   >    -x mercurial/repoview.py \
+  >    -x mercurial/subrepo.py \
   >    -x mercurial/testing/storage.py \
   >    -x mercurial/thirdparty \
   >    -x mercurial/ui.py \
   >    -x mercurial/unionrepo.py \
+  >    -x mercurial/url.py \
   >    -x mercurial/win32.py \
   >    -x mercurial/wireprotoframing.py \
   >    -x mercurial/wireprotov1peer.py \

The url module may have some real issues, but the other two almost look like internal errors:

+  /usr/bin/python3.8 -m pytype.single --imports_info /mnt/c/Users/Matt/hg/.pytype/imports/mercurial.hgweb.__init__.imports --module-name mercurial.hgweb.__init__ -V 3.7 -o /mnt/c/Users/Matt/hg/.pytype/pyi/mercurial/hgweb/__init__.pyi --analyze-annotated --nofail --quick /mnt/c/Users/Matt/hg/mercurial/hgweb/__init__.py
+  File "/mnt/c/Users/Matt/hg/mercurial/hgweb/__init__.py", line 21, in <module>: Couldn't import pyi for 'mercurial.hgweb.hgweb_mod' [pyi-error]
+    No request in module mercurial.hgweb, referenced from 'mercurial.hgweb.hgweb_mod'
+  File "/mnt/c/Users/Matt/hg/mercurial/hgweb/__init__.py", line 21, in <module>: Couldn't import pyi for 'mercurial.hgweb.hgwebdir_mod' [pyi-error]
+    No request in module mercurial.hgweb, referenced from 'mercurial.hgweb.hgwebdir_mod'

+  /usr/bin/python3.8 -m pytype.single --imports_info /mnt/c/Users/Matt/hg/.pytype/imports/mercurial.subrepo.imports --module-name mercurial.subrepo -V 3.7 -o /mnt/c/Users/Matt/hg/.pytype/pyi/mercurial/subrepo.pyi --analyze-annotated --nofail --quick /mnt/c/Users/Matt/hg/mercurial/subrepo.py
+  File "/mnt/c/Users/Matt/hg/mercurial/subrepo.py", line 1153, in _wcrevs: Couldn't import pyi for 'xml.dom.minidom' [pyi-error]
+    No Node.TEXT_NODE in module xml.dom.minidom, referenced from 'xml.dom.expatbuilder'
+  File "/mnt/c/Users/Matt/hg/mercurial/subrepo.py", line 1177, in _wcchanged: Couldn't import pyi for 'xml.dom.minidom' [pyi-error]
+    No Node.TEXT_NODE in module xml.dom.minidom, referenced from 'xml.dom.expatbuilder'
+  File "/mnt/c/Users/Matt/hg/mercurial/subrepo.py", line 1322, in files: Couldn't import pyi for 'xml.dom.minidom' [pyi-error]
+    No Node.TEXT_NODE in module xml.dom.minidom, referenced from 'xml.dom.expatbuilder'
Alphare accepted this revision.Apr 6 2022, 5:46 AM
This revision is now accepted and ready to land.Apr 6 2022, 5:46 AM
mharbison72 added a commit: rHG455dce344c56: pytype: drop py3.6 support.Apr 6 2022, 6:10 AM
Closed by commit rHG455dce344c56: pytype: drop py3.6 support (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-check-pytype.t (4 lines)

Diff 32802

tests/test-check-pytype.t

mercurial/manifest.py # [unsupported-operands], [wrong-arg-types] mercurial/manifest.py # [unsupported-operands], [wrong-arg-types]
mercurial/minirst.py # [unsupported-operands], [attribute-error] mercurial/minirst.py # [unsupported-operands], [attribute-error]
mercurial/pure/osutil.py # [invalid-typevar], [not-callable] mercurial/pure/osutil.py # [invalid-typevar], [not-callable]
mercurial/pure/parsers.py # [attribute-error] mercurial/pure/parsers.py # [attribute-error]
mercurial/repoview.py # [attribute-error] mercurial/repoview.py # [attribute-error]
mercurial/testing/storage.py # tons of [attribute-error] mercurial/testing/storage.py # tons of [attribute-error]
mercurial/ui.py # [attribute-error], [wrong-arg-types] mercurial/ui.py # [attribute-error], [wrong-arg-types]
mercurial/unionrepo.py # ui, svfs, unfiltered [attribute-error] mercurial/unionrepo.py # ui, svfs, unfiltered [attribute-error]
mercurial/utils/memorytop.py # not 3.6 compatible
mercurial/win32.py # [not-callable] mercurial/win32.py # [not-callable]
mercurial/wireprotoframing.py # [unsupported-operands], [attribute-error], [import-error] mercurial/wireprotoframing.py # [unsupported-operands], [attribute-error], [import-error]
mercurial/wireprotov1peer.py # [attribute-error] mercurial/wireprotov1peer.py # [attribute-error]
mercurial/wireprotov1server.py # BUG?: BundleValueError handler accesses subclass's attrs mercurial/wireprotov1server.py # BUG?: BundleValueError handler accesses subclass's attrs
TODO: use --no-cache on test server? Caching the files locally helps during TODO: use --no-cache on test server? Caching the files locally helps during
development, but may be a hinderance for CI testing. development, but may be a hinderance for CI testing.
$ pytype -V 3.6 --keep-going --jobs auto mercurial \ $ pytype -V 3.7 --keep-going --jobs auto mercurial \
> -x mercurial/bundlerepo.py \ > -x mercurial/bundlerepo.py \
> -x mercurial/context.py \ > -x mercurial/context.py \
> -x mercurial/crecord.py \ > -x mercurial/crecord.py \
> -x mercurial/debugcommands.py \ > -x mercurial/debugcommands.py \
> -x mercurial/dispatch.py \ > -x mercurial/dispatch.py \
> -x mercurial/exchange.py \ > -x mercurial/exchange.py \
> -x mercurial/hgweb/hgweb_mod.py \ > -x mercurial/hgweb/hgweb_mod.py \
> -x mercurial/hgweb/server.py \ > -x mercurial/hgweb/server.py \
> -x mercurial/hgweb/wsgicgi.py \ > -x mercurial/hgweb/wsgicgi.py \
> -x mercurial/httppeer.py \ > -x mercurial/httppeer.py \
> -x mercurial/interfaces \ > -x mercurial/interfaces \
> -x mercurial/keepalive.py \ > -x mercurial/keepalive.py \
> -x mercurial/localrepo.py \ > -x mercurial/localrepo.py \
> -x mercurial/manifest.py \ > -x mercurial/manifest.py \
> -x mercurial/minirst.py \ > -x mercurial/minirst.py \
> -x mercurial/pure/osutil.py \ > -x mercurial/pure/osutil.py \
> -x mercurial/pure/parsers.py \ > -x mercurial/pure/parsers.py \
> -x mercurial/repoview.py \ > -x mercurial/repoview.py \
> -x mercurial/testing/storage.py \ > -x mercurial/testing/storage.py \
> -x mercurial/thirdparty \ > -x mercurial/thirdparty \
> -x mercurial/ui.py \ > -x mercurial/ui.py \
> -x mercurial/unionrepo.py \ > -x mercurial/unionrepo.py \
> -x mercurial/utils/memorytop.py \
> -x mercurial/win32.py \ > -x mercurial/win32.py \
> -x mercurial/wireprotoframing.py \ > -x mercurial/wireprotoframing.py \
> -x mercurial/wireprotov1peer.py \ > -x mercurial/wireprotov1peer.py \
> -x mercurial/wireprotov1server.py \ > -x mercurial/wireprotov1server.py \
> > $TESTTMP/pytype-output.txt || cat $TESTTMP/pytype-output.txt > > $TESTTMP/pytype-output.txt || cat $TESTTMP/pytype-output.txt
Only show the results on a failure, because the output on success is also Only show the results on a failure, because the output on success is also
voluminous and variable. voluminous and variable.