Move to src-layout.

The intention of this is better isolation. `trio` is no longer accidentally on the (python) path and as such requires an explicit installation for usage, this helps uncover issues in packaging data etc early on (see https://packaging.python.org/en/latest/discussions/src-layout-vs-flat-layout/). This serves as the basis for switching to another build system as well; refs python-trio#2790.
apollo13 · Sep 13, 2023 · 153dc7e · 153dc7e
1 parent c16003f
commit 153dc7e
Show file tree

Hide file tree

Showing 135 changed files with 3 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-exec(open("trio/_version.py", encoding="utf-8").read())
+exec(open("src/trio/_version.py", encoding="utf-8").read())
 
 LONG_DESC = """\
 .. image:: https://raw.githubusercontent.com/python-trio/trio/9b0bec646a31e0d0f67b8b6ecc6939726faf3e17/logo/logo-with-background.svg
@@ -80,7 +80,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/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
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