From 380696ecea3fe63dc5da194a4124186a56005d59 Mon Sep 17 00:00:00 2001 From: Adi Roiban Date: Wed, 5 Oct 2022 16:53:25 +0100 Subject: [PATCH 1/4] Remove pyupgrade from precommit. --- .pre-commit-config.yaml | 5 ----- src/twisted/newsfragments/11700.misc | 0 2 files changed, 5 deletions(-) create mode 100644 src/twisted/newsfragments/11700.misc diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 494aab710e7..d7a602d5c55 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,9 +1,4 @@ repos: - - repo: https://github.com/asottile/pyupgrade - rev: v2.23.1 - hooks: - - id: pyupgrade - args: ["--py36-plus"] - repo: https://github.com/pycqa/isort rev: 5.9.3 diff --git a/src/twisted/newsfragments/11700.misc b/src/twisted/newsfragments/11700.misc new file mode 100644 index 00000000000..e69de29bb2d From eb872a2a28b34e26adc0962f15f6df7b731eb9f1 Mon Sep 17 00:00:00 2001 From: Adi Roiban Date: Wed, 5 Oct 2022 16:55:27 +0100 Subject: [PATCH 2/4] Try 11699 enable parallel local tests by default. --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 1be5cc7c3f6..3d97fd83d67 100644 --- a/tox.ini +++ b/tox.ini @@ -93,12 +93,12 @@ commands = posix: python -c "print('Running on POSIX (no special dependencies)')" ; Run tests without wrapping them using coverage. - nocov: python -m twisted.trial --temp-directory={envtmpdir}/_trial_temp --reporter={env:TRIAL_REPORTER:verbose} {env:TRIAL_ARGS:} {posargs:twisted} + nocov: python -m twisted.trial --temp-directory={envtmpdir}/_trial_temp --reporter={env:TRIAL_REPORTER:verbose} {env:TRIAL_ARGS:-j8} {posargs:twisted} ; Run the tests wrapped using coverage. withcov: python {toxinidir}/admin/_copy.py {toxinidir}/admin/zz_coverage.pth {envsitepackagesdir}/zz_coverage.pth withcov: coverage erase - withcov: coverage run -p --rcfile={toxinidir}/.coveragerc -m twisted.trial --temp-directory={envtmpdir}/_trial_temp --reporter={env:TRIAL_REPORTER:verbose} {env:TRIAL_ARGS:} {posargs:twisted} + withcov: coverage run -p --rcfile={toxinidir}/.coveragerc -m twisted.trial --temp-directory={envtmpdir}/_trial_temp --reporter={env:TRIAL_REPORTER:verbose} {env:TRIAL_ARGS:-j8} {posargs:twisted} lint: pre-commit {posargs:run --all-files --show-diff-on-failure} From 7d4be3b812a8a5c6bd97e5eac8c5a135f5518d2c Mon Sep 17 00:00:00 2001 From: Glyph Date: Wed, 5 Oct 2022 09:41:55 -0700 Subject: [PATCH 3/4] please re-run CI --- src/twisted/newsfragments/11700.misc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/twisted/newsfragments/11700.misc b/src/twisted/newsfragments/11700.misc index e69de29bb2d..8b137891791 100644 --- a/src/twisted/newsfragments/11700.misc +++ b/src/twisted/newsfragments/11700.misc @@ -0,0 +1 @@ + From 37bbdab459f85a6d82c7e9e4f95fdc0499763dce Mon Sep 17 00:00:00 2001 From: Glyph Date: Wed, 5 Oct 2022 09:48:19 -0700 Subject: [PATCH 4/4] pretty please --- src/twisted/newsfragments/11700.misc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/twisted/newsfragments/11700.misc b/src/twisted/newsfragments/11700.misc index 8b137891791..e69de29bb2d 100644 --- a/src/twisted/newsfragments/11700.misc +++ b/src/twisted/newsfragments/11700.misc @@ -1 +0,0 @@ -