update run-tests workflow

TOMToolkit · Mar 13, 2024 · cf90048 · cf90048
1 parent 75a2fb6
commit cf90048
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -12,17 +12,17 @@ jobs:
         python-version: '3.9'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip setuptools wheel
-        pip install -r requirements.txt -vvv
-        pip install -I flake8
+        python -m pip install --upgrade pip
+        python -m pip install poetry
+        poetry install --with lint
     - name: Style Checks
-      run: flake8 tom_* --exclude=*/migrations/* --max-line-length=120
+      run: poetry run flake8 tom_* --exclude=*/migrations/* --max-line-length=120
 
   run_tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v2
@@ -31,11 +31,12 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip setuptools wheel
-          pip install -r requirements.txt coverage coveralls
-          pip install -I flake8
+          python -m pip install --upgrade pip
+          python -m pip install poetry
+          poetry env info  # display poetry's env info for debugging
+          poetry install  --with test,coverage,lint
       - name: Run Tests
-        run: python tom_fink/tests/run_tests.py
+        run: poetry run python tom_fink/tests/run_tests.py
 
   publish_coverage:
     runs-on: ubuntu-latest
@@ -47,11 +48,11 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          pip install -r requirements.txt coverage coveralls
-          pip install -I flake8
+          python -m pip install poetry
+          poetry install --with test,coverage,lint
       - name: Run Tests
-        run: coverage run --include=tom_fink/fink.py tom_fink/tests/run_tests.py
+        run: poetry run coverage run --include=tom_fink/fink.py tom_fink/tests/run_tests.py
       - name: Report Coverage
-        run: coveralls
+        run: poetry run coveralls
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,6 +28,10 @@ Markdown = "^3.5.2"
 [tool.poetry.group.test.dependencies]
 factory_boy = ">=3.1,<3.3"
 
+[tool.poetry.group.coverage.dependencies]
+coverage = "~6" # coveralls needs ~6 even though 7.3.2 is latest
+coveralls = "~3"
+
 [tool.poetry.group.lint.dependencies]
 flake8 = ">=6.0,<7.1"