Skip to content

Commit 61ee265

Browse files
committed
Merge branch 'feature/rtd-updates' into feature/post-buff-worms
Closes #464 [ENG-8425]
2 parents 2b2d53a + cba670b commit 61ee265

File tree

4 files changed

+30
-14
lines changed

4 files changed

+30
-14
lines changed

docs/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
master_doc = "index"
1111

1212
project = "WaterButler"
13-
copyright = "2018, Center For Open Science"
13+
copyright = "2025, Center For Open Science"
1414

1515

1616
version = release = __version__
@@ -66,4 +66,3 @@
6666
if not on_rtd:
6767
import sphinx_rtd_theme
6868
html_theme = 'sphinx_rtd_theme'
69-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

docs/gettingstarted.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,23 @@ Getting Started
44
Setting Up
55
----------
66

7-
Make sure that you are using >= python3.5 and install invoke for your current python3 version.
7+
Make sure that you are using >= python3.13 and install poetry to manage dependencies.
88

99
.. code-block:: bash
1010
11-
pip install setuptools==37.0.0
12-
pip install invoke==0.13.0
11+
pip install poetry==2.1.2
1312
1413
Install requirements
1514

1615
.. code-block:: bash
1716
18-
invoke install
17+
poetry install
1918
2019
Or for some nicities (like tests)
2120

2221
.. code-block:: bash
2322
24-
invoke install --develop
23+
poetry install --with dev
2524
2625
2726
Start the server
@@ -34,7 +33,7 @@ Start the server
3433
3534
.. code-block:: bash
3635
37-
invoke server
36+
poetry run invoke server
3837
3938
Start the celery worker
4039

@@ -44,7 +43,7 @@ Start the celery worker
4443
4544
.. code-block:: bash
4645
47-
invoke celery
46+
poetry run invoke celery
4847
4948
Contributing
5049
------------
@@ -67,5 +66,6 @@ Make sure that you already have dev-requirements
6766

6867
.. code-block:: bash
6968
70-
invoke test
69+
poetry install --with dev
70+
poetry run invoke test
7171

readthedocs.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
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_install:
9+
# Install poetry
10+
# https://python-poetry.org/docs/#installing-manually
11+
- pip install poetry
12+
# Install dependencies with 'docs' dependency group
13+
# https://python-poetry.org/docs/managing-dependencies/#dependency-groups
14+
# VIRTUAL_ENV needs to be set manually for now.
15+
# See https://github.com/readthedocs/readthedocs.org/pull/11152/
16+
- VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH poetry install --with docs
17+
18+
sphinx:
19+
configuration: docs/conf.py

waterbutler/providers/s3/provider.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,8 @@ async def revisions(self, path, **kwargs):
853853
"""Get past versions of the requested key
854854
855855
:param str path: The path to a key
856-
:rtype list:
856+
:rtype: list
857+
857858
Docs: https://boto3.amazonaws.com/v1/documentation/api/1.28.0/reference/services/s3/client/list_object_versions.html
858859
"""
859860
await self._check_region()

0 commit comments

Comments
 (0)