More CI Cleanup (#249)

Author: blink1073

.github/workflows/downstream.yml

@@ -21,5 +21,4 @@ jobs:
         uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
         with:
           package_name: jupyterlab
-          package_spec: "\".[test]\""
           test_command: "python -m jupyterlab.browser_check --no-browser-test"

.github/workflows/tests.yml

@@ -9,20 +9,23 @@ on:
 
 jobs:
   test:
-    name: ${{ matrix.platform }} ${{ matrix.python_version }}
-    runs-on: ${{ matrix.platform }}-latest
+    name: ${{ matrix.os }} ${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
     env:
       CI: True
-      PYTHON_VERSION: ${{ matrix.python_version }}
       CODECOV_TOKEN: e025254a-fe54-4914-8890-0c26e7aa0d07
     strategy:
       fail-fast: false
       matrix:
-        python_version: ['3.7', '3.10', 'pypy-3.7']
-        platform: ['ubuntu', 'macos',  'windows']
-        exclude:
-        - platform: windows
-          python_version: pypy3
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python_version: ["3.7", "3.10"]
+        include:
+          - os: windows-latest
+            python-version: "3.9"
+          - os: ubuntu-latest
+            python-version: "pypy-3.7"
+          - os: macos-latest
+            python-version: "3.8"
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -31,10 +34,15 @@ jobs:
       - name: Install project dependencies
         run: |
           pip install -e ".[test]"
-      - name: Run python tests
-        # See `setup.cfg` for full test options
+      - name: Run the tests
+        if: ${{ !startsWith(matrix.python-version, 'pypy') && !startsWith(matrix.os, 'windows') }}
+        run: |
+          args="-vv -raXs --cov jupyterlab_server --cov-branch --cov-report term-missing:skip-covered --durations 10 --color=yes --cov-fail-under 65"
+          python -m pytest $args || python -m pytest $args --lf
+      - name: Run the tests on pypy and windows
+        if: ${{ startsWith(matrix.python_version, 'pypy') || startsWith(matrix.os, 'windows') }}
         run: |
-          pytest
+          python -m pytest -vv -raXs || python -m pytest -vv -raXs --lf
       - name: Upload coverage
         run: |
           codecov
@@ -97,7 +105,7 @@ jobs:
       - name: Install miniumum versions
         uses: jupyterlab/maintainer-tools/.github/actions/install-minimums@v1
       - name: Run the unit tests
-        run: pytest -vv|| pytest -vv --lf
+        run: python -m pytest -vv -raXs || python -m pytest -vv -raXs --lf
 
   test_prereleases:
     name: Test Prereleases
@@ -116,8 +124,7 @@ jobs:
           pip freeze
           pip check
       - name: Run the tests
-        run: |
-          pytest -vv || pytest -vv --lf
+        run: python -m pytest -vv -raXs || python -m pytest -vv -raXs --lf
 
   make_sdist:
     name: Make SDist
@@ -154,10 +161,9 @@ jobs:
           tar --strip-components=1 -zxvf *.tar.gz -C ./test
           cd test
           pip install .[test]
-          pip install pytest-github-actions-annotate-failures
       - name: Run Test
         run: |
           cd sdist/test
-          pytest -vv || pytest -vv --lf
+          python -m pytest -vv -raXs || python -m pytest -vv -raXs --lf
           # Ensure that the pytest plugin is importable.
           python -c "from jupyterlab_server import pytest_plugin"