Skip to content

Commit

Permalink
Merge 2225cba into b429a25
Browse files Browse the repository at this point in the history
  • Loading branch information
roksys committed Jul 22, 2019
2 parents b429a25 + 2225cba commit f135c4f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
'https://docs.python.org/': None,
'flask': ('http://flask.pocoo.org/docs/0.12', None),
'flask': ('https://flask.palletsprojects.com', None),
}

# Autodoc configuraton.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
'pydocstyle>=1.0.0',
'pytest-cov>=1.8.0',
'pytest-pep8>=1.0.6',
'pytest>=2.8.3',
'pytest>=3.8.0,<5.0.0',
]

extras_require = {
Expand Down

0 comments on commit f135c4f

Please sign in to comment.