From 91569729fb0967f75c521e5f072661bdcaee031c Mon Sep 17 00:00:00 2001
From: Tom Bocklisch <tom@rasa.ai>
Date: Wed, 18 Apr 2018 13:24:19 +0200
Subject: [PATCH] cleanups for new pypi

---
 .travis.yml |  9 +++------
 setup.cfg   |  5 +++++
 setup.py    | 31 ++++++++++++++++++++++---------
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b133da1043e..86664706746 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,5 @@
 language: python
 sudo: required
-addons:
-  apt_packages:
-    - pandoc
 cache:
   directories:
   - "$HOME/.cache/pip"
@@ -46,14 +43,14 @@ jobs:
     - git config --global user.name "Travis CI"
     - git remote set-url --push origin "git@github.com:$TRAVIS_REPO_SLUG"
     - export ${!TRAVIS*}
-    - sphinx-versioning push docs gh-pages .
+    - sphinx-versioning push docs docs .
   - stage: deploy
-    install:
-    - pip install pypandoc==1.4
+    install: skip
     script: skip
     deploy:
       provider: pypi
       user: amn41
+      distributions: "sdist bdist_wheel"
       on:
         branch: master
         tags: true
diff --git a/setup.cfg b/setup.cfg
index 6051d096d1c..c04acd7d6c9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,3 +7,8 @@ pep8ignore =
 
 [metadata]
 description-file = README.md
+license_file = LICENSE.txt
+
+[bdist_wheel]
+# this will create a universal wheel for all distributions and py2 & py3
+universal=1
diff --git a/setup.py b/setup.py
index 1c89b1fecda..e36f3516e5f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,16 @@
 from setuptools import setup, find_packages
 import io
+import os
+
+here = os.path.abspath(os.path.dirname(__file__))
 
 # Avoids IDE errors, but actual version is read from version.py
 __version__ = None
 exec(open('rasa_core/version.py').read())
 
-try:
-    import pypandoc
-    readme = pypandoc.convert_file('README.md', 'rst')
-except (IOError, ImportError):
-    with io.open('README.md', encoding='utf-8') as f:
-        readme = f.read()
+# Get the long description from the README file
+with io.open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
+    long_description = f.read()
 
 tests_requires = [
     "pytest",
@@ -58,11 +58,17 @@
 }
 
 setup(
-    name='rasa_core',
+    name='rasa-core',
     classifiers=[
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: Apache Software License",
+        # supported python versions
+        "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6"
+        "Topic :: Software Development :: Libraries",
     ],
     packages=find_packages(exclude=["tests", "tools"]),
     version=__version__,
@@ -72,16 +78,23 @@
     include_package_data=True,
     description="Machine learning based dialogue engine "
                 "for conversational software.",
-    long_description=readme,
+    long_description=long_description,
+    long_description_content_type="text/markdown",
     author='Rasa Technologies GmbH',
     author_email='hi@rasa.ai',
+    maintainer="Tom Bocklisch",
+    maintainer_email="tom@rasa.com",
     keywords=["nlp", "machine-learning", "machine-learning-library", "bot",
               "bots",
               "botkit", "rasa", "conversational-agents",
               "conversational-ai",
               "chatbot", "chatbot-framework", "bot-framework"],
     url="https://rasa.ai",
-    download_url="https://github.com/RasaHQ/rasa_core/archive/{}.tar.gz".format(__version__)
+    download_url="https://github.com/RasaHQ/rasa_core/archive/{}.tar.gz".format(__version__),
+    project_urls={
+        'Bug Reports': 'https://github.com/rasahq/rasa_core/issues',
+        'Source': 'https://github.com/rasahq/rasa_core',
+    },
 )
 
 print("\nWelcome to Rasa Core!")