From 015fe63e4e96afe666ed0a0bfdc279aaaeebac7a Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Sun, 9 Jul 2023 23:35:46 -0700 Subject: [PATCH 1/4] Disable coverage on pypy tests The pypy tests are reeeeaaally slow. Maybe this will help. --- tox.ini | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index f8e1a785331..b912a84bd80 100644 --- a/tox.ini +++ b/tox.ini @@ -43,15 +43,12 @@ commands = pytest tests \ --run-optional no_jupyter \ !ci: --numprocesses auto \ - ci: --numprocesses 1 \ - --cov {posargs} + ci: --numprocesses 1 pip install -e .[jupyter] pytest tests --run-optional jupyter \ -m jupyter \ !ci: --numprocesses auto \ - ci: --numprocesses 1 \ - --cov --cov-append {posargs} - coverage report + ci: --numprocesses 1 [testenv:{,ci-}311] setenv = From a229c5f440ce3515b5c6b6359f59a3cf8616b160 Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Sun, 9 Jul 2023 23:39:46 -0700 Subject: [PATCH 2/4] missed a spot --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index b912a84bd80..d34dbbc71db 100644 --- a/tox.ini +++ b/tox.ini @@ -39,7 +39,6 @@ deps = ; remove this when pypy releases the bugfix commands = pip install -e .[d] - coverage erase pytest tests \ --run-optional no_jupyter \ !ci: --numprocesses auto \ From 4848e8d54f2679adfc2832db77942139f0931a7d Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Mon, 10 Jul 2023 00:04:01 -0700 Subject: [PATCH 3/4] fix upload --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92d7d411510..aac77258e40 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,7 +58,7 @@ jobs: - name: Upload coverage to Coveralls # Upload coverage if we are on the main repository and # we're running on Linux (this action only supports Linux) - if: github.repository == 'psf/black' && matrix.os == 'ubuntu-latest' + if: github.repository == 'psf/black' && matrix.os == 'ubuntu-latest' && !startsWith(matrix.python-version, 'pypy') uses: AndreMiras/coveralls-python-action@v20201129 with: github-token: ${{ secrets.GITHUB_TOKEN }} From 7b6ee031d2a43b1e1e440b67d07851b1bcb8f933 Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Mon, 10 Jul 2023 00:06:04 -0700 Subject: [PATCH 4/4] prettier --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aac77258e40..4bf687435b4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,7 +58,9 @@ jobs: - name: Upload coverage to Coveralls # Upload coverage if we are on the main repository and # we're running on Linux (this action only supports Linux) - if: github.repository == 'psf/black' && matrix.os == 'ubuntu-latest' && !startsWith(matrix.python-version, 'pypy') + if: + github.repository == 'psf/black' && matrix.os == 'ubuntu-latest' && + !startsWith(matrix.python-version, 'pypy') uses: AndreMiras/coveralls-python-action@v20201129 with: github-token: ${{ secrets.GITHUB_TOKEN }}