Skip to content

Commit 03fbb19

Browse files
committed
add missing conflict deps
1 parent f15eec7 commit 03fbb19

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ install-test: clean-build clean-pyc ## install the package and test dependencies
3939

4040
.PHONY: test
4141
test: ## run tests quickly with the default Python
42-
python -m pytest --basetemp=${ENVTMPDIR} --cov=pygridsim --cov-report xml
42+
python -m pytest --cov=pygridsim --cov-report xml
4343

4444
.PHONY: lint
4545
lint: ## check style with flake8 and isort

setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
'Sphinx>=1.7.1,<3',
3636
'sphinx_rtd_theme>=0.2.4,<0.5',
3737
'autodocsumm>=0.1.10',
38+
'mistune>=0.7,<2',
39+
'Jinja2>=2,<3.1',
40+
'markupsafe<2.1.0',
3841

3942
# style check
4043
'flake8>=3.7.7',

0 commit comments

Comments
 (0)