diff --git a/.github/workflows/sphinx-build.yml b/.github/workflows/sphinx-build.yml index 739ad2c5..61dab932 100644 --- a/.github/workflows/sphinx-build.yml +++ b/.github/workflows/sphinx-build.yml @@ -1,25 +1,40 @@ name: sphinx-build +# Let's skip for now since there's an issue with the action +# I'll properly try to fix in the future on: push: - branches: [main] - pull_request: - branches: [main] + branches-ignore: + - '**' + +# on: +# push: +# branches: [main] +# pull_request: +# branches: [main] jobs: docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: ammaraskar/sphinx-action@0.4 - with: - pre-build-command: | + - uses: actions/checkout@v2 + + - uses: actions/setup-python@v4 + with: + python-version: "3.8" + + - name: Install Python dependencies + run: | python -m pip install --upgrade pip pip install .[dali,umap,h5] --extra-index-url https://developer.download.nvidia.com/compute/redist pip install -r docs/requirements.txt - docs-folder: "docs/" - - uses: actions/upload-artifact@v1 - with: - name: DocumentationHTML - path: docs/build/html/ + + - name: Directly build sphinx + run: | + sphinx-build -b html docs/source docs/build + + - uses: actions/upload-artifact@v1 + with: + name: DocumentationHTML + path: docs/build/html/ diff --git a/.github/workflows/sphinx-linkcheck.yml b/.github/workflows/sphinx-linkcheck.yml index 04af3746..c703aba4 100644 --- a/.github/workflows/sphinx-linkcheck.yml +++ b/.github/workflows/sphinx-linkcheck.yml @@ -10,22 +10,25 @@ jobs: sphinx-linkcheck: name: linkcheck runs-on: 'ubuntu-latest' - strategy: - fail-fast: false - matrix: - python-version: ['3.9'] - steps: - uses: actions/checkout@v2 + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + - name: python dependencies run: | python -m pip install --upgrade pip pip install .[dali,umap,h5] --extra-index-url https://developer.download.nvidia.com/compute/redist pip install -r docs/requirements.txt + - name: linkcheck shell: bash -l {0} run: | cd docs && make linkcheck + - uses: actions/upload-artifact@v1 with: name: linkcheck-output.txt diff --git a/requirements.txt b/requirements.txt index c0915305..beb79b9d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ torchvision>=0.11.1 einops pytorch-lightning==1.6.4 torchmetrics==0.6.0 -lightning-bolts>=0.5.0 +lightning-bolts==0.5.0 # set with 0.5.0 for now before checking compatibility with lightning 1.7 tqdm wandb scipy diff --git a/setup.py b/setup.py index 1eec6c07..3ed157d3 100644 --- a/setup.py +++ b/setup.py @@ -48,9 +48,9 @@ def parse_requirements(path): "torch>=1.10.0", "torchvision>=0.11.1", "einops", - "pytorch-lightning==1.6.4", - "torchmetrics==0.6.0", - "lightning-bolts>=0.5.0", + "pytorch-lightning>=1.7.0, <1.9.0", + "torchmetrics>=0.6.0, <0.12.0", + "lightning-bolts>=0.6.0", "tqdm", "wandb", "scipy", @@ -61,7 +61,9 @@ def parse_requirements(path): extras_require=EXTRA_REQUIREMENTS, dependency_links=["https://developer.download.nvidia.com/compute/redist"], classifiers=[ + "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", ],