Merge remote-tracking branch 'origin/master' into 3962.pre-determined-rsa-keys

.github/workflows/ci.yml

@@ -86,8 +86,20 @@ jobs:
         run: python misc/build_helpers/show-tool-versions.py
 
       - name: Run tox for corresponding Python version
+        if: ${{ !contains(matrix.os, 'windows') }}
         run: python -m tox
 
+      # On Windows, a non-blocking pipe might respond (when emulating Unix-y
+      # API) with ENOSPC to indicate buffer full. Trial doesn't handle this
+      # well, so it breaks test runs. To attempt to solve this, we pipe the
+      # output through passthrough.py that will hopefully be able to do the right
+      # thing by using Windows APIs.
+      - name: Run tox for corresponding Python version
+        if: ${{ contains(matrix.os, 'windows') }}
+        run: |
+          pip install twisted pywin32
+          python -m tox | python misc/windows-enospc/passthrough.py
+
       - name: Upload eliot.log
         uses: actions/upload-artifact@v3
         with:

misc/windows-enospc/passthrough.py

@@ -0,0 +1,36 @@
+"""
+Writing to non-blocking pipe can result in ENOSPC when using Unix APIs on
+Windows.  So, this program passes through data from stdin to stdout, using
+Windows APIs instead of Unix-y APIs.
+"""
+
+from twisted.internet.stdio import StandardIO
+from twisted.internet import reactor
+from twisted.internet.protocol import Protocol
+from twisted.internet.interfaces import IHalfCloseableProtocol
+from twisted.internet.error import ReactorNotRunning
+from zope.interface import implementer
+
+@implementer(IHalfCloseableProtocol)
+class Passthrough(Protocol):
+    def readConnectionLost(self):
+        self.transport.loseConnection()
+
+    def writeConnectionLost(self):
+        try:
+            reactor.stop()
+        except ReactorNotRunning:
+            pass
+
+    def dataReceived(self, data):
+        self.transport.write(data)
+
+    def connectionLost(self, reason):
+        try:
+            reactor.stop()
+        except ReactorNotRunning:
+            pass
+
+
+std = StandardIO(Passthrough())
+reactor.run()

newsfragments/3966.bugfix

@@ -0,0 +1 @@
+Fix incompatibility with newer versions of the transitive charset_normalizer dependency when using PyInstaller.

setup.py

@@ -148,6 +148,13 @@ install_requires = [
     # for pid-file support
     "psutil",
     "filelock",
+
+    # treq needs requests, requests needs charset_normalizer,
+    # charset_normalizer breaks PyInstaller
+    # (https://github.com/Ousret/charset_normalizer/issues/253). So work around
+    # this by using a lower version number. Once upstream issue is fixed, or
+    # requests drops charset_normalizer, this can go away.
+    "charset_normalizer < 3",
 ]
 
 setup_requires = [