Skip to content

Commit 32f0e95

Browse files
author
Sylvain MARIE
committed
Removed useless pytest-cov dependency
Fixed pytest-html version Got rid of pypandoc
1 parent 93e1aea commit 32f0e95

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

ci_tools/requirements-pip.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# --- to execute setup.py whatever the goal
2-
pypandoc
32
pytest-runner
43
setuptools_scm
54
stdlib_list
@@ -11,8 +10,8 @@ pytest_cases
1110
makefun==1.6.8
1211

1312
# --- to generate the reports (see scripts in ci_tools, called by .travis)
14-
pytest-cov==2.6.0 # after 2.6.1 it requires pytest 3.6
15-
pytest-html #$PYTEST_HTML_VERSION
13+
# pytest-cov==2.6.0 # after 2.6.1 it requires pytest 3.6
14+
pytest-html==1.9.0 # otherwise requires pytest 5
1615
xunitparser
1716

1817
# --- to generate the doc (see .travis)

setup.py

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
INSTALL_REQUIRES = ['stdlib_list', 'setuptools_scm', 'functools32;python_version<"3.2"',
1515
'scandir;python_version<"3.2"', 'pathlib2;python_version<"3.2"']
1616
DEPENDENCY_LINKS = []
17-
SETUP_REQUIRES = ['pytest-runner', 'setuptools_scm', 'pypandoc', 'pandoc']
18-
TESTS_REQUIRE = ['pytest', 'pytest-logging', 'pytest-cov', 'pytest-cases>=1.10.1',
17+
SETUP_REQUIRES = ['pytest-runner', 'setuptools_scm']
18+
TESTS_REQUIRE = ['pytest', 'pytest-logging', 'pytest-cases>=1.10.1',
1919
'makefun==1.6.8' # we use that precise version because it does not have the __version__ attribute.
2020
]
2121
EXTRAS_REQUIRE = {}
@@ -40,19 +40,11 @@
4040

4141
KEYWORDS = 'module version source binary package library PEP345 PEP396 PEP427 pkg_resources setuptools wheel egg ' \
4242
'egg-info scm git svn'
43-
# --Get the long description from the README file
44-
# with open(path.join(here, 'README.md'), encoding='utf-8') as f:
45-
# LONG_DESCRIPTION = f.read()
46-
try:
47-
import pypandoc
48-
LONG_DESCRIPTION = pypandoc.convert(path.join(here, 'docs', 'long_description.md'), 'rst').replace('\r', '')
49-
except(ImportError):
50-
from warnings import warn
51-
warn('WARNING pypandoc could not be imported - we recommend that you install it in order to package the '
52-
'documentation correctly')
53-
LONG_DESCRIPTION = open('README.md').read()
54-
55-
# ************* VERSION A **************
43+
44+
with open(path.join(here, 'docs', 'long_description.md')) as f:
45+
LONG_DESCRIPTION = f.read()
46+
47+
# ************* VERSION **************
5648
# --Get the Version number from VERSION file, see https://packaging.python.org/single_source_version/ option 4.
5749
# THIS IS DEPRECATED AS WE NOW USE GIT TO MANAGE VERSION
5850
# with open(path.join(here, 'VERSION')) as version_file:
@@ -63,6 +55,7 @@
6355
name=DISTNAME,
6456
description=DESCRIPTION,
6557
long_description=LONG_DESCRIPTION,
58+
long_description_content_type='text/markdown',
6659

6760
# Versions should comply with PEP440. For a discussion on single-sourcing
6861
# the version across setup.py and the project code, see

0 commit comments

Comments
 (0)