Skip to content

Commit

Permalink
Fix and test docs on Windows
Browse files Browse the repository at this point in the history
There's some weird interaction between Click and
sphinxcontrib-programoutput on Windows that leads to an encoding error
during the printing of black-primer's help text.

Also symlinks aren't well supported on Windows so let's just use
includes which actually work because we now use MyST :D
  • Loading branch information
ichard26 committed May 26, 2021
1 parent 754eecf commit 2d02f29
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 7 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/doc.yml
Expand Up @@ -11,14 +11,17 @@ jobs:
github.event_name == 'push' || github.event.pull_request.head.repo.full_name !=
github.repository

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2

- name: Set up Python 3.9
- name: Set up latest Python
uses: actions/setup-python@v2
with:
python-version: 3.9

- name: Install dependencies
run: |
Expand Down
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -25,6 +25,7 @@
- Fix typos discovered by codespell (#2228)
- Fix Vim plugin installation instructions. (#2235)
- Add new Frequently Asked Questions page (#2247)
- Fix encoding + symlink issues preventing proper build on Windows (#2262)

## 21.5b1

Expand Down
1 change: 0 additions & 1 deletion docs/authors.md

This file was deleted.

3 changes: 3 additions & 0 deletions docs/authors.md
@@ -0,0 +1,3 @@
```{include} ../AUTHORS.md
```
1 change: 0 additions & 1 deletion docs/change_log.md

This file was deleted.

3 changes: 3 additions & 0 deletions docs/change_log.md
@@ -0,0 +1,3 @@
```{include} ../CHANGES.md
```
8 changes: 7 additions & 1 deletion docs/conf.py
Expand Up @@ -12,8 +12,10 @@
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
from pathlib import Path

import os
import string
from pathlib import Path

from pkg_resources import get_distribution

Expand All @@ -29,6 +31,10 @@ def make_pypi_svg(version: str) -> None:
f.write(svg)


# Necessary so Click doesn't hit an encode error when called by
# sphinxcontrib-programoutput on Windows.
os.putenv("pythonioencoding", "utf-8")

# -- Project information -----------------------------------------------------

project = "Black"
Expand Down

0 comments on commit 2d02f29

Please sign in to comment.