From: JinWang An Date: Mon, 28 Dec 2020 04:45:46 +0000 (+0900) Subject: Imported Upstream version 4.0.1 X-Git-Tag: upstream/4.0.1^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe1a61ffc70e2ffe35783ac2b2cf261f0341b1a4;p=platform%2Fupstream%2Fpython3-pbr.git Imported Upstream version 4.0.1 --- diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..67a39c4 --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,7 @@ +- project: + check: + jobs: + - openstack-tox-lower-constraints + gate: + jobs: + - openstack-tox-lower-constraints diff --git a/ChangeLog b/ChangeLog index bbc9c10..a34af0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ CHANGES ======= +4.0.1 +----- + +* add lower-constraints job +* Explicitly read setup.cfg as utf-8 on Python 3 + 4.0.0 ----- diff --git a/PKG-INFO b/PKG-INFO index 1339ea8..f3b2946 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,14 +1,14 @@ Metadata-Version: 2.1 Name: pbr -Version: 4.0.0 +Version: 4.0.1 Summary: Python Build Reasonableness Home-page: https://docs.openstack.org/pbr/latest/ Author: OpenStack Author-email: openstack-dev@lists.openstack.org License: UNKNOWN +Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/ Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/ Project-URL: Documentation, https://docs.openstack.org/pbr/ -Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/ Description: Introduction ============ diff --git a/doc/source/user/using.rst b/doc/source/user/using.rst index d0ff3bd..f8da6de 100644 --- a/doc/source/user/using.rst +++ b/doc/source/user/using.rst @@ -119,6 +119,11 @@ such as the ``extract_mesages`` section provided by Babel__. # A comment on a dedicated line value3 +.. note:: + + On Python 3 ``setup.cfg`` is explicitly read as UTF-8. On Python 2 the + encoding is dependent on the terminal encoding. + __ http://setuptools.readthedocs.io/en/latest/setuptools.html#configuring-setup-using-setup-cfg-files __ http://babel.pocoo.org/en/latest/setup.html diff --git a/lower-constraints.txt b/lower-constraints.txt new file mode 100644 index 0000000..fefbe45 --- /dev/null +++ b/lower-constraints.txt @@ -0,0 +1,36 @@ +alabaster==0.7.10 +Babel==2.3.4 +coverage==4.0 +docutils==0.11 +dulwich==0.15.0 +extras==1.0.0 +fixtures==3.0.0 +flake8==2.5.5 +hacking==0.12.0 +imagesize==0.7.1 +Jinja2==2.10 +linecache2==1.0.0 +MarkupSafe==1.0 +mccabe==0.2.1 +mock==2.0.0 +openstackdocstheme==1.18.1 +pep8==1.5.7 +pyflakes==0.8.1 +Pygments==2.2.0 +python-mimeparse==1.6.0 +python-subunit==1.0.0 +pytz==2013.6 +PyYAML==3.12 +reno==2.5.0 +requests==2.14.2 +six==1.10.0 +snowballstemmer==1.2.1 +Sphinx==1.6.5 +sphinxcontrib-websupport==1.0.1 +testrepository==0.0.18 +testresources==2.0.0 +testscenarios==0.4 +testtools==2.2.0 +traceback2==1.4.0 +unittest2==1.1.0 +virtualenv==14.0.6 diff --git a/pbr.egg-info/PKG-INFO b/pbr.egg-info/PKG-INFO index 1339ea8..f3b2946 100644 --- a/pbr.egg-info/PKG-INFO +++ b/pbr.egg-info/PKG-INFO @@ -1,14 +1,14 @@ Metadata-Version: 2.1 Name: pbr -Version: 4.0.0 +Version: 4.0.1 Summary: Python Build Reasonableness Home-page: https://docs.openstack.org/pbr/latest/ Author: OpenStack Author-email: openstack-dev@lists.openstack.org License: UNKNOWN +Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/ Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/ Project-URL: Documentation, https://docs.openstack.org/pbr/ -Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/ Description: Introduction ============ diff --git a/pbr.egg-info/SOURCES.txt b/pbr.egg-info/SOURCES.txt index 0ced9f2..e2f9588 100644 --- a/pbr.egg-info/SOURCES.txt +++ b/pbr.egg-info/SOURCES.txt @@ -1,11 +1,13 @@ .coveragerc .mailmap .testr.conf +.zuul.yaml AUTHORS CONTRIBUTING.rst ChangeLog LICENSE README.rst +lower-constraints.txt setup.cfg setup.py test-requirements.txt diff --git a/pbr/util.py b/pbr/util.py index 163feb8..31a2a26 100644 --- a/pbr/util.py +++ b/pbr/util.py @@ -214,7 +214,11 @@ def cfg_to_args(path='setup.cfg', script_args=()): if not os.path.exists(path): raise errors.DistutilsFileError("file '%s' does not exist" % os.path.abspath(path)) - parser.read(path) + try: + parser.read(path, encoding='utf-8') + except TypeError: + # Python 2 doesn't accept the encoding kwarg + parser.read(path) config = {} for section in parser.sections(): config[section] = dict() diff --git a/tox.ini b/tox.ini index e449267..9fc050a 100644 --- a/tox.ini +++ b/tox.ini @@ -39,3 +39,10 @@ commands = {posargs} ignore = H803,H904 exclude = .venv,.tox,dist,doc,*.egg,build show-source = true + +[testenv:lower-constraints] +basepython = python3 +deps = + -c{toxinidir}/lower-constraints.txt + -r{toxinidir}/test-requirements.txt +