Mercurial > hg-stable
changeset 29890:e2c086f147ef
py3: split check of pygments-using files from the rest of the tree
If we don't do this, people without pygments installed in their Python
3 environment silently stop checking test-check-py3-compat, which
isn't really what we wanted. This preserves stability of the test
output while still letting anyone with a recent-enough Python 3 run
the majority of the Python 3 compat checking test.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 30 Aug 2016 13:33:48 -0400 |
| parents | 42751543fa06 |
| children | 6d66200bff3b |
| files | tests/test-check-py3-compat.t |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-check-py3-compat.t Fri Aug 26 23:38:52 2016 +0900 +++ b/tests/test-check-py3-compat.t Tue Aug 30 13:33:48 2016 -0400 @@ -12,8 +12,8 @@ setup.py not using absolute_import tests/test-demandimport.py not using absolute_import -#if py3exe py3pygments - $ hg files 'set:(**.py)' | sed 's|\\|/|g' \ +#if py3exe + $ hg files 'set:(**.py) - grep(pygments)' | sed 's|\\|/|g' \ > | xargs $PYTHON3 contrib/check-py3-compat.py \ > | sed 's/[0-9][0-9]*)$/*)/' doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *) @@ -50,7 +50,6 @@ hgext/gpg.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) hgext/graphlog.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) hgext/hgk.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) - hgext/highlight/highlight.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) hgext/histedit.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) hgext/journal.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) hgext/keyword.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) @@ -172,3 +171,10 @@ mercurial/wireproto.py: error importing module: <TypeError> unorderable types: str() >= tuple() (line *) #endif + +#if py3exe py3pygments + $ hg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \ + > | xargs $PYTHON3 contrib/check-py3-compat.py \ + > | sed 's/[0-9][0-9]*)$/*)/' + hgext/highlight/highlight.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) +#endif