From 52a878c1b430fabbb26951d10d503f2d5aadf2b9 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Tue, 28 Nov 2023 18:24:42 -0600 Subject: [PATCH] fix rtd --- .readthedocs.yml | 27 --------------------------- docs/.readthedocs.yaml | 20 ++++++++++++++++++++ dodo.py | 3 +-- 3 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 .readthedocs.yml create mode 100644 docs/.readthedocs.yaml diff --git a/.readthedocs.yml b/.readthedocs.yml deleted file mode 100644 index bb72b3d..0000000 --- a/.readthedocs.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: 2 -build: - os: ubuntu-20.04 - tools: - python: mambaforge-4.10 - jobs: - pre_build: - - |- - JPYK_ALLOW_NO_CONFIG=1 - doit bootstrap - - |- - ls jupyak_config.* - && JPYK_LOG_JSON=work/build/logs/git.json - doit shave:git:* - - |- - ls jupyak_config.* - && JPYK_LOG_JSON=work/build/logs/shave.json - doit shave - - |- - JPYK_ALLOW_NO_CONFIG=1 - doit self:graph -sphinx: - builder: html - configuration: docs/conf.py - fail_on_warning: true -conda: - environment: .binder/environment.yml diff --git a/docs/.readthedocs.yaml b/docs/.readthedocs.yaml new file mode 100644 index 0000000..204b790 --- /dev/null +++ b/docs/.readthedocs.yaml @@ -0,0 +1,20 @@ +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: mambaforge-22.9 + jobs: + pre_build: + - JPYK_ALLOW_NO_CONFIG=1 doit bootstrap + - ls jupyak_config.* && JPYK_LOG_JSON=work/build/logs/git.json doit shave:git:* + - ls jupyak_config.* && JPYK_LOG_JSON=work/build/logs/shave.json doit shave + - JPYK_ALLOW_NO_CONFIG=1 doit self:graph + +sphinx: + builder: html + configuration: docs/conf.py + fail_on_warning: true + +conda: + environment: .binder/environment.yml diff --git a/dodo.py b/dodo.py index 775c09b..c52f032 100644 --- a/dodo.py +++ b/dodo.py @@ -54,7 +54,6 @@ class E: WORK_DIR = os.environ.get("JPYK_WORK_DIR", "work") LOG_NAME = os.environ.get("JPYK_LOG_NAME") CI = bool(json.loads(os.environ.get("CI", "0").lower())) - CONDA_PREFIX = os.environ.get("CONDA_PREFIX") class P: @@ -62,7 +61,7 @@ class P: ROOT = DODO.parent PPT = ROOT / "pyproject.toml" ENV_YAML = ROOT / ".binder/environment.yml" - ENV = Path(E.CONDA_PREFIX if (E.CI or E.RTD or E.BINDER) else ROOT / ".venv") + ENV = Path(sys.prefix if (E.CI or E.RTD or E.BINDER) else ROOT / ".venv") HISTORY = ENV / "conda-meta/history" LOGS = ROOT / E.WORK_DIR / "build/logs"