Skip to content
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

Tiansu add readthedocs.yml #27

Merged
merged 5 commits into from
Apr 5, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
21 changes: 21 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# .readthedocs.yaml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-20.04
tools:
python: "3.8"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# Optionally declare the Python requirements required to build your docs
#python:
# install:
# - requirements: requirements.txt
30 changes: 3 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,38 +38,14 @@ it = (Catalog.from_plugins()["imagenet"].get_driver()
Check out our full [getting started](https://github.com/merantix-momentum/squirrel-datasets-core/blob/main/examples/01.Getting_Started.ipynb) tutorial notebook. If you have any questions or would like to contribute, join our [Slack community](https://join.slack.com/t/squirrel-core/shared_invite/zt-14k6sk6sw-zQPHfqAI8Xq5WYd~UqgNFw).

# Installation
Currently, we have not released a functional version of `squirrel-core` and `squirrel-datasets-core` into the public
pypi registry. Therefore we ask you to use the following installation method, which uses the source code directly:

First, you need to clone the `squirrel-core` and `squirrel-datasets-core` repositories by:
```shell
git clone https://github.com/merantix-momentum/squirrel-core.git
```
and
```shell
git clone https://github.com/merantix-momentum/squirrel-datasets-core.git
```
Then you can install both packages by
You can install `squirrel-core` by
```shell
pip install -e "squirrel-core[all]"
pip install "squirrel-core[all]"
```
and
```shell
pip install -e "squirrel-datasets-core[all]"
```

In the documentation, you may also see some requirements to install the two packages first, please follow the
instruction above, instead of installing from public pypi registry (e.g `pip install squirrel-core` or
`pip install squirrel-datasets-core`). We kindly ask for your patience.

# Documentation

To view the docs locally, please use the following command in root directory of the repo:
```
sphinx-build ./docs ./docs/build
```
The command above will create all documentation pages under `./docs/build`.
To view the start page, open `./docs/build/index.html` in your browser.
Read our documentation at [ReadTheDocs](https://squirrel-core.readthedocs.io/)

# Example Notebooks
Check out the [Squirrel-datasets repository](https://github.com/merantix-momentum/squirrel-datasets-core/tree/main/examples) for open source and community-contributed tutorial and example notebooks of using Squirrel.
Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
# -- Project information -----------------------------------------------------

project = "Squirrel"
copyright = f"{datetime.datetime.now().year}, Merantix Labs GmbH"
author = "Merantix Labs GmbH"
copyright = f"{datetime.datetime.now().year}, Merantix Momentum"
author = "Merantix Momentum"


# -- General configuration ---------------------------------------------------
Expand Down Expand Up @@ -73,7 +73,7 @@
intersphinx_mapping = {
"python": ("https://docs.python.org/3/", None),
"sphinx": ("https://www.sphinx-doc.org/en/master/", None),
# TODO Add squirrel-datasets once the RTD is online.
"squirrel-datasets": ("https://squirrel-datasets-core.readthedocs.io", None),
}

# -- Options for HTML output -------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion requirements.dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pytest-xdist
Sphinx<4.0.0
sphinx_versions
sphinx_rtd_theme
sphinx-autoapi
wandb
mlflow
pre-commit==2.16.0
sphinx-autoapi
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def normalize_version(_version: str, _version_tag: str) -> str:
),
long_description=long_description,
long_description_content_type="text/markdown",
author="Merantix Labs GmbH",
author="Merantix Momentum",
license="Apache 2.0",
package_dir=PACKAGE_DIR,
packages=find_packages(),
Expand Down