Upgrade versions

.github/workflows/codechecks.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
+          - "3.9"
     runs-on: ubuntu-20.04
     steps:
     - name: Check out source code

.github/workflows/linux.yml

@@ -14,7 +14,9 @@ jobs:
           - runs-on: ubuntu-20.04
 #          - runs-on: ubuntu-18.04
         python-version:
-          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
     runs-on: ${{ matrix.os.runs-on }}
     steps:
     - name: Check out source code
@@ -46,7 +48,7 @@ jobs:
         pip install wheel tox eliot-tree cuvner
 
     - name: Test with tox
-      run: tox -e py38-coverage
+      run: tox -e coverage
       env:
         MAGIC_FOLDER_HYPOTHESIS_PROFILE: "magic-folder-ci"
 
@@ -99,7 +101,7 @@ jobs:
           - runs-on: ubuntu-20.04
 #          - runs-on: ubuntu-18.04
         python-version:
-          - "3.8"
+          - "3.9"
         tahoe-version:
           - "1_17"
           - "master"

.github/workflows/macos.yaml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
+          - "3.9"
 
     steps:
     - uses: actions/checkout@v2
@@ -38,7 +38,7 @@ jobs:
       env:
         MAGIC_FOLDER_HYPOTHESIS_PROFILE: "magic-folder-ci"
       run: |
-        tox -e py38-coverage
+        tox -e py39-coverage
 
     - name: Coverage report
       shell: bash
@@ -70,7 +70,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
+          - "3.9"
         tahoe-version:
           - "1_17"
           - "master"

.github/workflows/windows.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
+          - "3.9"
 
     steps:
     - name: Check out source code
@@ -37,7 +37,7 @@ jobs:
         pip install wheel tox eliot-tree
 
     - name: Test with tox
-      run: tox -e py38-coverage
+      run: tox -e py39-coverage
       env:
         MAGIC_FOLDER_HYPOTHESIS_PROFILE: "magic-folder-ci"
 
@@ -60,7 +60,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
+          - "3.9"
 
         tahoe-version:
           - "1_17"

integration/test_synchronize.py

@@ -71,26 +71,14 @@ def periodic_scan(node, folder_name, path):
     return twisted_sleep(reactor, 3.0)
 
 
-@pytest.fixture(name='periodic_scan')
-def enable_periodic_scans(magic_folder_nodes, monkeypatch):
-    """
-    A fixture causes magic folders to have periodic scans enabled (with
-    interval of 1s), and returns a function to take a snapshot of a file (that
-    waits for the scanner to run).
-    """
-    for node in magic_folder_nodes.values():
-        monkeypatch.setattr(node, "add", partial(node.add, scan_interval=1))
-    return periodic_scan
-
-
 @pytest.fixture(
     params=[
         add_snapshot,
         scan_folder,
-        pytest.lazy_fixture('periodic_scan'),
+        periodic_scan,
     ]
 )
-def take_snapshot(request, magic_folder_nodes):
+def take_snapshot(request, magic_folder_nodes, monkeypatch):
     """
     Pytest fixture that parametrizes different ways of having
     magic-folder take a local snapshot of a given file.
@@ -104,6 +92,9 @@ def take_snapshot(request, magic_folder_nodes):
         A callable that takes a node, folder name, and relative path to a file
         that should be snapshotted.
     """
+    if request.param == periodic_scan:
+        for node in magic_folder_nodes.values():
+            monkeypatch.setattr(node, "add", partial(node.add, scan_interval=1))
     return request.param
 
 

newsfragments/745.removed

@@ -0,0 +1 @@
+Python 3.8 is no longer supported

requirements/base.in

@@ -9,6 +9,7 @@ eliot
 attrs
 
 # WebSocket library for twisted and asyncio
+# (python 3.8 support ends at 23.1.2)
 autobahn >= 19.5.2
 
 hyperlink
@@ -50,3 +51,6 @@ klein>=20.6.0
 # PID-file still exists
 psutil >= 5.8.0
 filelock >= 3.8.0
+
+# see https://github.com/agronholm/cbor2/issues/208
+cbor2 != 5.6.0

requirements/test.in

@@ -17,8 +17,6 @@ pytest
 # XXX meejah: get rid of hack in platform.txt and/or upgrade there?
 colorama
 pytest-twisted
-# https://github.com/pytest-dev/pytest/issues/349
-pytest-lazy-fixture
 hypothesis >= 3.6.1
 towncrier >= 21.3.0
 testtools

requirements/tox.txt

@@ -10,21 +10,21 @@ iso8601==2.1.0 \
     --hash=sha256:6b1d3829ee8921c4301998c909f7829fa9ed3cbdac0d3b16af2d743aed1ba8df \
     --hash=sha256:aac4145c4dcb66ad8b648a02830f5e2ff6c24af20f4f482689be402db2429242
     # via python-subunit
-python-subunit==1.4.3 \
-    --hash=sha256:67bed9d7a923c3010446e821dac170da1b11bd4133e18095fa86c30d09b15006 \
-    --hash=sha256:9ee76092d5b0a02055219763f1aa9e28835f2dd722f03ea9fd8d68e4066b3378
+python-subunit==1.4.4 \
+    --hash=sha256:1079363131aa1d3f45259237265bc2e61a77e35f20edfb6e3d1d2558a2cdea34 \
+    --hash=sha256:27b27909cfb20c3aa59add6ff97471afd869daa3c9035ac7ef5eed8dc394f7a5
     # via subunitreporter
 subunitreporter==23.8.0 \
     --hash=sha256:af710200f4d6ead8be0420083cfb588e593d72a9734e4d65e1303940a3c7c766 \
     --hash=sha256:d0cdcd8d6d5682864a5165120e91d269a5faf551beba97007371841b2e69b5b3
     # via -r requirements/tox.in
-wheel==0.41.2 \
-    --hash=sha256:0c5ac5ff2afb79ac23ab82bab027a0be7b5dbcf2e54dc50efe4bf507de1f7985 \
-    --hash=sha256:75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8
+wheel==0.42.0 \
+    --hash=sha256:177f9c9b0d45c47873b619f5b650346d632cdc35fb5e4d25058e09c9e581433d \
+    --hash=sha256:c45be39f7882c9d34243236f2d63cbd58039e360f85d0913425fbd7ceea617a8
     # via -r requirements/tox.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.2.1 \
-    --hash=sha256:7ccf472345f20d35bdc9d1841ff5f313260c2c33fe417f48c30ac46cccabf5be \
-    --hash=sha256:fb0bd5435b3200c602b5bf61d2d43c2f13c02e29c1707567ae7fbc514eb9faf2
+pip==23.3.2 \
+    --hash=sha256:5052d7889c1f9d05224cd41741acb7c5d6fa735ab34e339624a614eaaa7e7d76 \
+    --hash=sha256:7fd9972f96db22c8077a1ee2691b172c8089b17a5652a44494a9ecb0d78f9149
     # via -r requirements/tox.in