Skip to content
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
60 changes: 1 addition & 59 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,62 +58,4 @@ jobs:

- name: Run tests
run: |
pytest

build-docs:
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
permissions:
contents: read
pages: write
id-token: write

concurrency:
group: "pages"
cancel-in-progress: false

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.9'

- name: Install uv
run: |
pip install uv

- name: Create virtual environment
run: |
uv venv

- name: Install dependencies with uv
run: |
uv pip install ."[docs]"

- name: Build docs
run: |
uv run python -m sphinx -b html docs/source docs/build/html

- name: List files in docs/build/html
run: |
ls -la docs/build/html

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: 'docs/build/html'
name: github-pages

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
timeout: 600000
error_count: 10
reporting_interval: 5000
artifact_name: github-pages
preview: false
pytest
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ identifiers:
value: 'https://github.com/cdtools-developers/cdtools'
description: Github Repository
repository-code: 'https://github.com/cdtools-developers/cdtools'
url: 'https://cdtools-developers.github.io/cdtools/'
url: 'https://cdtools.readthedocs.io'
abstract: >-
CDTools is a python library for ptychography and CDI
reconstructions, using an Automatic Differentiation based
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ model.compare(dataset) # See how the simulated and measured patterns compare
plt.show()
```

Further documentation is found [here](https://cdtools-developers.github.io/cdtools/).

Instructions for building custom documentation based on a specific version or commit can be found [here](https://github.com/cdtools-developers/cdtools/blob/master/docs/build_custom_docs.md).
Further documentation is found [here](https://cdtools.readthedocs.io).

# Installation

Expand Down
2 changes: 1 addition & 1 deletion docs/build_custom_docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This is a short description how to build custom documentation with `sphinx` base

This requires a cloned version of `cdtools` from GitHub. See the installation guide for more information:

https://cdtools-developers.github.io/cdtools/installation.html#option-2-installation-from-source
https://cdtools.readthedocs.io/en/stable/installation.html#option-2-installation-from-source


## Installation of Dependencies
Expand Down
34 changes: 0 additions & 34 deletions docs/publish

This file was deleted.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ classifiers = [
"Operating System :: OS Independent",
"License :: OSI Approved :: MIT License"
]
urls = { "Homepage" = "https://github.com/cdtools-developers/cdtools", "Documentation" = "https://cdtools-developers.github.io/cdtools/" }
urls = { "Homepage" = "https://github.com/cdtools-developers/cdtools", "Documentation" = "https://cdtools.readthedocs.io" }
dependencies = [
"numpy>=1.0",
"scipy>=1.0",
Expand Down
Loading