Skip to content

Commit

Permalink
Merge branch 'master' into domains
Browse files Browse the repository at this point in the history
# Conflicts:
#	sphinx/domains/__init__.py
  • Loading branch information
AA-Turner committed Aug 16, 2024
2 parents 0bbc43d + c9d3414 commit cea0e97
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion sphinx/testing/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def if_graphviz_found(app: SphinxTestApp) -> None: # NoQA: PT004


@pytest.fixture(scope='session')
def sphinx_test_tempdir(tmp_path_factory: Any) -> Path:
def sphinx_test_tempdir(tmp_path_factory: pytest.TempPathFactory) -> Path:
"""Temporary directory."""
return tmp_path_factory.getbasetemp()

Expand Down
2 changes: 1 addition & 1 deletion sphinx/testing/path.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def read_bytes(self) -> builtins.bytes:
with open(self, mode='rb') as f:
return f.read()

def write_bytes(self, bytes: str, append: bool = False) -> None:
def write_bytes(self, bytes: bytes, append: bool = False) -> None:
"""
Writes the given `bytes` to the file.
Expand Down
2 changes: 1 addition & 1 deletion sphinx/util/parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
logger = logging.getLogger(__name__)

# our parallel functionality only works for the forking Process
parallel_available = multiprocessing and os.name == 'posix'
parallel_available = HAS_MULTIPROCESSING and os.name == 'posix'


class SerialTasks:
Expand Down

0 comments on commit cea0e97

Please sign in to comment.