Skip to content

Commit f69555f

Browse files
authored
Merge branch 'develop' into feature-slide-info
2 parents 02747bb + db54592 commit f69555f

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ recursive-include tests *
88
recursive-exclude * __pycache__
99
recursive-exclude * *.py[co]
1010

11-
recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
11+
recursive-include docs *.md *.rst conf.py Makefile make.bat *.jpg *.png *.gif

setup.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ universal = 1
1818
exclude = docs
1919

2020
[aliases]
21-
# Define setup.py command aliases here
2221
test = pytest
2322

2423
[tool:pytest]
2524
collect_ignore = ['setup.py']
26-

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
setup(
2626
author="TIA Lab",
2727
author_email="tialab@dcs.warwick.ac.uk",
28+
2829
python_requires=">=3.6",
2930
classifiers=[
3031
"Development Status :: 2 - Pre-Alpha",

tests/test_tiatoolbox.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,4 @@ def test_command_line_slide_info():
8080
],
8181
)
8282
assert slide_info_result.exit_code == 0
83+

0 commit comments

Comments
 (0)