From f0a68509c4d3e5d15fdc8742e30a63920f56f12c Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 5 Dec 2021 06:32:33 -0600 Subject: [PATCH 1/5] clean up downstream tests --- .github/workflows/downstream.yml | 37 +++++++++++++++++--------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 56fc86d889..e0f1357b58 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -15,24 +15,29 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - name: Base Setup + uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + + - name: Test jupyterlab_server + uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 with: - python-version: 3.8 + package_name: jupyterlab_server - - name: Install dependencies - run: | - pip install --upgrade pip - pip install "." - pip install --pre --upgrade jupyterlab_server[test] jupyterlab[test] nbclassic[test] - pip freeze - - name: Run tests - working-directory: ../ + - name: Test jupyterlab + uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 + with: + package_name: jupyterlab + pytest_args: "--pyargs jupyterlab && python -m jupyterlab.browser_check --no-browser-test" + + - name: Test nbclassic + uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 + with: + package_name: nbclassic + + - name: Test run nbclassic run: | - # NOTE: tests won't pass from inside the working copy because of - # conftest.py:pytest_plugins (must be at the top level) - pytest --pyargs jupyterlab_server - python -m jupyterlab.browser_check --no-browser-test + pip install nbclassic + pip install --force-install "." # Make sure we can start and kill the nbclassic server jupyter nbclassic --no-browser & @@ -42,5 +47,3 @@ jobs: sleep 5 kill $TASK_PID wait $TASK_PID - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 From e8f7048a39e042182e1ca563f5d3b824652ff3a8 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 5 Dec 2021 06:35:47 -0600 Subject: [PATCH 2/5] syntax --- .github/workflows/downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index e0f1357b58..b2f401097a 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -27,7 +27,7 @@ jobs: uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 with: package_name: jupyterlab - pytest_args: "--pyargs jupyterlab && python -m jupyterlab.browser_check --no-browser-test" + pytest_args: "--pyargs jupyterlab; python -m jupyterlab.browser_check --no-browser-test" - name: Test nbclassic uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 From a887605aa8971a0e69ed1d8af4bcabd349d9eba1 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 5 Dec 2021 06:54:58 -0600 Subject: [PATCH 3/5] use new extra_test --- .github/workflows/downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index b2f401097a..0395af906b 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -27,7 +27,7 @@ jobs: uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 with: package_name: jupyterlab - pytest_args: "--pyargs jupyterlab; python -m jupyterlab.browser_check --no-browser-test" + extra_test: "python -m jupyterlab.browser_check --no-browser-test" - name: Test nbclassic uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 From 8b8450d6ea411882fefc675d29444f5a5be5e848 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 5 Dec 2021 15:26:08 -0600 Subject: [PATCH 4/5] no unit tests --- .github/workflows/downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 0395af906b..8cfe28f080 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -27,7 +27,7 @@ jobs: uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 with: package_name: jupyterlab - extra_test: "python -m jupyterlab.browser_check --no-browser-test" + test_command: "python -m jupyterlab.browser_check --no-browser-test" - name: Test nbclassic uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 From 4f9f4ff1a6a3ff3849ae44e3e1efec7ecedebf09 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 5 Dec 2021 15:37:27 -0600 Subject: [PATCH 5/5] fix option name --- .github/workflows/downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 8cfe28f080..1cd5c5a069 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -37,7 +37,7 @@ jobs: - name: Test run nbclassic run: | pip install nbclassic - pip install --force-install "." + pip install --force-reinstall "." # Make sure we can start and kill the nbclassic server jupyter nbclassic --no-browser &