Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-lib3to6 for openSUSE:Factory checked in at 2021-04-29 01:38:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-lib3to6 (Old) and /work/SRC/openSUSE:Factory/.python-lib3to6.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-lib3to6" Thu Apr 29 01:38:24 2021 rev:5 rq:889009 version:202101.1045 Changes: -------- --- /work/SRC/openSUSE:Factory/python-lib3to6/python-lib3to6.changes 2020-10-10 19:05:43.956526629 +0200 +++ /work/SRC/openSUSE:Factory/.python-lib3to6.new.12324/python-lib3to6.changes 2021-04-29 01:39:31.290673756 +0200 @@ -1,0 +2,6 @@ +Wed Apr 28 11:25:04 UTC 2021 - Mark??ta Machov?? <[email protected]> + +- Update to 202101.1045 + * Fixes for Python 3.9 and mypy 0.800 + +------------------------------------------------------------------- Old: ---- lib3to6-202009.1044.tar.gz New: ---- lib3to6-202101.1045.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-lib3to6.spec ++++++ --- /var/tmp/diff_new_pack.xFHEX1/_old 2021-04-29 01:39:31.742674395 +0200 +++ /var/tmp/diff_new_pack.xFHEX1/_new 2021-04-29 01:39:31.746674401 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-lib3to6 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-lib3to6 -Version: 202009.1044 +Version: 202101.1045 Release: 0 Summary: Module to compile Python 3.6+ code to Python 2.7+ License: MIT @@ -34,7 +34,7 @@ Requires: python-typing Requires: python-wheel Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module astor} ++++++ lib3to6-202009.1044.tar.gz -> lib3to6-202101.1045.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/CHANGELOG.md new/lib3to6-202101.1045/CHANGELOG.md --- old/lib3to6-202009.1044/CHANGELOG.md 2020-09-02 09:49:55.000000000 +0200 +++ new/lib3to6-202101.1045/CHANGELOG.md 2021-01-22 17:46:34.000000000 +0100 @@ -1,5 +1,10 @@ # Changelog for https://gitlab.com/mbarkhau/lib3to6 +## v202101.1043 + + - Fixes for Python 3.9 and mypy 0.800 + + ## v202009.1042 - New #6: per-file opt-in/opt-out using `# lib3to6: disabled`/`# lib3to6: enabled` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/PKG-INFO new/lib3to6-202101.1045/PKG-INFO --- old/lib3to6-202009.1044/PKG-INFO 2020-09-14 01:30:00.596471800 +0200 +++ new/lib3to6-202101.1045/PKG-INFO 2021-01-22 18:35:35.039646000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: lib3to6 -Version: 202009.1044 +Version: 202101.1045 Summary: Compile Python 3.6+ code to Python 2.7+ Home-page: https://gitlab.com/mbarkhau/lib3to6 Author: Manuel Barkhau @@ -17,7 +17,7 @@ [![MIT License][license_img]][license_ref] [![Supported Python Versions][pyversions_img]][pyversions_ref] - [![PyCalVer v202009.1044][version_img]][version_ref] + [![CalVer v202101.1045][version_img]][version_ref] [![PyPI Version][pypi_img]][pypi_ref] [![PyPI Downloads][downloads_img]][downloads_ref] @@ -73,6 +73,7 @@ The compiled output is tested using: + - Python 3.9 - Python 3.8 - Python 3.7 - Python 3.6 @@ -83,6 +84,7 @@ The test-suite for the transpiler is run using: + - Python 3.9 - Python 3.8 - Python 3.7 - Python 3.6 @@ -146,7 +148,7 @@ # setup.py package_dir = {"": "src"} - if is_bdist and "Programming Language :: Python :: 2" in classifiers: + if any(arg.startswith("bdist") for arg in sys.argv): import lib3to6 package_dir = lib3to6.fix(package_dir, default_mode='disabled') ``` @@ -180,9 +182,7 @@ install_requires = ['typing;python_version<"3.5"'] - is_bdist = any(arg.startswith("bdist") for arg in sys.argv) - - if is_bdist: + if any(arg.startswith("bdist") for arg in sys.argv): import lib3to6 package_dir = lib3to6.fix( package_dir, @@ -206,7 +206,7 @@ ) ``` - When you build you package, the contends of the resulting distribution + When you build you package, the contents of the resulting distribution will be the code that was converted by lib3to6. @@ -819,7 +819,7 @@ user@host:~/ $ git clone https://gitlab.com/mbarkhau/lib3to6.git user@host:~/ $ cd lib3to6/ user@host:~/lib3to6/ ???master $ make help - user@host:~/lib3to6/ ???master $ make install # creates conda environments + user@host:~/lib3to6/ ???master $ make conda # creates conda environments ... user@host:~/lib3to6/ ???master $ ls ~/miniconda3/envs/ user@host:~/lib3to6_pypy35 lib3to6_py27 lib3to6_py36 lib3to6_py37 lib3to6_py38 @@ -857,24 +857,15 @@ ``` - ## Project Status (as of 2020-09-01): Beta - - I have tested with Python 3.8 and made some fixes and updates. Updates for - Python3.9 should be possible and contributions are welcome to support some - of the [new features in Python 3.9][href_py39_whatsnew], in particular: - - - Dictionary Merge & Update Operators - - `str.removeprefix(prefix)` and `str.removeprefix(prefix)` - - [href_py39_whatsnew]: https://docs.python.org/3.9/whatsnew/3.9.html + ## Project Status (as of 2021-01-01): Beta - I've been using this library for over a year on a few projects + I have tested with Python 3.9 with only minor updates required since Python 3.8. I've been using this library for over two years on a few projects without much incident. Examples of such projects are: + - [BumpVer](https://pypi.org/project/bumpver/). - [markdown-katex](https://pypi.org/project/markdown-katex/) - [markdown-svgbob](https://pypi.org/project/markdown-svgbob/) - [markdown-aafigure](https://pypi.org/project/markdown-aafigure/) - - [PyCalVer](https://pypi.org/project/pycalver/). - [pylint-ignore](https://pypi.org/project/pylint-ignore/) - [pretty-traceback](https://pypi.org/project/pretty-traceback/) - [backports.pampy](https://pypi.org/project/backports.pampy/) @@ -976,8 +967,8 @@ [downloads_img]: https://pepy.tech/badge/lib3to6/month [downloads_ref]: https://pepy.tech/project/lib3to6 - [version_img]: https://img.shields.io/static/v1.svg?label=PyCalVer&message=v202009.1044&color=blue - [version_ref]: https://pypi.org/project/pycalver/ + [version_img]: https://img.shields.io/static/v1.svg?label=CalVer&message=v202101.1045&color=blue + [version_ref]: https://pypi.org/project/bumpver/ [pyversions_img]: https://img.shields.io/pypi/pyversions/lib3to6.svg [pyversions_ref]: https://pypi.python.org/pypi/lib3to6 @@ -986,6 +977,11 @@ # Changelog for https://gitlab.com/mbarkhau/lib3to6 + ## v202101.1043 + + - Fixes for Python 3.9 and mypy 0.800 + + ## v202009.1042 - New #6: per-file opt-in/opt-out using `# lib3to6: disabled`/`# lib3to6: enabled` @@ -1067,6 +1063,7 @@ Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Topic :: Software Development :: Libraries Classifier: Topic :: Software Development :: Libraries :: Python Modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/README.md new/lib3to6-202101.1045/README.md --- old/lib3to6-202009.1044/README.md 2020-09-14 01:29:57.000000000 +0200 +++ new/lib3to6-202101.1045/README.md 2021-01-22 18:33:54.000000000 +0100 @@ -9,7 +9,7 @@ [![MIT License][license_img]][license_ref] [![Supported Python Versions][pyversions_img]][pyversions_ref] -[![PyCalVer v202009.1044][version_img]][version_ref] +[![CalVer v202101.1045][version_img]][version_ref] [![PyPI Version][pypi_img]][pypi_ref] [![PyPI Downloads][downloads_img]][downloads_ref] @@ -65,6 +65,7 @@ The compiled output is tested using: +- Python 3.9 - Python 3.8 - Python 3.7 - Python 3.6 @@ -75,6 +76,7 @@ The test-suite for the transpiler is run using: +- Python 3.9 - Python 3.8 - Python 3.7 - Python 3.6 @@ -138,7 +140,7 @@ # setup.py package_dir = {"": "src"} -if is_bdist and "Programming Language :: Python :: 2" in classifiers: +if any(arg.startswith("bdist") for arg in sys.argv): import lib3to6 package_dir = lib3to6.fix(package_dir, default_mode='disabled') ``` @@ -172,9 +174,7 @@ install_requires = ['typing;python_version<"3.5"'] -is_bdist = any(arg.startswith("bdist") for arg in sys.argv) - -if is_bdist: +if any(arg.startswith("bdist") for arg in sys.argv): import lib3to6 package_dir = lib3to6.fix( package_dir, @@ -198,7 +198,7 @@ ) ``` -When you build you package, the contends of the resulting distribution +When you build you package, the contents of the resulting distribution will be the code that was converted by lib3to6. @@ -811,7 +811,7 @@ user@host:~/ $ git clone https://gitlab.com/mbarkhau/lib3to6.git user@host:~/ $ cd lib3to6/ user@host:~/lib3to6/ ???master $ make help -user@host:~/lib3to6/ ???master $ make install # creates conda environments +user@host:~/lib3to6/ ???master $ make conda # creates conda environments ... user@host:~/lib3to6/ ???master $ ls ~/miniconda3/envs/ user@host:~/lib3to6_pypy35 lib3to6_py27 lib3to6_py36 lib3to6_py37 lib3to6_py38 @@ -849,24 +849,15 @@ ``` -## Project Status (as of 2020-09-01): Beta - -I have tested with Python 3.8 and made some fixes and updates. Updates for -Python3.9 should be possible and contributions are welcome to support some -of the [new features in Python 3.9][href_py39_whatsnew], in particular: - -- Dictionary Merge & Update Operators -- `str.removeprefix(prefix)` and `str.removeprefix(prefix)` - -[href_py39_whatsnew]: https://docs.python.org/3.9/whatsnew/3.9.html +## Project Status (as of 2021-01-01): Beta -I've been using this library for over a year on a few projects +I have tested with Python 3.9 with only minor updates required since Python 3.8. I've been using this library for over two years on a few projects without much incident. Examples of such projects are: +- [BumpVer](https://pypi.org/project/bumpver/). - [markdown-katex](https://pypi.org/project/markdown-katex/) - [markdown-svgbob](https://pypi.org/project/markdown-svgbob/) - [markdown-aafigure](https://pypi.org/project/markdown-aafigure/) -- [PyCalVer](https://pypi.org/project/pycalver/). - [pylint-ignore](https://pypi.org/project/pylint-ignore/) - [pretty-traceback](https://pypi.org/project/pretty-traceback/) - [backports.pampy](https://pypi.org/project/backports.pampy/) @@ -968,8 +959,8 @@ [downloads_img]: https://pepy.tech/badge/lib3to6/month [downloads_ref]: https://pepy.tech/project/lib3to6 -[version_img]: https://img.shields.io/static/v1.svg?label=PyCalVer&message=v202009.1044&color=blue -[version_ref]: https://pypi.org/project/pycalver/ +[version_img]: https://img.shields.io/static/v1.svg?label=CalVer&message=v202101.1045&color=blue +[version_ref]: https://pypi.org/project/bumpver/ [pyversions_img]: https://img.shields.io/pypi/pyversions/lib3to6.svg [pyversions_ref]: https://pypi.python.org/pypi/lib3to6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/setup.cfg new/lib3to6-202101.1045/setup.cfg --- old/lib3to6-202009.1044/setup.cfg 2020-09-14 01:30:00.596471800 +0200 +++ new/lib3to6-202101.1045/setup.cfg 2021-01-22 18:35:35.043646000 +0100 @@ -58,24 +58,27 @@ [tool:pytest] addopts = --doctest-modules -[pycalver] -current_version = v202009.1044 +[bumpver] +current_version = v202101.1045 +version_pattern = vYYYY0M.BUILD[-PYTAGNUM] commit = True tag = True push = True -[pycalver:file_patterns] +[bumpver:file_patterns] bootstrapit.sh = PACKAGE_VERSION="{version}" setup.cfg = current_version = {version} setup.py = version="{pep440_version}" +src/lib3to6/*.py = + Copyright (c) 2019-YYYY Manuel Barkhau src/lib3to6/__init__.py = __version__ = "{version}" readme.md = - [PyCalVer {version}] - https://img.shields.io/static/v1.svg?label=PyCalVer&message={version}&color=blue + \[CalVer {version}\] + https://img.shields.io/static/v1.svg?label=CalVer&message={version}&color=blue [tool:pylint] score = no diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/setup.py new/lib3to6-202101.1045/setup.py --- old/lib3to6-202009.1044/setup.py 2020-09-14 01:29:57.000000000 +0200 +++ new/lib3to6-202101.1045/setup.py 2021-01-22 18:26:42.000000000 +0100 @@ -50,7 +50,7 @@ author="Manuel Barkhau", author_email="[email protected]", url="https://gitlab.com/mbarkhau/lib3to6", - version="202009.1044", + version="202101.1045", keywords="six lib2to3 astor ast", description="Compile Python 3.6+ code to Python 2.7+", long_description=long_description, @@ -81,6 +81,7 @@ "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Software Development :: Libraries", "Topic :: Software Development :: Libraries :: Python Modules", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/__init__.py new/lib3to6-202101.1045/src/lib3to6/__init__.py --- old/lib3to6-202009.1044/src/lib3to6/__init__.py 2020-09-14 01:29:57.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/__init__.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT from .utils import parsedump_ast @@ -9,6 +9,6 @@ from .packaging import fix from .transpile import transpile_module -__version__ = "v202009.1044" +__version__ = "v202101.1045" __all__ = ["fix", "transpile_module", "parsedump_ast", 'parsedump_source'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/__main__.py new/lib3to6-202101.1045/src/lib3to6/__main__.py --- old/lib3to6-202009.1044/src/lib3to6/__main__.py 2020-09-02 00:29:22.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/__main__.py 2021-01-22 18:26:42.000000000 +0100 @@ -2,7 +2,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import io @@ -182,4 +182,4 @@ if __name__ == '__main__': # NOTE (mb 2020-07-18): click supplies the parameters # pylint:disable=no-value-for-parameter - main() # type: ignore + main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/checker_base.py new/lib3to6-202101.1045/src/lib3to6/checker_base.py --- old/lib3to6-202009.1044/src/lib3to6/checker_base.py 2020-07-19 23:05:23.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/checker_base.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2020 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/checkers.py new/lib3to6-202101.1045/src/lib3to6/checkers.py --- old/lib3to6-202009.1044/src/lib3to6/checkers.py 2020-07-18 23:18:19.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/checkers.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/checkers_backports.py new/lib3to6-202101.1045/src/lib3to6/checkers_backports.py --- old/lib3to6-202009.1044/src/lib3to6/checkers_backports.py 2020-07-19 23:05:23.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/checkers_backports.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2020 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast import typing as typ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/common.py new/lib3to6-202101.1045/src/lib3to6/common.py --- old/lib3to6-202009.1044/src/lib3to6/common.py 2020-09-02 00:13:07.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/common.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/fixer_base.py new/lib3to6-202101.1045/src/lib3to6/fixer_base.py --- old/lib3to6-202009.1044/src/lib3to6/fixer_base.py 2020-07-19 23:16:08.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/fixer_base.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/fixers.py new/lib3to6-202101.1045/src/lib3to6/fixers.py --- old/lib3to6-202009.1044/src/lib3to6/fixers.py 2020-07-19 23:16:59.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/fixers.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast @@ -102,13 +102,27 @@ if self.is_forward_ref(elt.id): elts[i] = ast.Constant(elt.id) elif isinstance(elt, ast.Subscript): - idx = elt.slice - assert isinstance(idx, ast.Index) - self.update_index(idx) + self.update_subscript(elt) else: msg = f"Error fixing index element with forward ref of type {type(elt)}" raise NotImplementedError(msg) + def update_subscript(self, val: ast.Subscript) -> None: + idx = val.slice + if isinstance(idx, ast.Tuple): + elts = typ.cast(Elts, idx.elts) + self.update_index_elts(elts) + elif isinstance(idx, ast.Index): + self.update_index(idx) + elif isinstance(idx, ast.Subscript): + self.update_subscript(idx) + elif isinstance(idx, ast.Name): + if self.is_forward_ref(idx.id): + val.slice = AstStr(idx.id) + else: + msg = f"Error fixing annotation of forward ref with type {type(idx)}" + raise NotImplementedError(msg) + def update_index(self, idx: ast.Index) -> None: val = idx.value if is_const_node(val) or isinstance(val, ast.Attribute): @@ -118,9 +132,7 @@ if self.is_forward_ref(val.id): idx.value = AstStr(val.id) elif isinstance(val, ast.Subscript): - sub_idx = val.slice - assert isinstance(sub_idx, ast.Index) - self.update_index(sub_idx) + self.update_subscript(val) elif isinstance(val, ast.Tuple): elts = typ.cast(Elts, val.elts) self.update_index_elts(elts) @@ -137,9 +149,7 @@ if self.is_forward_ref(anno.id): setattr(node, attrname, AstStr(anno.id)) elif isinstance(anno, ast.Subscript): - idx = anno.slice - assert isinstance(idx, ast.Index) - self.update_index(idx) + self.update_subscript(anno) else: msg = f"Error fixing annotation of forward ref with type {type(anno)}" raise NotImplementedError(msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/fixers_builtin_rename.py new/lib3to6-202101.1045/src/lib3to6/fixers_builtin_rename.py --- old/lib3to6-202009.1044/src/lib3to6/fixers_builtin_rename.py 2020-05-29 11:36:42.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/fixers_builtin_rename.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/fixers_fstring.py new/lib3to6-202101.1045/src/lib3to6/fixers_fstring.py --- old/lib3to6-202009.1044/src/lib3to6/fixers_fstring.py 2020-05-28 18:17:01.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/fixers_fstring.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/fixers_future.py new/lib3to6-202101.1045/src/lib3to6/fixers_future.py --- old/lib3to6-202009.1044/src/lib3to6/fixers_future.py 2020-07-26 03:49:12.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/fixers_future.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/fixers_import_fallback.py new/lib3to6-202101.1045/src/lib3to6/fixers_import_fallback.py --- old/lib3to6-202009.1044/src/lib3to6/fixers_import_fallback.py 2020-07-18 22:29:25.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/fixers_import_fallback.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/fixers_namedexpr.py new/lib3to6-202101.1045/src/lib3to6/fixers_namedexpr.py --- old/lib3to6-202009.1044/src/lib3to6/fixers_namedexpr.py 2020-08-26 18:59:09.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/fixers_namedexpr.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/fixers_unpacking_generalization.py new/lib3to6-202101.1045/src/lib3to6/fixers_unpacking_generalization.py --- old/lib3to6-202009.1044/src/lib3to6/fixers_unpacking_generalization.py 2020-07-26 03:46:47.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/fixers_unpacking_generalization.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2020 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast import typing as typ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/packaging.py new/lib3to6-202101.1045/src/lib3to6/packaging.py --- old/lib3to6-202009.1044/src/lib3to6/packaging.py 2020-09-02 00:37:26.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/packaging.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import os diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/transpile.py new/lib3to6-202101.1045/src/lib3to6/transpile.py --- old/lib3to6-202009.1044/src/lib3to6/transpile.py 2020-09-02 00:50:47.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/transpile.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import re diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6/utils.py new/lib3to6-202101.1045/src/lib3to6/utils.py --- old/lib3to6-202009.1044/src/lib3to6/utils.py 2020-07-19 23:14:19.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6/utils.py 2021-01-22 18:26:42.000000000 +0100 @@ -1,7 +1,7 @@ # This file is part of the lib3to6 project # https://gitlab.com/mbarkhau/lib3to6 # -# Copyright (c) 2019 Manuel Barkhau ([email protected]) - MIT License +# Copyright (c) 2019-2021 Manuel Barkhau ([email protected]) - MIT License # SPDX-License-Identifier: MIT import ast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib3to6-202009.1044/src/lib3to6.egg-info/PKG-INFO new/lib3to6-202101.1045/src/lib3to6.egg-info/PKG-INFO --- old/lib3to6-202009.1044/src/lib3to6.egg-info/PKG-INFO 2020-09-14 01:30:00.000000000 +0200 +++ new/lib3to6-202101.1045/src/lib3to6.egg-info/PKG-INFO 2021-01-22 18:35:34.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: lib3to6 -Version: 202009.1044 +Version: 202101.1045 Summary: Compile Python 3.6+ code to Python 2.7+ Home-page: https://gitlab.com/mbarkhau/lib3to6 Author: Manuel Barkhau @@ -17,7 +17,7 @@ [![MIT License][license_img]][license_ref] [![Supported Python Versions][pyversions_img]][pyversions_ref] - [![PyCalVer v202009.1044][version_img]][version_ref] + [![CalVer v202101.1045][version_img]][version_ref] [![PyPI Version][pypi_img]][pypi_ref] [![PyPI Downloads][downloads_img]][downloads_ref] @@ -73,6 +73,7 @@ The compiled output is tested using: + - Python 3.9 - Python 3.8 - Python 3.7 - Python 3.6 @@ -83,6 +84,7 @@ The test-suite for the transpiler is run using: + - Python 3.9 - Python 3.8 - Python 3.7 - Python 3.6 @@ -146,7 +148,7 @@ # setup.py package_dir = {"": "src"} - if is_bdist and "Programming Language :: Python :: 2" in classifiers: + if any(arg.startswith("bdist") for arg in sys.argv): import lib3to6 package_dir = lib3to6.fix(package_dir, default_mode='disabled') ``` @@ -180,9 +182,7 @@ install_requires = ['typing;python_version<"3.5"'] - is_bdist = any(arg.startswith("bdist") for arg in sys.argv) - - if is_bdist: + if any(arg.startswith("bdist") for arg in sys.argv): import lib3to6 package_dir = lib3to6.fix( package_dir, @@ -206,7 +206,7 @@ ) ``` - When you build you package, the contends of the resulting distribution + When you build you package, the contents of the resulting distribution will be the code that was converted by lib3to6. @@ -819,7 +819,7 @@ user@host:~/ $ git clone https://gitlab.com/mbarkhau/lib3to6.git user@host:~/ $ cd lib3to6/ user@host:~/lib3to6/ ???master $ make help - user@host:~/lib3to6/ ???master $ make install # creates conda environments + user@host:~/lib3to6/ ???master $ make conda # creates conda environments ... user@host:~/lib3to6/ ???master $ ls ~/miniconda3/envs/ user@host:~/lib3to6_pypy35 lib3to6_py27 lib3to6_py36 lib3to6_py37 lib3to6_py38 @@ -857,24 +857,15 @@ ``` - ## Project Status (as of 2020-09-01): Beta - - I have tested with Python 3.8 and made some fixes and updates. Updates for - Python3.9 should be possible and contributions are welcome to support some - of the [new features in Python 3.9][href_py39_whatsnew], in particular: - - - Dictionary Merge & Update Operators - - `str.removeprefix(prefix)` and `str.removeprefix(prefix)` - - [href_py39_whatsnew]: https://docs.python.org/3.9/whatsnew/3.9.html + ## Project Status (as of 2021-01-01): Beta - I've been using this library for over a year on a few projects + I have tested with Python 3.9 with only minor updates required since Python 3.8. I've been using this library for over two years on a few projects without much incident. Examples of such projects are: + - [BumpVer](https://pypi.org/project/bumpver/). - [markdown-katex](https://pypi.org/project/markdown-katex/) - [markdown-svgbob](https://pypi.org/project/markdown-svgbob/) - [markdown-aafigure](https://pypi.org/project/markdown-aafigure/) - - [PyCalVer](https://pypi.org/project/pycalver/). - [pylint-ignore](https://pypi.org/project/pylint-ignore/) - [pretty-traceback](https://pypi.org/project/pretty-traceback/) - [backports.pampy](https://pypi.org/project/backports.pampy/) @@ -976,8 +967,8 @@ [downloads_img]: https://pepy.tech/badge/lib3to6/month [downloads_ref]: https://pepy.tech/project/lib3to6 - [version_img]: https://img.shields.io/static/v1.svg?label=PyCalVer&message=v202009.1044&color=blue - [version_ref]: https://pypi.org/project/pycalver/ + [version_img]: https://img.shields.io/static/v1.svg?label=CalVer&message=v202101.1045&color=blue + [version_ref]: https://pypi.org/project/bumpver/ [pyversions_img]: https://img.shields.io/pypi/pyversions/lib3to6.svg [pyversions_ref]: https://pypi.python.org/pypi/lib3to6 @@ -986,6 +977,11 @@ # Changelog for https://gitlab.com/mbarkhau/lib3to6 + ## v202101.1043 + + - Fixes for Python 3.9 and mypy 0.800 + + ## v202009.1042 - New #6: per-file opt-in/opt-out using `# lib3to6: disabled`/`# lib3to6: enabled` @@ -1067,6 +1063,7 @@ Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Topic :: Software Development :: Libraries Classifier: Topic :: Software Development :: Libraries :: Python Modules
