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

Do not attempt PDF #905

Merged
merged 1 commit into from
May 20, 2024
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ __pycache__/

docs/source/mirar*.rst
docs/source/autogen/
docs/source/extra/flowcharts/
docs/pdf/

# Distribution / packaging
bin/
build/
_build/
develop-eggs/
dist/
eggs/
Expand Down
1 change: 0 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ sphinx:
fail_on_warning: false

formats:
- pdf
- epub
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

![alt text](docs/source/extra/MIRAR_logo.png?raw=true)
![alt text](docs/source/MIRAR_logo.png?raw=true)

# Modular Image Reduction and Analysis Resource (MIRAR)

Expand Down
File renamed without changes
2 changes: 0 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@

templates_path = ["_templates"]

html_extra_path = ["extra"]

# -- Options for HTML output

html_theme = "sphinx_rtd_theme"
Expand Down
1 change: 1 addition & 0 deletions docs/source/contributors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Other people who contributed to the code include:
* Sulekha Kishore
* Saarah Hall
* Benjamin Roulston
* Jamie Soon

We especially thank Saarah for her suggestion of the code name, and Ben for creating the logo.

Expand Down
10 changes: 3 additions & 7 deletions mirar/utils/docs/auto_config_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,13 @@

from mirar.pipelines import Pipeline, get_pipeline
from mirar.utils.docs.pipeline_visualisation import (
docs_extra_dir,
docs_source_dir,
base_autogen_dir,
get_save_path,
iterate_flowify,
)

logger = logging.getLogger(__name__)

base_autogen_dir = docs_source_dir / "autogen"
base_autogen_dir.mkdir(parents=True, exist_ok=True)


def get_rst_pipeline_path(pipeline: str) -> Path:
"""
Expand Down Expand Up @@ -140,7 +136,7 @@ def auto_rst_config(pipeline: str, config: str):
if not image_path.exists():
iterate_flowify(config=config, pipelines=[pipeline])

relative_image_path = image_path.relative_to(docs_extra_dir)
relative_image_path = image_path.relative_to(base_autogen_dir)

with open(output_path, "w", encoding="utf8") as output_file:
doc = RstCloth(output_file)
Expand All @@ -155,7 +151,7 @@ def auto_rst_config(pipeline: str, config: str):
)
)
doc.newline()
doc.content(f".. image:: ../../{relative_image_path}")
doc.content(f".. image:: {relative_image_path}")
doc.newline()


Expand Down
6 changes: 3 additions & 3 deletions mirar/utils/docs/pipeline_visualisation.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@

docs_source_dir = doc_dir / "source"

docs_extra_dir = docs_source_dir / "extra"
docs_extra_dir.mkdir(exist_ok=True)
base_autogen_dir = docs_source_dir / "autogen"
base_autogen_dir.mkdir(parents=True, exist_ok=True)

flowchart_dir = docs_extra_dir / "flowcharts"
flowchart_dir = base_autogen_dir / "flowcharts"
flowchart_dir.mkdir(exist_ok=True)


Expand Down
148 changes: 52 additions & 96 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ wintertoo = "^1.5.0"
scipy = "^1.12.0"
python-dotenv = "^1.0.1"
pyarrow = ">=15.0.2,<17.0.0"
torch = "=2.3.0"
torch = "==2.2.2"
winterrb = "^1.0.0"

[tool.poetry.group.docs.dependencies]
Expand Down
Loading