diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-05 07:51:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-05 07:51:44 +0000 |
| commit | cd3e4f2949545389bd39d195e1556c3e5bf1d14a (patch) | |
| tree | 3cfed252ee3b4c525193f7f31e52da2149b5c5fb | |
| parent | 0f3f25590dde4f8cf896d3b3144479bdd7bc7d08 (diff) | |
| parent | 538d2c21a1e2c816aa4ec2b20550c1278707456a (diff) | |
| download | pbr-cd3e4f2949545389bd39d195e1556c3e5bf1d14a.tar.gz | |
Merge "Support Description-Content-Type metadata"
| -rw-r--r-- | doc/source/user/using.rst | 3 | ||||
| -rw-r--r-- | pbr/tests/testpackage/setup.cfg | 1 | ||||
| -rw-r--r-- | pbr/util.py | 1 | ||||
| -rw-r--r-- | setup.cfg | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/doc/source/user/using.rst b/doc/source/user/using.rst index 4b08ec4..0b91141 100644 --- a/doc/source/user/using.rst +++ b/doc/source/user/using.rst @@ -50,7 +50,8 @@ itself): author = OpenStack Foundation author-email = openstack-dev@lists.openstack.org summary = OpenStack's setup automation in a reusable form - description-file = README + description-file = README.rst + description-content-type = text/x-rst; charset=UTF-8 home-page = https://launchpad.net/pbr license = Apache-2 classifier = diff --git a/pbr/tests/testpackage/setup.cfg b/pbr/tests/testpackage/setup.cfg index d10a87e..5af1514 100644 --- a/pbr/tests/testpackage/setup.cfg +++ b/pbr/tests/testpackage/setup.cfg @@ -10,6 +10,7 @@ summary = Test package for testing pbr description-file = README.txt CHANGES.txt +description-content-type = text/plain; charset=UTF-8 requires-python = >=2.5 requires-dist = diff --git a/pbr/util.py b/pbr/util.py index dc8995e..ef4deb0 100644 --- a/pbr/util.py +++ b/pbr/util.py @@ -104,6 +104,7 @@ D1_D2_SETUP_ARGS = { "description": ("metadata", "summary"), "keywords": ("metadata",), "long_description": ("metadata", "description"), + "long_description_content_type": ("metadata", "description_content_type"), "download_url": ("metadata",), "classifiers": ("metadata", "classifier"), "platforms": ("metadata", "platform"), # ** @@ -5,6 +5,7 @@ author-email = openstack-dev@lists.openstack.org summary = Python Build Reasonableness description-file = README.rst +description-content-type = text/x-rst; charset=UTF-8 home-page = https://docs.openstack.org/pbr/latest/ requires-python = >=2.6 classifier = |