Skip to content

Commit

Permalink
Fix issue with Python sphinx installation (#272)
Browse files Browse the repository at this point in the history
* Low-effort attempts to fix Windows builds.

* It's early.

* Test w/out sphinx.

* Move sphinx installation to different file & target.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
ivanklee86 and pre-commit-ci[bot] authored Sep 11, 2023
1 parent 7865dae commit 3645ecb
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up Python 3.7
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: "3.7"
python-version: "3.8"
- name: Install packages
run: |
make install
Expand All @@ -35,9 +35,9 @@ jobs:
os: [ubuntu-latest, macos-latest, windows-latest]
python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: Install Tox and any other packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
python-version: 3.9
- name: Install dependencies
run: |
make install
make install-docs
- name: Build docs
run: |
cd docs
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ install:
pip install . && \
./scripts/get-spec.sh

install-docs: install
pip install -U -r requirements-docs.txt

#-----------------------------------------------------------------------
# Testing & Linting
#-----------------------------------------------------------------------
Expand Down
6 changes: 6 additions & 0 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# - Docs
enum-tools[sphinx]
m2r2
sphinx==7.2.5
sphinx-rtd-theme
autodocsumm==0.2.11
6 changes: 0 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,5 @@ build
setuptools_scm
twine

# - Docs
enum-tools[sphinx]
m2r2
sphinx
sphinx-rtd-theme

# - Typing
types-requests

0 comments on commit 3645ecb

Please sign in to comment.