Merge pull request #29 from aai-institute/cleanup

Dependency cleanup

Author: janwillemkl

.github/workflows/test-and-lint.yaml

@@ -25,11 +25,11 @@ jobs:
           python-version: 3.11
           cache: pip
           cache-dependency-path: |
-            requirements.txt
+            requirements-dev.txt
             pyproject.toml
       - name: Install dependencies
         run: |
-          pip install -r requirements.txt
+          pip install -r requirements-dev.txt
           pip install -e . --no-deps
       - name: Cache pre-commit tools
         uses: actions/cache@v4
@@ -38,7 +38,7 @@ jobs:
             ${{ env.MYPY_CACHE_DIR }}
             ${{ env.RUFF_CACHE_DIR }}
             ${{ env.PRE_COMMIT_HOME }}
-          key: ${{ hashFiles('requirements.txt', '.pre-commit-config.yaml') }}-linter-cache
+          key: ${{ hashFiles('requirements-dev.txt', '.pre-commit-config.yaml') }}-linter-cache
       - name: Run pre-commit checks
         run: pre-commit run --all-files --verbose --show-diff-on-failure
   test:
@@ -47,15 +47,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest ]
+        os: [ubuntu-latest]
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up oldest supported Python on ${{ matrix.os }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.10'
-    - name: Run tests on oldest supported Python
-      run: |
-        python -m pip install -r requirements.txt
-        python -m pip install .
-        pytest
+      - uses: actions/checkout@v4
+      - name: Set up oldest supported Python on ${{ matrix.os }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      - name: Run tests on oldest supported Python
+        run: |
+          pip install -r requirements-dev.txt
+          pip install -e . --no-deps
+          pytest

.pre-commit-config.yaml

@@ -12,13 +12,13 @@ repos:
       - id: end-of-file-fixer
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.1
+    rev: v0.5.1
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        args: [--fix]
       - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
+    rev: v1.10.1
     hooks:
       # See https://github.com/pre-commit/mirrors-mypy/blob/main/.pre-commit-hooks.yaml
       - id: mypy

example_mnist_tf.py

@@ -10,7 +10,7 @@
         image=ImageOptions(
             spec=Path("example-docker.yaml"), name="localhost:5000/tf-example"
         ),
-        resources=ResourceOptions(memory="1Gi", cpu="2", gpu=1 if USE_GPU else None),
+        resources=ResourceOptions(memory="2Gi", cpu="2", gpu=1 if USE_GPU else None),
     )
 )
 def mnist_train() -> None:

pyproject.toml

@@ -8,15 +8,19 @@ description = ""
 version = "0.1.0"
 readme = "README.md"
 requires-python = ">=3.10"
-# TODO: Ray >=2.11 is missing Linux aarch64 wheels, replace when available (blocks Mac ARM64)
-dependencies = ["docker", "kubernetes", "ray[train,default]==2.10.0", "tensorflow"]
+dependencies = [
+    "docker",
+    "kubernetes",
+    "ray[train,default]==2.32.0",
+    "tensorflow",
+]
 
 [project.scripts]
 jobs_execute = "jobs.execute:execute"
 jobby = "jobs.cli:main"
 
 [project.optional-dependencies]
-dev = ["black", "ruff", "ruff-lsp", "pytest", "pre-commit"]
+dev = ["ruff", "pytest", "pre-commit"]
 
 [tool.ruff]
 src = ["src"]