Switch to pyproject.toml (#146)

Author: justusschock

.github/workflows/ci-cloud.yml

@@ -12,27 +12,7 @@ defaults:
     shell: bash
 
 jobs:
-  access-secrets:
-    # try to access secrets to ensure they are available
-    # if not set job output to be false
-    runs-on: ubuntu-latest
-    outputs:
-      secrets_available: ${{ steps.check_secrets.outputs.secrets_available }}
-    steps:
-      - name: Check secrets
-        id: check_secrets
-        run: |
-          if [[ -z "${{ secrets.LIGHTNING_USER_ID }}" || -z "${{ secrets.LIGHTNING_API_KEY }}" ]]; then
-            echo "Secrets are not set. Exiting..."
-            echo "secrets_available=false" >> $GITHUB_OUTPUT
-          else
-            echo "Secrets are available."
-            echo "secrets_available=true" >> $GITHUB_OUTPUT
-          fi
-
   integration:
-    needs: access-secrets
-    if: needs.access-secrets.outputs.secrets_available == 'true'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -49,6 +29,7 @@ jobs:
       TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
       DISABLE_MPS: ${{ matrix.os == 'macOS-14' && '1' || '0' }}
       UV_TORCH_BACKEND: "cpu"
+      LIGHTNING_CLOUD_URL: https://staging.gridai.dev
 
     steps:
       - uses: actions/checkout@v5
@@ -64,7 +45,7 @@ jobs:
         if: matrix.requires == 'oldest'
         run: |
           uv pip install 'lightning-utilities[cli]'
-          python -m lightning_utilities.cli requirements set-oldest --req_files='["requirements.txt"]'
+          python -m lightning_utilities.cli requirements set-oldest --req_files='["requirements.txt", "pyproject.toml"]'
 
       - name: Install package & dependencies
         run: |

.github/workflows/ci-testing.yml

@@ -26,11 +26,36 @@ jobs:
         python-version: ["3.10", "3.12"]
         requires: ["latest"]
         dependency: ["lightning"]
+        dependency_package: ["lightning"]
         include:
-          - { os: "ubuntu-22.04", python-version: "3.10", requires: "oldest", dependency: "lightning" }
-          - { os: "ubuntu-24.04", python-version: "3.12", requires: "latest", dependency: "pytorch_lightning" }
-          - { os: "windows-2022", python-version: "3.12", requires: "latest", dependency: "pytorch_lightning" }
-          - { os: "macOS-14", python-version: "3.12", requires: "latest", dependency: "pytorch_lightning" }
+          - {
+              os: "ubuntu-22.04",
+              python-version: "3.10",
+              requires: "oldest",
+              dependency: "lightning",
+              dependency_package: "lightning",
+            }
+          - {
+              os: "ubuntu-24.04",
+              python-version: "3.12",
+              requires: "latest",
+              dependency: "pytorch_lightning",
+              dependency_package: "pytorch-lightning",
+            }
+          - {
+              os: "windows-2022",
+              python-version: "3.12",
+              requires: "latest",
+              dependency: "pytorch_lightning",
+              dependency_package: "pytorch-lightning",
+            }
+          - {
+              os: "macOS-14",
+              python-version: "3.12",
+              requires: "latest",
+              dependency: "pytorch_lightning",
+              dependency_package: "pytorch-lightning",
+            }
 
     # Timeout: https://stackoverflow.com/a/59076067/4521646
     timeout-minutes: 35
@@ -53,16 +78,15 @@ jobs:
         if: matrix.requires == 'oldest'
         run: |
           uv pip install 'lightning-utilities[cli]'
-          python -m lightning_utilities.cli requirements set-oldest --req_files='["requirements.txt"]'
+          python -m lightning_utilities.cli requirements set-oldest --req_files='["requirements.txt", "pyproject.toml"]'
 
       - name: Adjust requirements
         run: |
           uv pip install 'lightning-utilities[cli]' -q
           python -m lightning_utilities.cli requirements replace-pkg \
             --old_package="lightning" \
-            --new_package="${{matrix.dependency}}" \
-            --req_files='["_requirements/extra.txt"]'
-          cat _requirements/extra.txt
+            --new_package="${{ matrix.dependency_package }}" \
+            --req_files='["pyproject.toml"]'
 
       - name: Install package & dependencies
         run: |

.github/workflows/docs-build.yml

@@ -6,9 +6,30 @@ on:
 
 jobs:
   build-docs:
-    uses: Lightning-AI/utilities/.github/workflows/check-docs.yml@main
-    with:
-      requirements-file: "_requirements/_docs.txt"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Install uv and set Python 3.10
+        uses: astral-sh/setup-uv@v7
+        with:
+          python-version: "3.10"
+          activate-environment: true
+          enable-cache: true
+
+      - name: Install package & docs dependencies
+        run: uv pip install -e '.[docs]'
+
+      - name: Build docs
+        env:
+          SPHINX_MOCK_REQUIREMENTS: "0"
+        run: python -m sphinx -b html -W --keep-going docs/source docs/build/html
+
+      - name: Upload prepared docs
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs-html-${{ github.sha }}
+          path: docs/build/html
 
   # https://github.com/marketplace/actions/deploy-to-github-pages
   docs-deploy:

.github/workflows/release-pypi.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          uv pip install -U -r _requirements/_ci.txt
+          uv pip install -U '.[build]'
           uv pip list
 
       - name: Build package

MANIFEST.in

@@ -5,14 +5,14 @@ recursive-exclude __pycache__  *.py[cod] *.orig
 
 # Include the README and CHANGELOG
 include *.md
+include pyproject.toml
 recursive-include src *.md
 
 # Include the license file
 include LICENSE
 
 # Exclude build configs
 exclude *.sh
-exclude *.toml
 exclude *.svg
 exclude *.yml
 exclude *.yaml
@@ -28,7 +28,6 @@ exclude docs
 
 # Include the Requirements
 include requirements.txt
-recursive-include _requirements *.tx;t
 
 # Exclude Makefile
 exclude Makefile

Makefile

@@ -6,16 +6,15 @@ export SLURM_LOCALID=0
 export SPHINX_MOCK_REQUIREMENTS=0
 
 test: clean
-	pip install -q -r requirements.txt
-	pip install -q -r _requirements/test.txt
+	pip install -q -e '.[test,extra]'
 
 	# use this to run tests
 	python -m coverage run --source litmodels -m pytest src tests -v --flake8
 	python -m coverage report
 
 docs: clean
-	pip install . --quiet -r _requirements/docs.txt
-	python -m sphinx -b html -W --keep-going docs/source docs/build
+	pip install --quiet -e '.[docs]'
+	python -m sphinx -b html -W --keep-going docs/source docs/build/html
 
 clean:
 	# clean all temp runs