diff -Nru python-sphinx-feature-classification-0.3.0/debian/changelog python-sphinx-feature-classification-0.3.2/debian/changelog --- python-sphinx-feature-classification-0.3.0/debian/changelog 2018-08-23 15:09:43.000000000 +0000 +++ python-sphinx-feature-classification-0.3.2/debian/changelog 2019-07-16 22:26:31.000000000 +0000 @@ -1,3 +1,21 @@ +python-sphinx-feature-classification (0.3.2-2) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Wed, 17 Jul 2019 00:26:31 +0200 + +python-sphinx-feature-classification (0.3.2-1) experimental; urgency=medium + + [ Ondřej Nový ] + * d/copyright: Use https protocol in Format field + * d/control: Use team+openstack@tracker.debian.org as maintainer + + [ Thomas Goirand ] + * New upstream release. + * Standards-Version: 4.3.0 (no change). + + -- Thomas Goirand Wed, 27 Mar 2019 13:31:09 +0100 + python-sphinx-feature-classification (0.3.0-1) unstable; urgency=medium * Initial release. (Closes: #907058) diff -Nru python-sphinx-feature-classification-0.3.0/debian/control python-sphinx-feature-classification-0.3.2/debian/control --- python-sphinx-feature-classification-0.3.0/debian/control 2018-08-23 15:09:43.000000000 +0000 +++ python-sphinx-feature-classification-0.3.2/debian/control 2019-07-16 22:26:31.000000000 +0000 @@ -1,7 +1,7 @@ Source: python-sphinx-feature-classification Section: python Priority: optional -Maintainer: PKG OpenStack +Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Build-Depends: @@ -9,7 +9,7 @@ dh-python, openstack-pkg-tools, python3-all, - python3-pbr (>= 2.0), + python3-pbr, python3-setuptools, python3-sphinx, Build-Depends-Indep: @@ -17,13 +17,13 @@ python3-ddt, python3-docutils, python3-hacking, - python3-openstackdocstheme (>= 1.17.0), + python3-openstackdocstheme, python3-oslotest, python3-reno, python3-testtools, subunit, testrepository, -Standards-Version: 4.2.0 +Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-sphinx-feature-classification Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-sphinx-feature-classification.git Homepage: https://github.com/openstack/sphinx-feature-classification/ diff -Nru python-sphinx-feature-classification-0.3.0/debian/copyright python-sphinx-feature-classification-0.3.2/debian/copyright --- python-sphinx-feature-classification-0.3.0/debian/copyright 2018-08-23 15:09:43.000000000 +0000 +++ python-sphinx-feature-classification-0.3.2/debian/copyright 2019-07-16 22:26:31.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: sphinx-feature-classification Source: https://github.com/openstack/sphinx-feature-classification/ diff -Nru python-sphinx-feature-classification-0.3.0/HACKING.rst python-sphinx-feature-classification-0.3.2/HACKING.rst --- python-sphinx-feature-classification-0.3.0/HACKING.rst 2018-06-26 09:16:06.000000000 +0000 +++ python-sphinx-feature-classification-0.3.2/HACKING.rst 2019-02-21 10:49:32.000000000 +0000 @@ -1,4 +1,4 @@ sphinx-feature-classification Style Commandments ================================================ -Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/ +Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/ diff -Nru python-sphinx-feature-classification-0.3.0/setup.cfg python-sphinx-feature-classification-0.3.2/setup.cfg --- python-sphinx-feature-classification-0.3.0/setup.cfg 2018-06-26 09:16:06.000000000 +0000 +++ python-sphinx-feature-classification-0.3.2/setup.cfg 2019-02-21 10:49:32.000000000 +0000 @@ -4,8 +4,8 @@ description-file = README.rst author = OpenStack -author-email = openstack-dev@lists.openstack.org -home-page = http://www.openstack.org/ +author-email = openstack-discuss@lists.openstack.org +home-page = https://docs.openstack.org/sphinx-feature-classification/latest/ classifier = Environment :: OpenStack Intended Audience :: Information Technology diff -Nru python-sphinx-feature-classification-0.3.0/sphinx_feature_classification/support_matrix.py python-sphinx-feature-classification-0.3.2/sphinx_feature_classification/support_matrix.py --- python-sphinx-feature-classification-0.3.0/sphinx_feature_classification/support_matrix.py 2018-06-26 09:16:06.000000000 +0000 +++ python-sphinx-feature-classification-0.3.2/sphinx_feature_classification/support_matrix.py 2019-02-21 10:49:32.000000000 +0000 @@ -23,6 +23,7 @@ from docutils import nodes from docutils.parsers import rst +import six from six.moves import configparser KEY_PATTERN = re.compile("[^a-zA-Z0-9_]") @@ -212,8 +213,14 @@ env = self.state.document.settings.env fname = self.arguments[0] rel_fpath, fpath = env.relfn2path(fname) + + # Handle deprecation of readfp in py3 for read_file that was not + # available in py2. + if six.PY2: + cfg.read_file = cfg.readfp + with open(fpath) as fp: - cfg.readfp(fp) + cfg.read_file(fp) # This ensures that the docs are rebuilt whenever the # .ini file changes @@ -271,7 +278,8 @@ summary_head.append(header) # then one column for each backend driver - impls = sorted(matrix.drivers) + impls = sorted(matrix.drivers, + key=lambda x: matrix.drivers[x].title) for key in impls: driver = matrix.drivers[key] implcol = nodes.entry() @@ -302,7 +310,6 @@ classes=["sp_feature_" + feature.status])) # and then one column for each backend driver - impls = sorted(matrix.drivers) for key in impls: impl = feature.implementations[key] impl_col = nodes.entry() @@ -367,7 +374,9 @@ para_divers.append(nodes.strong(text="Driver Support:")) # A sub-list giving details of each backend driver impls = nodes.bullet_list() - for key in feature.implementations: + keys = sorted(feature.implementations, + key=lambda x: matrix.drivers[x].title) + for key in keys: driver = matrix.drivers[key] impl = feature.implementations[key] subitem = nodes.list_item() diff -Nru python-sphinx-feature-classification-0.3.0/sphinx_feature_classification/tests/test_sphinx_feature_classification.py python-sphinx-feature-classification-0.3.2/sphinx_feature_classification/tests/test_sphinx_feature_classification.py --- python-sphinx-feature-classification-0.3.0/sphinx_feature_classification/tests/test_sphinx_feature_classification.py 2018-06-26 09:16:06.000000000 +0000 +++ python-sphinx-feature-classification-0.3.2/sphinx_feature_classification/tests/test_sphinx_feature_classification.py 2019-02-21 10:49:32.000000000 +0000 @@ -20,12 +20,13 @@ """ import os -from sphinx_feature_classification import support_matrix -from sphinx_feature_classification.tests import base - import ddt +import six from six.moves import configparser +from sphinx_feature_classification import support_matrix +from sphinx_feature_classification.tests import base + @ddt.ddt class MatrixTestCase(base.TestCase): @@ -37,8 +38,11 @@ directory = os.path.dirname(os.path.abspath(__file__)) config_file = os.path.join(directory, 'fakes', 'support-matrix.ini') + if six.PY2: + cfg.read_file = cfg.readfp + with open(config_file) as fp: - cfg.readfp(fp) + cfg.read_file(fp) self.matrix = support_matrix.Matrix(cfg) diff -Nru python-sphinx-feature-classification-0.3.0/.zuul.yaml python-sphinx-feature-classification-0.3.2/.zuul.yaml --- python-sphinx-feature-classification-0.3.0/.zuul.yaml 1970-01-01 00:00:00.000000000 +0000 +++ python-sphinx-feature-classification-0.3.2/.zuul.yaml 2019-02-21 10:49:32.000000000 +0000 @@ -0,0 +1,7 @@ +- project: + templates: + - check-requirements + - publish-openstack-docs-pti + - openstack-python-jobs + - openstack-python36-jobs + - openstack-python37-jobs