Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,4 @@ ci/slurm/environment.yml
ci/pbs/environment.yml
ci/sge/environment.yml
ci/htcondor/environment.yml
docs/generated/
2 changes: 1 addition & 1 deletion dask_jobqueue/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ def __init__(
job_kwargs["interface"] = interface
job_kwargs["protocol"] = protocol
job_kwargs["security"] = self._get_worker_security(security)

self.queue = queue
if queue is not None:
job_kwargs["queue"] = queue
Expand Down
13 changes: 2 additions & 11 deletions docs/requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
distributed
numpydoc
ipython
sphinx<5
sphinx>=8
sphinx-reredirects
dask-sphinx-theme>=3.0.0
# FIXME: This workaround is required until we have sphinx>=5, as enabled by
# dask-sphinx-theme no longer pinning sphinx-book-theme==0.2.0. This is
# tracked in https://github.com/dask/dask-sphinx-theme/issues/68.
#
sphinxcontrib-applehelp<1.0.5
sphinxcontrib-devhelp<1.0.6
sphinxcontrib-htmlhelp<2.0.5
sphinxcontrib-serializinghtml<1.1.10
sphinxcontrib-qthelp<1.0.7
dask-sphinx-theme>=4.0.0
5 changes: 2 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ["sphinx.ext.autodoc", "sphinx.ext.intersphinx", "sphinx.ext.mathjax"]
extensions = [
"sphinx.ext.autodoc",
"sphinx.ext.mathjax",
Expand Down Expand Up @@ -210,6 +209,6 @@
# Link to GitHub issues and pull requests using :pr:`1234` and :issue:`1234`
# syntax
extlinks = {
"issue": ("https://github.com/dask/dask-jobqueue/issues/%s", "GH#"),
"pr": ("https://github.com/dask/dask-jobqueue/pull/%s", "GH#"),
"issue": ("https://github.com/dask/dask-jobqueue/issues/%s", "GH#%s"),
"pr": ("https://github.com/dask/dask-jobqueue/pull/%s", "GH#%s"),
}
2 changes: 1 addition & 1 deletion readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: 2
build:
os: "ubuntu-22.04"
tools:
python: "3.10"
python: "3.12"

sphinx:
configuration: docs/source/conf.py
Expand Down
Loading