From 9b4b4d4eb81e16783eb3f21bea6c997d560c0cbe Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Sat, 6 May 2023 17:33:37 +0200 Subject: [PATCH] [chore] update readthedocs deps, use conda (#1742) * [chore] update readthedocs deps, use conda * work this time thx --- .gitignore | 3 ++ .readthedocs.yaml | 14 +++++--- docs/environment.yml | 83 ++++++------------------------------------- docs/requirements.txt | 4 --- 4 files changed, 22 insertions(+), 82 deletions(-) delete mode 100644 docs/requirements.txt diff --git a/.gitignore b/.gitignore index f2a409fc0..7b856448c 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,6 @@ shell.nix # ignore config dirs from IDEs /.idea/ /.fleet/ + +# ignore cache dir from mkdocs serve +/.cache diff --git a/.readthedocs.yaml b/.readthedocs.yaml index f4d354218..e7be47aa6 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -5,9 +5,13 @@ # Required version: 2 -mkdocs: - configuration: mkdocs.yml +build: + os: "ubuntu-20.04" + tools: + python: "mambaforge-4.10" # https://docs.readthedocs.io/en/stable/guides/conda.html#making-builds-faster-with-mamba -python: - install: - - requirements: docs/requirements.txt +mkdocs: + configuration: "mkdocs.yml" + +conda: + environment: "docs/environment.yml" diff --git a/docs/environment.yml b/docs/environment.yml index 8fccf61ef..b7ba5fe14 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -1,77 +1,14 @@ name: gotosocial-docs channels: - - defaults + - conda-forge + - nodefaults dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - bzip2=1.0.8=h7b6447c_0 - - ca-certificates=2023.01.10=h06a4308_0 - - cairo=1.16.0=h19f5f5c_2 - - certifi=2022.12.7=py310h06a4308_0 - - fontconfig=2.13.1=h6c09931_0 - - freetype=2.11.0=h70c0345_0 - - glib=2.69.1=h4ff587b_1 - - icu=58.2=he6710b0_3 - - jpeg=9e=h7f8727e_0 - - ld_impl_linux-64=2.35.1=h7274673_9 - - libffi=3.3=he6710b0_2 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libpng=1.6.37=hbc83047_0 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - libuuid=1.0.3=h7f8727e_2 - - libxcb=1.15=h7f8727e_0 - - libxml2=2.9.14=h74e7548_0 - - ncurses=6.3=h7f8727e_2 - - openssl=1.1.1t=h7f8727e_0 - - pcre=8.45=h295c915_0 - - pixman=0.40.0=h7f8727e_1 - - pycparser=2.21=pyhd3eb1b0_0 - - python=3.10.0=h151d27f_3 - - readline=8.1=h27cfd23_0 - - sqlite=3.36.0=hc218d9a_0 - - tk=8.6.11=h1ccaba5_0 - - tzdata=2021e=hda174b7_0 - - wheel=0.37.0=pyhd3eb1b0_1 - - xz=5.2.5=h7b6447c_0 - - zlib=1.2.12=h7f8727e_2 + - python=3.11.3=h2755cc3_0_cpython + - pip=23.1.2=pyhd8ed1ab_0 + - mkdocs=1.4.3=pyhd8ed1ab_0 + - mkdocs-material=9.1.9=pyhd8ed1ab_0 + - mkdocs-material-extensions=1.1.1=pyhd8ed1ab_0 + - pillow=9.5.0=py311h573f0d3_0 + - cairosvg=2.6.0=pyhd8ed1ab_0 - pip: - - beautifulsoup4==4.11.2 - - cairocffi==1.0.0 - - cairosvg==2.6.0 - - cffi==1.15.1 - - charset-normalizer==3.0.1 - - click==8.0.3 - - colorama==0.4.6 - - cssselect2==0.7.0 - - defusedxml==0.7.1 - - ghp-import==2.0.2 - - idna==3.4 - - importlib-metadata==4.8.2 - - jinja2==3.0.3 - - markdown==3.3.4 - - markupsafe==2.0.1 - - mergedeep==1.3.4 - - mkdocs==1.4.2 - - mkdocs-material==9.0.13 - - mkdocs-material-extensions==1.1.1 - - mkdocs-swagger-ui-tag==0.5.2 - - packaging==21.2 - - pillow==9.4.0 - - pip==21.2.4 - - pygments==2.14.0 - - pymdown-extensions==9.9.2 - - pyparsing==2.4.7 - - python-dateutil==2.8.2 - - pyyaml==6.0 - - pyyaml-env-tag==0.1 - - regex==2022.10.31 - - requests==2.28.2 - - setuptools==58.0.4 - - six==1.16.0 - - soupsieve==2.4 - - tinycss2==1.2.1 - - urllib3==1.26.14 - - watchdog==2.1.6 - - webencodings==0.5.1 - - zipp==3.6.0 + - mkdocs-swagger-ui-tag==0.6.1 diff --git a/docs/requirements.txt b/docs/requirements.txt deleted file mode 100644 index a8ebbb8f0..000000000 --- a/docs/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -mkdocs-material==9.0.13 -mkdocs-swagger-ui-tag==0.5.2 -CairoSVG==2.6.0 -Pillow==9.4.0