From d00fe04012db53444b0b7f658e7568e55b57a4b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Sat, 29 Jun 2019 12:37:53 +0200
Subject: [PATCH] Fix pypi deployment by using documentation at markdown format

podman README.md is markdown file who is used as a long description
so we need to specify to pypi to use markdown parser to properly
upload package

https://pypi.org/help/#description-content-type
---
 .travis.yml | 10 +++++++++-
 AUTHORS     |  7 +++++++
 ChangeLog   | 27 +++++++++++++++++++++++++++
 setup.cfg   | 23 +++++++++++++----------
 4 files changed, 56 insertions(+), 11 deletions(-)
 create mode 100644 AUTHORS
 create mode 100644 ChangeLog

diff --git a/.travis.yml b/.travis.yml
index 1dd03f1..ab5c008 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,18 @@ before_install:
 - pip install -U pip
 - pip install -U setuptools
 - pip install -U wheel
+- pip install -U twine
 install:
 - pip install tox-travis .[devel]
 script:
-- echo "test"
+- pip install -U setuptools
+- pip install -U wheel
+- pip install -U twine
+- pip list
+- rm -rf dist
+- python setup.py sdist
+- python setup.py bdist_wheel
+- twine check dist/*
 deploy:
   - provider: pypi
     user: containers-libpod
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..a2c6ba1
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,7 @@
+Anders F Björklund <anders.f.bjorklund@gmail.com>
+Brent Baude <bbaude@redhat.com>
+Daniel J Walsh <dwalsh@redhat.com>
+Dhanisha Phadate <phadate.d@husky.neu.edu>
+Hervé Beraud <hberaud@redhat.com>
+Jhon Honce <jhonce@redhat.com>
+Jhon Honce <jwhonce@gmail.com>
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..1325369
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,27 @@
+CHANGES
+=======
+
+* Fix pypi deployment by using documentation at markdown format
+
+v0.0.2
+------
+
+* Fix up pushing to pypi
+
+v0.0.1
+------
+
+* Pull image function throws KeyError for id
+* Secure Travis
+* Introduce travis-ci and autodeployments on tags
+* Improve packaging by using PBR
+* Add base requirements to README.md
+* Remove pypodman to python-pypodman repo
+* Update module to align with varlink API changes
+* Use GetVersion instead of Ping, as recommended
+* Improve README
+* pypodman: add options to handle ssh host keys
+* Update README.md
+* add missing bits
+* Initial copy from containers/libpod
+* Initial commit
diff --git a/setup.cfg b/setup.cfg
index f8e7d05..4748470 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,25 +1,28 @@
 [metadata]
 name = podman
 home-page = https://github.com/containers/python-podman
-project_urls =
-    Bug Tracker = https://github.com/containers/python-podman/issues
-    Source Code = https://github.com/containers/python-podman
 summary = A library to interact with a Podman server
-description_file = README.md
-description_content_type = text/markdown
+description-file =
+    README.md
+    ChangeLog
+    AUTHORS
 author = Jhon Honce
+long_description_content_type = text/markdown
 author_email = jhonce@redhat.com
 license = Apache Software License
+project_urls =
+    Bug Tracker = https://github.com/containers/python-podman/issues
+    Source Code = https://github.com/containers/python-podman
 classifier =
     Development Status :: 3 - Alpha
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python :: 3.4
     Topic :: Software Development
-keywords =
-    varlink
-    libpod
-    podman
+keywords = varlink, libpod, podman
+requires-dist =
+    setuptools
+    wheel
 
 [files]
 packages =
@@ -32,5 +35,5 @@ devel=
     tox
     bandit
 
-[wheel]
+[bdist_wheel]
 universal = 1