Skip to content

Commit

Permalink
Merge branch 'feature/sphinx_version_fix' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
StokesMIDE committed Feb 15, 2024
2 parents b806e05 + e702783 commit f5217b3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = 'en'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ pytest>=4.6
pytest-xdist[psutil]
mock
pytest-cov
sphinx==4.2.0
sphinx==5.0.2
scipy;python_version<"3.10"
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ def get_version(rel_path):
'pytest-xdist[psutil]',
'mock',
'pytest-cov',
'sphinx==4.2.0',
"sphinx==5.0.2",
'scipy;python_version<"3.10"',
]

DOCS_REQUIRES = [
"sphinx==4.2.0",
"sphinx==5.0.2",
"pydata-sphinx-theme==0.7.2",
"nbsphinx",
]
Expand Down

0 comments on commit f5217b3

Please sign in to comment.