Skip to content

Commit

Permalink
switch README.md processing
Browse files Browse the repository at this point in the history
  • Loading branch information
wumpus committed May 24, 2020
1 parent 91e3144 commit 6d514ee
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ pur==5.3.0
coverage==5.1
pylint==2.5.2
pytest==5.4.2
pytest-cov==2.8.1
pytest-cov==2.9.0
pytest-sugar==0.9.3
coveralls==2.0.0

# packaging
wheel==0.34.2
twine<2 # for python 3.5
pypandoc==1.5
setuptools==46.4.0
setuptools_scm==3.5.0
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python

import sys
from os import path

from setuptools import setup
from setuptools.command.test import test as TestCommand
Expand Down Expand Up @@ -44,17 +45,16 @@ def run_tests(self):
'scripts/run-player-turn',
'scripts/run-qa-tests']

try:
import pypandoc
description = pypandoc.convert_file('README.md', 'rst')
except (IOError, ImportError):
description = open('README.md').read()
this_directory = path.abspath(path.dirname(__file__))
with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
description = f.read()

setup(
name='olypy',
use_scm_version=True,
description='Python code to assist the game Olympia',
long_description=description,
long_description_content_type='text/markdown',
author='Greg Lindahl and others',
author_email='lindahl@pbm.com',
url='https://github.com/olympiag3/olypy',
Expand Down

0 comments on commit 6d514ee

Please sign in to comment.