From 1a51ff1ee9c119726604bf82c2d003ff82645a5c Mon Sep 17 00:00:00 2001 From: Thomas Wiecki Date: Fri, 16 Jan 2015 10:24:29 +0100 Subject: [PATCH] BLD Remove setup.py rst conversion. Add README.md as pypi description. --- setup.cfg | 3 +++ setup.py | 24 ------------------------ 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/setup.cfg b/setup.cfg index e87d4da3..a84dd821 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,3 +2,6 @@ verbosity=2 detailed-errors=1 with-ignore-docstrings=1 + +[metadata] +description-file = README.md diff --git a/setup.py b/setup.py index 464a2e7a..595e4423 100644 --- a/setup.py +++ b/setup.py @@ -13,33 +13,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import sys from setuptools import setup, find_packages -LONG_DESCRIPTION = None -README_MARKDOWN = None - -with open('README.md') as markdown_source: - README_MARKDOWN = markdown_source.read() - -if 'upload' in sys.argv: - # Converts the README.md file to ReST, since PyPI uses ReST for formatting, - # This allows to have one canonical README file, being the README.md - # The conversion only needs to be done on upload. - # Otherwise, the pandoc import and errors that are thrown when - # pandoc are both overhead and a source of confusion for general - # usage/installation. - import pandoc - pandoc.core.PANDOC_PATH = 'pandoc' - doc = pandoc.Document() - doc.markdown = README_MARKDOWN - LONG_DESCRIPTION = doc.rst -else: - # If pandoc isn't installed, e.g. when downloading from pip, - # just use the regular README. - LONG_DESCRIPTION = README_MARKDOWN - setup( name='zipline', version='0.7.0',