Skip to content

Commit 162fed7

Browse files
author
Sylvain MARIE
committed
setup cleaned a bit: removed pypandoc dependency and pytest-cov
1 parent f56d450 commit 162fed7

2 files changed

Lines changed: 7 additions & 17 deletions

File tree

ci_tools/requirements-pip.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# --- to execute setup.py whatever the goal
22
setuptools_scm
33
pytest-runner
4-
pandoc
5-
pypandoc
64

75
# --- to install
86
requests
@@ -23,7 +21,7 @@ numpy
2321
pytest-cases
2422

2523
# --- to generate the reports (see scripts in ci_tools, called by .travis)
26-
pytest-cov==2.6.0 # after 2.6.1 it requires pytest 3.6
24+
# pytest-cov==2.6.0 # after 2.6.1 it requires pytest 3.6
2725
pytest-html==1.9.0 # otherwise requires pytest 5
2826
xunitparser
2927

setup.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
INSTALL_REQUIRES = ['makefun', 'six', 'future;python_version<"3.3"', 'funcsigs;python_version<"3.3"', 'decopatch',
1515
'functools32;python_version<"3.2"'] # 'typing_inspect' is now copied internally so as to be compliant with very old versions of typing module
1616
DEPENDENCY_LINKS = []
17-
SETUP_REQUIRES = ['pytest-runner', 'setuptools_scm', 'pypandoc', 'pandoc', 'enum34;python_version<"3.4"', 'six']
18-
TESTS_REQUIRE = ['pytest>=4.3.0', 'pytest-logging', 'pytest-cov', 'enforce', 'mini_lambda', 'attrs', 'numpy',
17+
SETUP_REQUIRES = ['pytest-runner', 'setuptools_scm', 'enum34;python_version<"3.4"', 'six']
18+
TESTS_REQUIRE = ['pytest>=4.3.0', 'pytest-logging', 'enforce', 'mini_lambda', 'attrs', 'numpy',
1919
'autoclass', 'checktypes', 'pytest-cases']
2020
EXTRAS_REQUIRE = {}
2121

@@ -42,17 +42,9 @@
4242

4343
KEYWORDS = 'decorate decorator input arg args argument function contract value check checker valid validate validator' \
4444
' validation'
45-
# --Get the long description from the README file
46-
# with open(path.join(here, 'README.md'), encoding='utf-8') as f:
47-
# LONG_DESCRIPTION = f.read()
48-
try:
49-
import pypandoc
50-
LONG_DESCRIPTION = pypandoc.convert(path.join(here, 'docs', 'long_description.md'), 'rst').replace('\r', '')
51-
except(ImportError):
52-
from warnings import warn
53-
warn('WARNING pypandoc could not be imported - we recommend that you install it in order to package the '
54-
'documentation correctly')
55-
LONG_DESCRIPTION = open('README.md').read()
45+
46+
with open(path.join(here, 'docs', 'long_description.md')) as f:
47+
LONG_DESCRIPTION = f.read()
5648

5749
# ************* VERSION **************
5850
# --Get the Version number from VERSION file, see https://packaging.python.org/single_source_version/ option 4.
@@ -65,6 +57,7 @@
6557
name=DISTNAME,
6658
description=DESCRIPTION,
6759
long_description=LONG_DESCRIPTION,
60+
long_description_content_type='text/markdown',
6861

6962
# Versions should comply with PEP440. For a discussion on single-sourcing
7063
# the version across setup.py and the project code, see
@@ -162,5 +155,4 @@
162155
# 'sample=sample:main',
163156
# ],
164157
# },
165-
166158
)

0 commit comments

Comments
 (0)