Skip to content

update RTD config, move doc deps into their own group, update dev group #2381

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

Merged
merged 5 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
12 changes: 6 additions & 6 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Install Node Dependencies
run: make npm-ci
- name: Run Linters
Expand All @@ -141,7 +141,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- uses: pre-commit/[email protected]
test-functional:
name: Functional Tests
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Install Ubuntu Dependencies
run: |
sudo apt update -y
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Install Node Dependencies
run: make npm-install
- name: Configure Pagefile # avoid MemoryError during tests
Expand Down Expand Up @@ -266,7 +266,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Run Build
run: make build
- name: Upload Distribution Artifact
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/on-push-pyinstaller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Run Build
run: make build-pyinstaller-file
- name: Upload Artifacts
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Run Build
run: make build-pyinstaller-folder
- name: Upload Artifacts
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Download Artifacts (macOS)
if: steps.check_distance.outcome == 'success'
uses: actions/download-artifact@v4
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Run Build
run: make build-pyinstaller-file
- name: Upload Artifacts
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Run Build
run: make build-pyinstaller-folder
- name: Upload Artifacts
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Download Artifacts (macOS)
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Run Build
run: make build
- name: Upload Distribution Artifact
Expand Down Expand Up @@ -282,7 +282,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- run: make version
- name: Publish Distribution 📦 to PyPI
env:
Expand Down Expand Up @@ -349,7 +349,7 @@ jobs:
- name: Ensure Cache Is Healthy
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- run: poetry install --extras docs -vv
- run: poetry install -vv
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down
13 changes: 12 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,20 @@ version: 2

# Set the version of Python and other tools you might need
build:
jobs:
post_create_environment:
# Install poetry
# https://python-poetry.org/docs/#installing-manually
- pip install poetry
post_install:
# Install dependencies with 'docs' dependency group
# https://python-poetry.org/docs/managing-dependencies/#dependency-groups
# VIRTUAL_ENV needs to be set manually for now.
# See https://github.com/readthedocs/readthedocs.org/pull/11152/
- VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH poetry install --with docs,types
os: ubuntu-22.04
tools:
python: '3.9'
python: '3.12'

# Optionally build your docs in additional formats such as PDF and ePub
formats: all
Expand Down
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"restructuredtext"
],
"cSpell.enabled": true,
"esbonio.sphinx.buildDir": "${workspaceRoot}/docs/build",
"esbonio.sphinx.confDir": "${workspaceFolder}/docs/source",
"explorerExclude.backup": null,
"files.exclude": {
"**/*.egg-info": true,
Expand Down
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,7 @@ setup: setup-poetry setup-pre-commit setup-npm ## setup development environment
setup-npm: npm-ci ## install node dependencies with npm

setup-poetry: ## setup python virtual environment
@poetry install \
--extras docs \
--sync
@poetry install --sync

setup-pre-commit: ## install pre-commit git hooks
@poetry run pre-commit install
Expand Down
41 changes: 19 additions & 22 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading