[PATCH 2 of 2] py3: exclude pywatchman from test-check-py3-compat.t

Augie Fackler raf at durin42.com
Sat Dec 24 16:16:24 EST 2016


queued, thanks

> On Dec 24, 2016, at 4:13 PM, Pulkit Goyal <7895pulkit at gmail.com> wrote:
> 
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit at gmail.com>
> # Date 1482613966 -19800
> #      Sun Dec 25 02:42:46 2016 +0530
> # Node ID 81bf1a686b999c3c2d743135f8ee316546ac77c9
> # Parent  0eb4b3d38d5f63606bd96434885d27601f39acc7
> py3: exclude pywatchman from test-check-py3-compat.t
> 
> Exclude pywatchman from py3 test. They have already worked on Python 3
> compatibility https://github.com/facebook/watchman/pull/247
> 
> diff -r 0eb4b3d38d5f -r 81bf1a686b99 tests/test-check-py3-compat.t
> --- a/tests/test-check-py3-compat.t	Sun Dec 25 02:34:19 2016 +0530
> +++ b/tests/test-check-py3-compat.t	Sun Dec 25 02:42:46 2016 +0530
> @@ -20,15 +20,11 @@
>   tests/test-demandimport.py not using absolute_import
> 
> #if py3exe
> -  $ hg files 'set:(**.py) - grep(pygments)' | sed 's|\\|/|g' \
> -  > | xargs $PYTHON3 contrib/check-py3-compat.py \
> +  $ hg files 'set:(**.py) - grep(pygments)' -X hgext/fsmonitor/pywatchman \
> +  > | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py \
>> | sed 's/[0-9][0-9]*)$/*)/'
>   hgext/convert/transport.py: error importing: <ImportError> No module named 'svn.client' (error at transport.py:*)
> -  hgext/fsmonitor/pywatchman/capabilities.py: error importing: <SyntaxError> from __future__ imports must occur at the beginning of the file (__init__.py, line 30) (error at watchmanclient.py:*)
> -  hgext/fsmonitor/pywatchman/compat.py: error importing: <SyntaxError> from __future__ imports must occur at the beginning of the file (__init__.py, line 30) (error at watchmanclient.py:*)
> -  hgext/fsmonitor/pywatchman/encoding.py: error importing: <SyntaxError> from __future__ imports must occur at the beginning of the file (__init__.py, line 30) (error at watchmanclient.py:*)
> -  hgext/fsmonitor/pywatchman/load.py: error importing: <SyntaxError> from __future__ imports must occur at the beginning of the file (__init__.py, line 30) (error at watchmanclient.py:*)
> -  hgext/fsmonitor/pywatchman/pybser.py: error importing: <SyntaxError> from __future__ imports must occur at the beginning of the file (__init__.py, line 30) (error at watchmanclient.py:*)
> +  hgext/fsmonitor/state.py: error importing: <SyntaxError> from __future__ imports must occur at the beginning of the file (__init__.py, line 30) (error at watchmanclient.py:*)
>   hgext/fsmonitor/watchmanclient.py: error importing: <SyntaxError> from __future__ imports must occur at the beginning of the file (__init__.py, line 30) (error at watchmanclient.py:*)
>   mercurial/cffi/bdiff.py: error importing: <ImportError> No module named 'mercurial.cffi' (error at check-py3-compat.py:*)
>   mercurial/cffi/mpatch.py: error importing: <ImportError> No module named 'mercurial.cffi' (error at check-py3-compat.py:*)
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel



More information about the Mercurial-devel mailing list