From 8faea9162fb2df5110bfd461fd3866dcebdceffc Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 1 Mar 2021 08:58:14 -0500 Subject: [PATCH 1/6] news fragment --- newsfragments/3623.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3623.minor diff --git a/newsfragments/3623.minor b/newsfragments/3623.minor new file mode 100644 index 000000000..e69de29bb From 3c047f0d17067070143a3b88910643c2cfd81418 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 1 Mar 2021 08:58:53 -0500 Subject: [PATCH 2/6] Set an upper bound on the Twisted we'll use --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5dc68d367..11a55e0d7 100644 --- a/setup.py +++ b/setup.py @@ -96,7 +96,10 @@ install_requires = [ # an sftp extra in Tahoe-LAFS, there is no point in having one. # * Twisted 19.10 introduces Site.getContentFile which we use to get # temporary upload files placed into a per-node temporary directory. - "Twisted[tls,conch] >= 19.10.0", + # + # * Twisted 21.2.0 introduces some type hints which we are not yet + # compatible with. + "Twisted[tls,conch] >= 19.10.0, <21.2.0", "PyYAML >= 3.11", From 9f6965ce677458c55dc852ea36344bb66ed34f99 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 1 Mar 2021 10:46:00 -0500 Subject: [PATCH 3/6] [drop] force images to rebuild --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b00bcdcec..417d6dca4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,19 +89,19 @@ workflows: - "typechecks": <<: *DOCKERHUB_CONTEXT - images: - # Build the Docker images used by the ci jobs. This makes the ci jobs - # faster and takes various spurious failures out of the critical path. - triggers: - # Build once a day - - schedule: - cron: "0 0 * * *" - filters: - branches: - only: - - "master" + # images: + # # Build the Docker images used by the ci jobs. This makes the ci jobs + # # faster and takes various spurious failures out of the critical path. + # triggers: + # # Build once a day + # - schedule: + # cron: "0 0 * * *" + # filters: + # branches: + # only: + # - "master" - jobs: + # jobs: - "build-image-debian-10": <<: *DOCKERHUB_CONTEXT - "build-image-debian-9": From 386784110f2842961bf5bffc2ddefdf7987fe90e Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 1 Mar 2021 12:46:44 -0500 Subject: [PATCH 4/6] Maybe this way works --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 2ff83cbd4..509244e16 100644 --- a/tox.ini +++ b/tox.ini @@ -120,6 +120,7 @@ deps = mypy git+https://github.com/Shoobx/mypy-zope git+https://github.com/warner/foolscap + twisted<21.2.0 commands = mypy src From e0339b448dfee0f0f56e7d5c55ad19ee985dbaed Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 1 Mar 2021 12:49:20 -0500 Subject: [PATCH 5/6] Pin it in the tox configuration Because why should setup.py matter? --- .circleci/config.yml | 24 ++++++++++++------------ setup.py | 5 +---- tox.ini | 3 +++ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 417d6dca4..b00bcdcec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,19 +89,19 @@ workflows: - "typechecks": <<: *DOCKERHUB_CONTEXT - # images: - # # Build the Docker images used by the ci jobs. This makes the ci jobs - # # faster and takes various spurious failures out of the critical path. - # triggers: - # # Build once a day - # - schedule: - # cron: "0 0 * * *" - # filters: - # branches: - # only: - # - "master" + images: + # Build the Docker images used by the ci jobs. This makes the ci jobs + # faster and takes various spurious failures out of the critical path. + triggers: + # Build once a day + - schedule: + cron: "0 0 * * *" + filters: + branches: + only: + - "master" - # jobs: + jobs: - "build-image-debian-10": <<: *DOCKERHUB_CONTEXT - "build-image-debian-9": diff --git a/setup.py b/setup.py index 11a55e0d7..5dc68d367 100644 --- a/setup.py +++ b/setup.py @@ -96,10 +96,7 @@ install_requires = [ # an sftp extra in Tahoe-LAFS, there is no point in having one. # * Twisted 19.10 introduces Site.getContentFile which we use to get # temporary upload files placed into a per-node temporary directory. - # - # * Twisted 21.2.0 introduces some type hints which we are not yet - # compatible with. - "Twisted[tls,conch] >= 19.10.0, <21.2.0", + "Twisted[tls,conch] >= 19.10.0", "PyYAML >= 3.11", diff --git a/tox.ini b/tox.ini index 509244e16..9b954cb30 100644 --- a/tox.ini +++ b/tox.ini @@ -120,6 +120,9 @@ deps = mypy git+https://github.com/Shoobx/mypy-zope git+https://github.com/warner/foolscap + # Twisted 21.2.0 introduces some type hints which we are not yet + # compatible with. + # https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3622 twisted<21.2.0 commands = mypy src From dae40c7f867de3da0397f3a82827126cf6ac3c49 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 1 Mar 2021 14:11:17 -0500 Subject: [PATCH 6/6] pointless twiddle CircleCI keeps failing to fetch the revision for some jobs Try giving it a new revision???? --- newsfragments/3623.minor | 1 + 1 file changed, 1 insertion(+) diff --git a/newsfragments/3623.minor b/newsfragments/3623.minor index e69de29bb..8b1378917 100644 --- a/newsfragments/3623.minor +++ b/newsfragments/3623.minor @@ -0,0 +1 @@ +