From c28f10057b6d1bfebc8fabd595b49484c91024ab Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 16 Jan 2023 16:01:11 -0500
Subject: [PATCH] Move some more pieces into the subdirectory

---
 integration/test_vectors.py          |  4 ++--
 integration/vectors/__init__.py      | 12 ++++++++++++
 integration/{ => vectors}/vectors.py |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 integration/vectors/__init__.py
 rename integration/{ => vectors}/vectors.py (99%)

diff --git a/integration/test_vectors.py b/integration/test_vectors.py
index 4c21bb093..fea723b80 100644
--- a/integration/test_vectors.py
+++ b/integration/test_vectors.py
@@ -14,7 +14,7 @@ from attrs import evolve
 from pytest import mark
 from pytest_twisted import ensureDeferred
 
-from . import vectors
+from .vectors import vectors
 from .util import CHK, SSK, reconfigure, upload, TahoeProcess
 
 def digest(bs: bytes) -> bytes:
@@ -114,7 +114,7 @@ async def test_capability(reactor, request, alice, case_and_expected):
 
 
 @ensureDeferred
-async def test_generate(reactor, request, alice):
+async def skiptest_generate(reactor, request, alice):
     """
     This is a helper for generating the test vectors.
 
diff --git a/integration/vectors/__init__.py b/integration/vectors/__init__.py
new file mode 100644
index 000000000..a7fe714bc
--- /dev/null
+++ b/integration/vectors/__init__.py
@@ -0,0 +1,12 @@
+from .vectors import (
+    DATA_PATH,
+    CURRENT_VERSION,
+    MAX_SHARES,
+
+    Case,
+    Sample,
+    SeedParam,
+    encode_bytes,
+
+    capabilities,
+)
diff --git a/integration/vectors.py b/integration/vectors/vectors.py
similarity index 99%
rename from integration/vectors.py
rename to integration/vectors/vectors.py
index bca8b0bf3..cccc25b8a 100644
--- a/integration/vectors.py
+++ b/integration/vectors/vectors.py
@@ -20,7 +20,7 @@ from .util import CHK, SSK
 DATA_PATH: FilePath = FilePath(__file__).sibling("vectors").child("test_vectors.yaml")
 
 # The version of the persisted test vector data this code can interpret.
-CURRENT_VERSION: str = "2023-01-16.2"
+CURRENT_VERSION: str = "2023-01-16"
 
 @frozen
 class Sample: