Skip to content

Commit 6498822

Browse files
committed
Merge branch 'feature/rtd-updates' into feature/buff-worms
Closes #403 [ENG-8427]
2 parents 7d7caad + 3fa803e commit 6498822

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

docs/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
# General information about the project.
4848
project = 'mfr'
49-
copyright = '2023, Center For Open Science'
49+
copyright = '2025, Center For Open Science'
5050

5151
# The version info for the project you're documenting, acts as replacement for
5252
# |version| and |release|, also used in various other places throughout the
@@ -184,4 +184,3 @@
184184
if not on_rtd:
185185
import sphinx_rtd_theme
186186
html_theme = 'sphinx_rtd_theme'
187-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

docs/extensions.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ CodePygmentsRenderer
1111

1212
.. autoclass:: mfr.extensions.codepygments.CodePygmentsRenderer
1313

14-
DocxRenderer
15-
------------
16-
17-
.. autoclass:: mfr.extensions.docx.DocxRenderer
18-
1914
ImageExporter
2015
-------------
2116

docs/install.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,25 @@ Or download one of the following:
1414
* tarball_
1515
* zipball_
1616

17-
Make sure that you have installed `pspp <https://www.gnu.org/software/pspp/>`_ and are using python 3.5 or greater.
17+
Make sure that you have installed `pspp <https://www.gnu.org/software/pspp/>`_ and are using python v3.13 or greater.
1818

19-
Install the versions of ``setuptools`` and ``invoke`` found in the requirements.txt file:
19+
Install ``poetry`` to manage dependencies:
2020

2121
.. code-block:: bash
2222
23-
pip install setuptools==37.0.0
24-
pip install invoke==0.13.0
23+
pip install poetry==2.1.2
2524
2625
Install requirements:
2726

2827
.. code-block:: bash
2928
30-
invoke install
29+
poetry install
3130
3231
Or for some nicities (like tests):
3332

3433
.. code-block:: bash
3534
36-
invoke install --develop
35+
poetry install --with dev
3736
3837
Start the server:
3938

@@ -45,7 +44,7 @@ Start the server:
4544
4645
.. code-block:: bash
4746
48-
invoke server
47+
poetry run invoke server
4948
5049
.. _Github: https://github.com/CenterForOpenScience/modular-file-renderer
5150
.. _tarball: https://github.com/CenterForOpenScience/modular-file-renderer/tarball/master

readthedocs.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1-
requirements_file: doc-requirements.txt
2-
python:
3-
setup_py_install: true
1+
version: 2
2+
3+
build:
4+
os: ubuntu-24.04
5+
tools:
6+
python: "3.13"
7+
jobs:
8+
post_create_environment:
9+
- pip install poetry
10+
post_install:
11+
- VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH poetry install --with docs
12+
13+
sphinx:
14+
configuration: docs/conf.py
15+
16+
formats:
17+
- pdf
18+
- epub

0 commit comments

Comments
 (0)