python-trio · jakkdl · Nov 11, 2023 · Sep 13, 2023 · Oct 21, 2023 · Oct 21, 2023
diff --git a/.coveragerc b/.coveragerc
@@ -14,6 +14,11 @@ omit=
 # this doesn't corrupt the coverage files
 parallel=True
 
+[paths]
+source =
+  src/trio
+  **/site-packages/trio
+
 [report]
 precision = 1
 skip_covered = True

diff --git a/check.sh b/check.sh
@@ -13,7 +13,7 @@ fi
 
 # Test if the generated code is still up to date
 echo "::group::Generate Exports"
-python ./trio/_tools/gen_exports.py --test \
+python ./src/trio/_tools/gen_exports.py --test \
     || EXIT_STATUS=$?
 echo "::endgroup::"
 
@@ -23,10 +23,10 @@ echo "::endgroup::"
 # autoflake --recursive --in-place .
 # pyupgrade --py3-plus $(find . -name "*.py")
 echo "::group::Black"
-if ! black --check setup.py trio; then
+if ! black --check setup.py src/trio; then
     echo "* Black found issues" >> "$GITHUB_STEP_SUMMARY"
     EXIT_STATUS=1
-    black --diff setup.py trio
+    black --diff setup.py src/trio
     echo "::endgroup::"
     echo "::error:: Black found issues"
 else
@@ -57,16 +57,16 @@ echo "::group::Mypy"
 rm -f mypy_annotate.dat
 # Pipefail makes these pipelines fail if mypy does, even if mypy_annotate.py succeeds.
 set -o pipefail
-mypy trio --show-error-end --platform linux | python ./trio/_tools/mypy_annotate.py --dumpfile mypy_annotate.dat --platform Linux \
+mypy src/trio --show-error-end --platform linux | python ./src/trio/_tools/mypy_annotate.py --dumpfile mypy_annotate.dat --platform Linux \
     || { echo "* Mypy (Linux) found type errors." >> "$GITHUB_STEP_SUMMARY"; MYPY=1; }
 # Darwin tests FreeBSD too
-mypy trio --show-error-end --platform darwin | python ./trio/_tools/mypy_annotate.py --dumpfile mypy_annotate.dat --platform Mac \
+mypy src/trio --show-error-end --platform darwin | python ./src/trio/_tools/mypy_annotate.py --dumpfile mypy_annotate.dat --platform Mac \
     || { echo "* Mypy (Mac) found type errors." >> "$GITHUB_STEP_SUMMARY"; MYPY=1; }
-mypy trio --show-error-end --platform win32 | python ./trio/_tools/mypy_annotate.py --dumpfile mypy_annotate.dat --platform Windows \
+mypy src/trio --show-error-end --platform win32 | python ./src/trio/_tools/mypy_annotate.py --dumpfile mypy_annotate.dat --platform Windows \
     || { echo "* Mypy (Windows) found type errors." >> "$GITHUB_STEP_SUMMARY"; MYPY=1; }
 set +o pipefail
 # Re-display errors using Github's syntax, read out of mypy_annotate.dat
-python ./trio/_tools/mypy_annotate.py --dumpfile mypy_annotate.dat
+python ./src/trio/_tools/mypy_annotate.py --dumpfile mypy_annotate.dat
 # Then discard.
 rm -f mypy_annotate.dat
 echo "::endgroup::"
@@ -97,11 +97,11 @@ fi
 codespell || EXIT_STATUS=$?
 
 echo "::group::Pyright interface tests"
-python trio/_tests/check_type_completeness.py --overwrite-file || EXIT_STATUS=$?
-if git status --porcelain trio/_tests/verify_types*.json | grep -q "M"; then
+python src/trio/_tests/check_type_completeness.py --overwrite-file || EXIT_STATUS=$?
+if git status --porcelain src/trio/_tests/verify_types*.json | grep -q "M"; then
     echo "* Type completeness changed, please update!" >> "$GITHUB_STEP_SUMMARY"
     echo "::error::Type completeness changed, please update!"
-    git --no-pager diff --color trio/_tests/verify_types*.json
+    git --no-pager diff --color src/trio/_tests/verify_types*.json
     EXIT_STATUS=1
 fi
 
@@ -118,8 +118,8 @@ Problems were found by static analysis (listed above).
 To fix formatting and see remaining errors, run
 
     pip install -r test-requirements.txt
-    black setup.py trio
-    isort setup.py trio
+    black setup.py src/trio
+    isort setup.py src/trio
     ./check.sh
 
 in your local checkout.

diff --git a/ci.sh b/ci.sh
@@ -95,7 +95,7 @@ else
         # when installing, and then running 'certmgr.msc' and exporting the
         # certificate. See:
         #    http://www.migee.com/2010/09/24/solution-for-unattendedsilent-installs-and-would-you-like-to-install-this-device-software/
-        certutil -addstore "TrustedPublisher" trio/_tests/astrill-codesigning-cert.cer
+        certutil -addstore "TrustedPublisher" src/trio/_tests/astrill-codesigning-cert.cer
         # Double-slashes are how you tell windows-bash that you want a single
         # slash, and don't treat this as a unix-style filename that needs to
         # be replaced by a windows-style filename.

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -22,7 +22,7 @@
 # For our local_customization module
 sys.path.insert(0, os.path.abspath("."))
 # For trio itself
-sys.path.insert(0, os.path.abspath("../.."))
+sys.path.insert(0, os.path.abspath("../../src"))
 
 # https://docs.readthedocs.io/en/stable/builds.html#build-environment
 if "READTHEDOCS" in os.environ:

diff --git a/pyproject.toml b/pyproject.toml
@@ -50,13 +50,13 @@ extend-exclude = [
 ]
 
 [tool.ruff.per-file-ignores]
-'trio/__init__.py' = ['F401']
-'trio/_core/__init__.py' = ['F401']
-'trio/_core/_tests/test_multierror_scripts/*' = ['F401']
-'trio/abc.py' = ['F401']
-'trio/lowlevel.py' = ['F401']
-'trio/socket.py' = ['F401']
-'trio/testing/__init__.py' = ['F401']
+'src/trio/__init__.py' = ['F401']
+'src/trio/_core/__init__.py' = ['F401']
+'src/trio/_core/_tests/test_multierror_scripts/*' = ['F401']
+'src/trio/abc.py' = ['F401']
+'src/trio/lowlevel.py' = ['F401']
+'src/trio/socket.py' = ['F401']
+'src/trio/testing/__init__.py' = ['F401']
 
 [tool.ruff.isort]
 combine-as-imports = true
@@ -116,6 +116,7 @@ issue_format = "`#{issue} <https://github.com/python-trio/trio/issues/{issue}>`_
 # - At release time after bumping version number, run: towncrier
 # (or towncrier --draft)
 package = "trio"
+package_dir = "src"
 underlines = ["-", "~", "^"]
 
 [[tool.towncrier.type]]

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 __version__ = "0.0.0"  # Overwritten from _version.py below, needed for linter to identify that this variable is defined.
 
-with open("trio/_version.py", encoding="utf-8") as version_code:
+with open("src/trio/_version.py", encoding="utf-8") as version_code:
     exec(version_code.read())
 
 LONG_DESC = """\
@@ -83,7 +83,8 @@
     author_email="njs@pobox.com",
     url="https://github.com/python-trio/trio",
     license="MIT OR Apache-2.0",
-    packages=find_packages(),
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
     install_requires=[
         # attrs 19.2.0 adds `eq` option to decorators
         # attrs 20.1.0 adds @frozen

diff --git a/trio/__init__.py → src/trio/__init__.py b/trio/__init__.py → src/trio/__init__.py
diff --git a/trio/_abc.py → src/trio/_abc.py b/trio/_abc.py → src/trio/_abc.py
diff --git a/trio/_channel.py → src/trio/_channel.py b/trio/_channel.py → src/trio/_channel.py
diff --git a/trio/_core/__init__.py → src/trio/_core/__init__.py b/trio/_core/__init__.py → src/trio/_core/__init__.py
diff --git a/trio/_core/_asyncgens.py → src/trio/_core/_asyncgens.py b/trio/_core/_asyncgens.py → src/trio/_core/_asyncgens.py
diff --git a/trio/_core/_entry_queue.py → src/trio/_core/_entry_queue.py b/trio/_core/_entry_queue.py → src/trio/_core/_entry_queue.py
diff --git a/trio/_core/_exceptions.py → src/trio/_core/_exceptions.py b/trio/_core/_exceptions.py → src/trio/_core/_exceptions.py
diff --git a/trio/_core/_generated_instrumentation.py → src/trio/_core/_generated_instrumentation.py b/trio/_core/_generated_instrumentation.py → src/trio/_core/_generated_instrumentation.py
diff --git a/trio/_core/_generated_io_epoll.py → src/trio/_core/_generated_io_epoll.py b/trio/_core/_generated_io_epoll.py → src/trio/_core/_generated_io_epoll.py
diff --git a/trio/_core/_generated_io_kqueue.py → src/trio/_core/_generated_io_kqueue.py b/trio/_core/_generated_io_kqueue.py → src/trio/_core/_generated_io_kqueue.py
diff --git a/trio/_core/_generated_io_windows.py → src/trio/_core/_generated_io_windows.py b/trio/_core/_generated_io_windows.py → src/trio/_core/_generated_io_windows.py
diff --git a/trio/_core/_generated_run.py → src/trio/_core/_generated_run.py b/trio/_core/_generated_run.py → src/trio/_core/_generated_run.py
diff --git a/trio/_core/_instrumentation.py → src/trio/_core/_instrumentation.py b/trio/_core/_instrumentation.py → src/trio/_core/_instrumentation.py
diff --git a/trio/_core/_io_common.py → src/trio/_core/_io_common.py b/trio/_core/_io_common.py → src/trio/_core/_io_common.py
diff --git a/trio/_core/_io_epoll.py → src/trio/_core/_io_epoll.py b/trio/_core/_io_epoll.py → src/trio/_core/_io_epoll.py
diff --git a/trio/_core/_io_kqueue.py → src/trio/_core/_io_kqueue.py b/trio/_core/_io_kqueue.py → src/trio/_core/_io_kqueue.py
diff --git a/trio/_core/_io_windows.py → src/trio/_core/_io_windows.py b/trio/_core/_io_windows.py → src/trio/_core/_io_windows.py
diff --git a/trio/_core/_ki.py → src/trio/_core/_ki.py b/trio/_core/_ki.py → src/trio/_core/_ki.py
diff --git a/trio/_core/_local.py → src/trio/_core/_local.py b/trio/_core/_local.py → src/trio/_core/_local.py
diff --git a/trio/_core/_mock_clock.py → src/trio/_core/_mock_clock.py b/trio/_core/_mock_clock.py → src/trio/_core/_mock_clock.py
diff --git a/trio/_core/_multierror.py → src/trio/_core/_multierror.py b/trio/_core/_multierror.py → src/trio/_core/_multierror.py
diff --git a/trio/_core/_parking_lot.py → src/trio/_core/_parking_lot.py b/trio/_core/_parking_lot.py → src/trio/_core/_parking_lot.py
diff --git a/trio/_core/_run.py → src/trio/_core/_run.py b/trio/_core/_run.py → src/trio/_core/_run.py
diff --git a/trio/_core/_tests/__init__.py → src/trio/_core/_tests/__init__.py b/trio/_core/_tests/__init__.py → src/trio/_core/_tests/__init__.py
diff --git a/trio/_core/_tests/test_asyncgen.py → src/trio/_core/_tests/test_asyncgen.py b/trio/_core/_tests/test_asyncgen.py → src/trio/_core/_tests/test_asyncgen.py
diff --git a/trio/_core/_tests/test_guest_mode.py → src/trio/_core/_tests/test_guest_mode.py b/trio/_core/_tests/test_guest_mode.py → src/trio/_core/_tests/test_guest_mode.py
diff --git a/trio/_core/_tests/test_instrumentation.py → ...trio/_core/_tests/test_instrumentation.py b/trio/_core/_tests/test_instrumentation.py → ...trio/_core/_tests/test_instrumentation.py
diff --git a/trio/_core/_tests/test_io.py → src/trio/_core/_tests/test_io.py b/trio/_core/_tests/test_io.py → src/trio/_core/_tests/test_io.py
diff --git a/trio/_core/_tests/test_ki.py → src/trio/_core/_tests/test_ki.py b/trio/_core/_tests/test_ki.py → src/trio/_core/_tests/test_ki.py
diff --git a/trio/_core/_tests/test_local.py → src/trio/_core/_tests/test_local.py b/trio/_core/_tests/test_local.py → src/trio/_core/_tests/test_local.py
diff --git a/trio/_core/_tests/test_mock_clock.py → src/trio/_core/_tests/test_mock_clock.py b/trio/_core/_tests/test_mock_clock.py → src/trio/_core/_tests/test_mock_clock.py
diff --git a/trio/_core/_tests/test_multierror.py → src/trio/_core/_tests/test_multierror.py b/trio/_core/_tests/test_multierror.py → src/trio/_core/_tests/test_multierror.py
diff --git a/...tests/test_multierror_scripts/__init__.py → ...tests/test_multierror_scripts/__init__.py b/...tests/test_multierror_scripts/__init__.py → ...tests/test_multierror_scripts/__init__.py
diff --git a/..._tests/test_multierror_scripts/_common.py → ..._tests/test_multierror_scripts/_common.py b/..._tests/test_multierror_scripts/_common.py → ..._tests/test_multierror_scripts/_common.py
diff --git a/...t_multierror_scripts/apport_excepthook.py → ...t_multierror_scripts/apport_excepthook.py b/...t_multierror_scripts/apport_excepthook.py → ...t_multierror_scripts/apport_excepthook.py
diff --git a/...t_multierror_scripts/simple_excepthook.py → ...t_multierror_scripts/simple_excepthook.py b/...t_multierror_scripts/simple_excepthook.py → ...t_multierror_scripts/simple_excepthook.py
diff --git a/trio/_core/_tests/test_parking_lot.py → src/trio/_core/_tests/test_parking_lot.py b/trio/_core/_tests/test_parking_lot.py → src/trio/_core/_tests/test_parking_lot.py
diff --git a/trio/_core/_tests/test_run.py → src/trio/_core/_tests/test_run.py b/trio/_core/_tests/test_run.py → src/trio/_core/_tests/test_run.py
diff --git a/trio/_core/_tests/test_thread_cache.py → src/trio/_core/_tests/test_thread_cache.py b/trio/_core/_tests/test_thread_cache.py → src/trio/_core/_tests/test_thread_cache.py
diff --git a/trio/_core/_tests/test_tutil.py → src/trio/_core/_tests/test_tutil.py b/trio/_core/_tests/test_tutil.py → src/trio/_core/_tests/test_tutil.py
diff --git a/trio/_core/_tests/test_unbounded_queue.py → ...trio/_core/_tests/test_unbounded_queue.py b/trio/_core/_tests/test_unbounded_queue.py → ...trio/_core/_tests/test_unbounded_queue.py
diff --git a/trio/_core/_tests/test_windows.py → src/trio/_core/_tests/test_windows.py b/trio/_core/_tests/test_windows.py → src/trio/_core/_tests/test_windows.py
diff --git a/trio/_core/_tests/tutil.py → src/trio/_core/_tests/tutil.py b/trio/_core/_tests/tutil.py → src/trio/_core/_tests/tutil.py
diff --git a/trio/_core/_thread_cache.py → src/trio/_core/_thread_cache.py b/trio/_core/_thread_cache.py → src/trio/_core/_thread_cache.py
diff --git a/trio/_core/_traps.py → src/trio/_core/_traps.py b/trio/_core/_traps.py → src/trio/_core/_traps.py
diff --git a/trio/_core/_unbounded_queue.py → src/trio/_core/_unbounded_queue.py b/trio/_core/_unbounded_queue.py → src/trio/_core/_unbounded_queue.py
diff --git a/trio/_core/_wakeup_socketpair.py → src/trio/_core/_wakeup_socketpair.py b/trio/_core/_wakeup_socketpair.py → src/trio/_core/_wakeup_socketpair.py
diff --git a/trio/_core/_windows_cffi.py → src/trio/_core/_windows_cffi.py b/trio/_core/_windows_cffi.py → src/trio/_core/_windows_cffi.py
diff --git a/trio/_deprecate.py → src/trio/_deprecate.py b/trio/_deprecate.py → src/trio/_deprecate.py
diff --git a/trio/_dtls.py → src/trio/_dtls.py b/trio/_dtls.py → src/trio/_dtls.py
diff --git a/trio/_file_io.py → src/trio/_file_io.py b/trio/_file_io.py → src/trio/_file_io.py
diff --git a/trio/_highlevel_generic.py → src/trio/_highlevel_generic.py b/trio/_highlevel_generic.py → src/trio/_highlevel_generic.py
diff --git a/trio/_highlevel_open_tcp_listeners.py → src/trio/_highlevel_open_tcp_listeners.py b/trio/_highlevel_open_tcp_listeners.py → src/trio/_highlevel_open_tcp_listeners.py
diff --git a/trio/_highlevel_open_tcp_stream.py → src/trio/_highlevel_open_tcp_stream.py b/trio/_highlevel_open_tcp_stream.py → src/trio/_highlevel_open_tcp_stream.py
diff --git a/trio/_highlevel_open_unix_stream.py → src/trio/_highlevel_open_unix_stream.py b/trio/_highlevel_open_unix_stream.py → src/trio/_highlevel_open_unix_stream.py
diff --git a/trio/_highlevel_serve_listeners.py → src/trio/_highlevel_serve_listeners.py b/trio/_highlevel_serve_listeners.py → src/trio/_highlevel_serve_listeners.py
diff --git a/trio/_highlevel_socket.py → src/trio/_highlevel_socket.py b/trio/_highlevel_socket.py → src/trio/_highlevel_socket.py
diff --git a/trio/_highlevel_ssl_helpers.py → src/trio/_highlevel_ssl_helpers.py b/trio/_highlevel_ssl_helpers.py → src/trio/_highlevel_ssl_helpers.py
diff --git a/trio/_path.py → src/trio/_path.py b/trio/_path.py → src/trio/_path.py
diff --git a/trio/_signals.py → src/trio/_signals.py b/trio/_signals.py → src/trio/_signals.py
diff --git a/trio/_socket.py → src/trio/_socket.py b/trio/_socket.py → src/trio/_socket.py
diff --git a/trio/_ssl.py → src/trio/_ssl.py b/trio/_ssl.py → src/trio/_ssl.py
diff --git a/trio/_subprocess.py → src/trio/_subprocess.py b/trio/_subprocess.py → src/trio/_subprocess.py
diff --git a/trio/_subprocess_platform/__init__.py → src/trio/_subprocess_platform/__init__.py b/trio/_subprocess_platform/__init__.py → src/trio/_subprocess_platform/__init__.py
diff --git a/trio/_subprocess_platform/kqueue.py → src/trio/_subprocess_platform/kqueue.py b/trio/_subprocess_platform/kqueue.py → src/trio/_subprocess_platform/kqueue.py
diff --git a/trio/_subprocess_platform/waitid.py → src/trio/_subprocess_platform/waitid.py b/trio/_subprocess_platform/waitid.py → src/trio/_subprocess_platform/waitid.py
diff --git a/trio/_subprocess_platform/windows.py → src/trio/_subprocess_platform/windows.py b/trio/_subprocess_platform/windows.py → src/trio/_subprocess_platform/windows.py
diff --git a/trio/_sync.py → src/trio/_sync.py b/trio/_sync.py → src/trio/_sync.py
diff --git a/trio/_tests/__init__.py → src/trio/_tests/__init__.py b/trio/_tests/__init__.py → src/trio/_tests/__init__.py
diff --git a/trio/_tests/astrill-codesigning-cert.cer → src/trio/_tests/astrill-codesigning-cert.cer b/trio/_tests/astrill-codesigning-cert.cer → src/trio/_tests/astrill-codesigning-cert.cer
diff --git a/trio/_tests/check_type_completeness.py → src/trio/_tests/check_type_completeness.py b/trio/_tests/check_type_completeness.py → src/trio/_tests/check_type_completeness.py
diff --git a/trio/_tests/module_with_deprecations.py → src/trio/_tests/module_with_deprecations.py b/trio/_tests/module_with_deprecations.py → src/trio/_tests/module_with_deprecations.py
diff --git a/trio/_tests/pytest_plugin.py → src/trio/_tests/pytest_plugin.py b/trio/_tests/pytest_plugin.py → src/trio/_tests/pytest_plugin.py
diff --git a/trio/_tests/test_abc.py → src/trio/_tests/test_abc.py b/trio/_tests/test_abc.py → src/trio/_tests/test_abc.py
diff --git a/trio/_tests/test_channel.py → src/trio/_tests/test_channel.py b/trio/_tests/test_channel.py → src/trio/_tests/test_channel.py
diff --git a/trio/_tests/test_contextvars.py → src/trio/_tests/test_contextvars.py b/trio/_tests/test_contextvars.py → src/trio/_tests/test_contextvars.py
diff --git a/trio/_tests/test_deprecate.py → src/trio/_tests/test_deprecate.py b/trio/_tests/test_deprecate.py → src/trio/_tests/test_deprecate.py
diff --git a/trio/_tests/test_dtls.py → src/trio/_tests/test_dtls.py b/trio/_tests/test_dtls.py → src/trio/_tests/test_dtls.py
diff --git a/trio/_tests/test_exports.py → src/trio/_tests/test_exports.py b/trio/_tests/test_exports.py → src/trio/_tests/test_exports.py
diff --git a/trio/_tests/test_fakenet.py → src/trio/_tests/test_fakenet.py b/trio/_tests/test_fakenet.py → src/trio/_tests/test_fakenet.py
diff --git a/trio/_tests/test_file_io.py → src/trio/_tests/test_file_io.py b/trio/_tests/test_file_io.py → src/trio/_tests/test_file_io.py
diff --git a/trio/_tests/test_highlevel_generic.py → src/trio/_tests/test_highlevel_generic.py b/trio/_tests/test_highlevel_generic.py → src/trio/_tests/test_highlevel_generic.py
diff --git a/...ests/test_highlevel_open_tcp_listeners.py → ...ests/test_highlevel_open_tcp_listeners.py b/...ests/test_highlevel_open_tcp_listeners.py → ...ests/test_highlevel_open_tcp_listeners.py
diff --git a/.../_tests/test_highlevel_open_tcp_stream.py → .../_tests/test_highlevel_open_tcp_stream.py b/.../_tests/test_highlevel_open_tcp_stream.py → .../_tests/test_highlevel_open_tcp_stream.py
diff --git a/..._tests/test_highlevel_open_unix_stream.py → ..._tests/test_highlevel_open_unix_stream.py b/..._tests/test_highlevel_open_unix_stream.py → ..._tests/test_highlevel_open_unix_stream.py
diff --git a/.../_tests/test_highlevel_serve_listeners.py → .../_tests/test_highlevel_serve_listeners.py b/.../_tests/test_highlevel_serve_listeners.py → .../_tests/test_highlevel_serve_listeners.py
diff --git a/trio/_tests/test_highlevel_socket.py → src/trio/_tests/test_highlevel_socket.py b/trio/_tests/test_highlevel_socket.py → src/trio/_tests/test_highlevel_socket.py
diff --git a/trio/_tests/test_highlevel_ssl_helpers.py → ...trio/_tests/test_highlevel_ssl_helpers.py b/trio/_tests/test_highlevel_ssl_helpers.py → ...trio/_tests/test_highlevel_ssl_helpers.py
diff --git a/trio/_tests/test_path.py → src/trio/_tests/test_path.py b/trio/_tests/test_path.py → src/trio/_tests/test_path.py
diff --git a/trio/_tests/test_scheduler_determinism.py → ...trio/_tests/test_scheduler_determinism.py b/trio/_tests/test_scheduler_determinism.py → ...trio/_tests/test_scheduler_determinism.py
diff --git a/trio/_tests/test_signals.py → src/trio/_tests/test_signals.py b/trio/_tests/test_signals.py → src/trio/_tests/test_signals.py
diff --git a/trio/_tests/test_socket.py → src/trio/_tests/test_socket.py b/trio/_tests/test_socket.py → src/trio/_tests/test_socket.py
diff --git a/trio/_tests/test_ssl.py → src/trio/_tests/test_ssl.py b/trio/_tests/test_ssl.py → src/trio/_tests/test_ssl.py
diff --git a/trio/_tests/test_subprocess.py → src/trio/_tests/test_subprocess.py b/trio/_tests/test_subprocess.py → src/trio/_tests/test_subprocess.py
diff --git a/trio/_tests/test_sync.py → src/trio/_tests/test_sync.py b/trio/_tests/test_sync.py → src/trio/_tests/test_sync.py
diff --git a/trio/_tests/test_testing.py → src/trio/_tests/test_testing.py b/trio/_tests/test_testing.py → src/trio/_tests/test_testing.py
diff --git a/trio/_tests/test_threads.py → src/trio/_tests/test_threads.py b/trio/_tests/test_threads.py → src/trio/_tests/test_threads.py
diff --git a/trio/_tests/test_timeouts.py → src/trio/_tests/test_timeouts.py b/trio/_tests/test_timeouts.py → src/trio/_tests/test_timeouts.py
diff --git a/trio/_tests/test_tracing.py → src/trio/_tests/test_tracing.py b/trio/_tests/test_tracing.py → src/trio/_tests/test_tracing.py
diff --git a/trio/_tests/test_unix_pipes.py → src/trio/_tests/test_unix_pipes.py b/trio/_tests/test_unix_pipes.py → src/trio/_tests/test_unix_pipes.py
diff --git a/trio/_tests/test_util.py → src/trio/_tests/test_util.py b/trio/_tests/test_util.py → src/trio/_tests/test_util.py
diff --git a/trio/_tests/test_wait_for_object.py → src/trio/_tests/test_wait_for_object.py b/trio/_tests/test_wait_for_object.py → src/trio/_tests/test_wait_for_object.py
diff --git a/trio/_tests/test_windows_pipes.py → src/trio/_tests/test_windows_pipes.py b/trio/_tests/test_windows_pipes.py → src/trio/_tests/test_windows_pipes.py
diff --git a/trio/_tests/tools/__init__.py → src/trio/_tests/tools/__init__.py b/trio/_tests/tools/__init__.py → src/trio/_tests/tools/__init__.py
diff --git a/trio/_tests/tools/test_gen_exports.py → src/trio/_tests/tools/test_gen_exports.py b/trio/_tests/tools/test_gen_exports.py → src/trio/_tests/tools/test_gen_exports.py
diff --git a/trio/_tests/tools/test_mypy_annotate.py → src/trio/_tests/tools/test_mypy_annotate.py b/trio/_tests/tools/test_mypy_annotate.py → src/trio/_tests/tools/test_mypy_annotate.py
diff --git a/trio/_tests/type_tests/check_wraps.py → src/trio/_tests/type_tests/check_wraps.py b/trio/_tests/type_tests/check_wraps.py → src/trio/_tests/type_tests/check_wraps.py
diff --git a/trio/_tests/type_tests/path.py → src/trio/_tests/type_tests/path.py b/trio/_tests/type_tests/path.py → src/trio/_tests/type_tests/path.py
diff --git a/trio/_tests/verify_types_darwin.json → src/trio/_tests/verify_types_darwin.json b/trio/_tests/verify_types_darwin.json → src/trio/_tests/verify_types_darwin.json
diff --git a/trio/_tests/verify_types_linux.json → src/trio/_tests/verify_types_linux.json b/trio/_tests/verify_types_linux.json → src/trio/_tests/verify_types_linux.json
diff --git a/trio/_tests/verify_types_windows.json → src/trio/_tests/verify_types_windows.json b/trio/_tests/verify_types_windows.json → src/trio/_tests/verify_types_windows.json
diff --git a/trio/_threads.py → src/trio/_threads.py b/trio/_threads.py → src/trio/_threads.py
diff --git a/trio/_timeouts.py → src/trio/_timeouts.py b/trio/_timeouts.py → src/trio/_timeouts.py
diff --git a/trio/_tools/__init__.py → src/trio/_tools/__init__.py b/trio/_tools/__init__.py → src/trio/_tools/__init__.py
diff --git a/trio/_tools/gen_exports.py → src/trio/_tools/gen_exports.py b/trio/_tools/gen_exports.py → src/trio/_tools/gen_exports.py
@@ -311,7 +311,7 @@ def main() -> None:  # pragma: no cover
     source_root = Path.cwd()
     # Double-check we found the right directory
     assert (source_root / "LICENSE").exists()
-    core = source_root / "trio/_core"
+    core = source_root / "src/trio/_core"
     to_wrap = [
         File(core / "_run.py", "runner", imports=IMPORTS_RUN),
         File(

diff --git a/trio/_tools/mypy_annotate.py → src/trio/_tools/mypy_annotate.py b/trio/_tools/mypy_annotate.py → src/trio/_tools/mypy_annotate.py
diff --git a/trio/_unix_pipes.py → src/trio/_unix_pipes.py b/trio/_unix_pipes.py → src/trio/_unix_pipes.py
diff --git a/trio/_util.py → src/trio/_util.py b/trio/_util.py → src/trio/_util.py
diff --git a/trio/_version.py → src/trio/_version.py b/trio/_version.py → src/trio/_version.py
diff --git a/trio/_wait_for_object.py → src/trio/_wait_for_object.py b/trio/_wait_for_object.py → src/trio/_wait_for_object.py
diff --git a/trio/_windows_pipes.py → src/trio/_windows_pipes.py b/trio/_windows_pipes.py → src/trio/_windows_pipes.py
diff --git a/trio/abc.py → src/trio/abc.py b/trio/abc.py → src/trio/abc.py
diff --git a/trio/from_thread.py → src/trio/from_thread.py b/trio/from_thread.py → src/trio/from_thread.py
diff --git a/trio/lowlevel.py → src/trio/lowlevel.py b/trio/lowlevel.py → src/trio/lowlevel.py
diff --git a/trio/py.typed → src/trio/py.typed b/trio/py.typed → src/trio/py.typed
diff --git a/trio/socket.py → src/trio/socket.py b/trio/socket.py → src/trio/socket.py
diff --git a/trio/testing/__init__.py → src/trio/testing/__init__.py b/trio/testing/__init__.py → src/trio/testing/__init__.py
diff --git a/trio/testing/_check_streams.py → src/trio/testing/_check_streams.py b/trio/testing/_check_streams.py → src/trio/testing/_check_streams.py
diff --git a/trio/testing/_checkpoints.py → src/trio/testing/_checkpoints.py b/trio/testing/_checkpoints.py → src/trio/testing/_checkpoints.py
diff --git a/trio/testing/_fake_net.py → src/trio/testing/_fake_net.py b/trio/testing/_fake_net.py → src/trio/testing/_fake_net.py
diff --git a/trio/testing/_memory_streams.py → src/trio/testing/_memory_streams.py b/trio/testing/_memory_streams.py → src/trio/testing/_memory_streams.py
diff --git a/trio/testing/_network.py → src/trio/testing/_network.py b/trio/testing/_network.py → src/trio/testing/_network.py
diff --git a/trio/testing/_sequencer.py → src/trio/testing/_sequencer.py b/trio/testing/_sequencer.py → src/trio/testing/_sequencer.py
diff --git a/trio/testing/_trio_test.py → src/trio/testing/_trio_test.py b/trio/testing/_trio_test.py → src/trio/testing/_trio_test.py
diff --git a/trio/tests.py → src/trio/tests.py b/trio/tests.py → src/trio/tests.py
diff --git a/trio/to_thread.py → src/trio/to_thread.py b/trio/to_thread.py → src/trio/to_thread.py