Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix and test docs on Windows #2262

Merged
merged 1 commit into from May 27, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥰

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