From 1f6447681028735115954f3bab437cecd9b09c43 Mon Sep 17 00:00:00 2001 From: hirohira Date: Wed, 5 Nov 2025 04:45:16 +0900 Subject: [PATCH 1/5] Fix packaging to install only the `choreographer` module --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 93b9ff85..48fd37e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,8 +2,8 @@ requires = ["setuptools>=65.0.0", "wheel", "setuptools-git-versioning"] build-backend = "setuptools.build_meta" -[tool.setuptools.packages] -find = {namespaces = true} +[tool.setuptools] +packages = ["choreographer"] [tool.setuptools-git-versioning] enabled = true From 4b4a6754085ee40fefbc4199b67812561280dd89 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Sun, 9 Nov 2025 13:18:20 -0500 Subject: [PATCH 2/5] Remove unused results/ folder --- results/placeholder | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 results/placeholder diff --git a/results/placeholder b/results/placeholder deleted file mode 100644 index e69de29b..00000000 From 70f5d10b13ce2ddfaf24889eb1369785da62ffda Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Sun, 9 Nov 2025 13:43:52 -0500 Subject: [PATCH 3/5] Reorganize repo for better packaging. --- pyproject.toml | 5 ++++- {choreographer => src/choreographer}/__init__.py | 0 {choreographer => src/choreographer}/_brokers/__init__.py | 0 {choreographer => src/choreographer}/_brokers/_async.py | 0 {choreographer => src/choreographer}/_brokers/_sync.py | 0 {choreographer => src/choreographer}/browser_async.py | 0 {choreographer => src/choreographer}/browser_sync.py | 0 {choreographer => src/choreographer}/browsers/__init__.py | 0 .../choreographer}/browsers/_chrome_constants.py | 0 {choreographer => src/choreographer}/browsers/_errors.py | 0 .../choreographer}/browsers/_interface_type.py | 0 .../choreographer}/browsers/_unix_pipe_chromium_wrapper.py | 0 {choreographer => src/choreographer}/browsers/chromium.py | 0 {choreographer => src/choreographer}/channels/README.txt | 0 {choreographer => src/choreographer}/channels/__init__.py | 0 {choreographer => src/choreographer}/channels/_errors.py | 0 .../choreographer}/channels/_interface_type.py | 0 {choreographer => src/choreographer}/channels/_wire.py | 0 {choreographer => src/choreographer}/channels/pipe.py | 0 {choreographer => src/choreographer}/cli/__init__.py | 0 {choreographer => src/choreographer}/cli/_cli_utils.py | 0 {choreographer => src/choreographer}/cli/_cli_utils_no_qa.py | 0 {choreographer => src/choreographer}/cli/defaults.py | 0 {choreographer => src/choreographer}/errors.py | 0 {choreographer => src/choreographer}/protocol/__init__.py | 0 .../choreographer}/protocol/devtools_async.py | 0 .../choreographer}/protocol/devtools_sync.py | 0 {choreographer => src/choreographer}/py.typed | 0 {choreographer => src/choreographer}/pyrightconfig.json | 0 src/choreographer/resources/__init__.py | 1 + .../choreographer}/resources/last_known_good_chrome.json | 0 {choreographer => src/choreographer}/utils/README.txt | 0 {choreographer => src/choreographer}/utils/__init__.py | 0 {choreographer => src/choreographer}/utils/_kill.py | 0 .../choreographer}/utils/_manual_thread_pool.py | 0 {choreographer => src/choreographer}/utils/_tmpfile.py | 0 {choreographer => src/choreographer}/utils/_which.py | 0 37 files changed, 5 insertions(+), 1 deletion(-) rename {choreographer => src/choreographer}/__init__.py (100%) rename {choreographer => src/choreographer}/_brokers/__init__.py (100%) rename {choreographer => src/choreographer}/_brokers/_async.py (100%) rename {choreographer => src/choreographer}/_brokers/_sync.py (100%) rename {choreographer => src/choreographer}/browser_async.py (100%) rename {choreographer => src/choreographer}/browser_sync.py (100%) rename {choreographer => src/choreographer}/browsers/__init__.py (100%) rename {choreographer => src/choreographer}/browsers/_chrome_constants.py (100%) rename {choreographer => src/choreographer}/browsers/_errors.py (100%) rename {choreographer => src/choreographer}/browsers/_interface_type.py (100%) rename {choreographer => src/choreographer}/browsers/_unix_pipe_chromium_wrapper.py (100%) rename {choreographer => src/choreographer}/browsers/chromium.py (100%) rename {choreographer => src/choreographer}/channels/README.txt (100%) rename {choreographer => src/choreographer}/channels/__init__.py (100%) rename {choreographer => src/choreographer}/channels/_errors.py (100%) rename {choreographer => src/choreographer}/channels/_interface_type.py (100%) rename {choreographer => src/choreographer}/channels/_wire.py (100%) rename {choreographer => src/choreographer}/channels/pipe.py (100%) rename {choreographer => src/choreographer}/cli/__init__.py (100%) rename {choreographer => src/choreographer}/cli/_cli_utils.py (100%) rename {choreographer => src/choreographer}/cli/_cli_utils_no_qa.py (100%) rename {choreographer => src/choreographer}/cli/defaults.py (100%) rename {choreographer => src/choreographer}/errors.py (100%) rename {choreographer => src/choreographer}/protocol/__init__.py (100%) rename {choreographer => src/choreographer}/protocol/devtools_async.py (100%) rename {choreographer => src/choreographer}/protocol/devtools_sync.py (100%) rename {choreographer => src/choreographer}/py.typed (100%) rename {choreographer => src/choreographer}/pyrightconfig.json (100%) create mode 100644 src/choreographer/resources/__init__.py rename {choreographer => src/choreographer}/resources/last_known_good_chrome.json (100%) rename {choreographer => src/choreographer}/utils/README.txt (100%) rename {choreographer => src/choreographer}/utils/__init__.py (100%) rename {choreographer => src/choreographer}/utils/_kill.py (100%) rename {choreographer => src/choreographer}/utils/_manual_thread_pool.py (100%) rename {choreographer => src/choreographer}/utils/_tmpfile.py (100%) rename {choreographer => src/choreographer}/utils/_which.py (100%) diff --git a/pyproject.toml b/pyproject.toml index 48fd37e4..a961ac4e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,10 @@ requires = ["setuptools>=65.0.0", "wheel", "setuptools-git-versioning"] build-backend = "setuptools.build_meta" [tool.setuptools] -packages = ["choreographer"] + +[tool.setuptools.packages.find] +where = ["src"] +namespaces = false [tool.setuptools-git-versioning] enabled = true diff --git a/choreographer/__init__.py b/src/choreographer/__init__.py similarity index 100% rename from choreographer/__init__.py rename to src/choreographer/__init__.py diff --git a/choreographer/_brokers/__init__.py b/src/choreographer/_brokers/__init__.py similarity index 100% rename from choreographer/_brokers/__init__.py rename to src/choreographer/_brokers/__init__.py diff --git a/choreographer/_brokers/_async.py b/src/choreographer/_brokers/_async.py similarity index 100% rename from choreographer/_brokers/_async.py rename to src/choreographer/_brokers/_async.py diff --git a/choreographer/_brokers/_sync.py b/src/choreographer/_brokers/_sync.py similarity index 100% rename from choreographer/_brokers/_sync.py rename to src/choreographer/_brokers/_sync.py diff --git a/choreographer/browser_async.py b/src/choreographer/browser_async.py similarity index 100% rename from choreographer/browser_async.py rename to src/choreographer/browser_async.py diff --git a/choreographer/browser_sync.py b/src/choreographer/browser_sync.py similarity index 100% rename from choreographer/browser_sync.py rename to src/choreographer/browser_sync.py diff --git a/choreographer/browsers/__init__.py b/src/choreographer/browsers/__init__.py similarity index 100% rename from choreographer/browsers/__init__.py rename to src/choreographer/browsers/__init__.py diff --git a/choreographer/browsers/_chrome_constants.py b/src/choreographer/browsers/_chrome_constants.py similarity index 100% rename from choreographer/browsers/_chrome_constants.py rename to src/choreographer/browsers/_chrome_constants.py diff --git a/choreographer/browsers/_errors.py b/src/choreographer/browsers/_errors.py similarity index 100% rename from choreographer/browsers/_errors.py rename to src/choreographer/browsers/_errors.py diff --git a/choreographer/browsers/_interface_type.py b/src/choreographer/browsers/_interface_type.py similarity index 100% rename from choreographer/browsers/_interface_type.py rename to src/choreographer/browsers/_interface_type.py diff --git a/choreographer/browsers/_unix_pipe_chromium_wrapper.py b/src/choreographer/browsers/_unix_pipe_chromium_wrapper.py similarity index 100% rename from choreographer/browsers/_unix_pipe_chromium_wrapper.py rename to src/choreographer/browsers/_unix_pipe_chromium_wrapper.py diff --git a/choreographer/browsers/chromium.py b/src/choreographer/browsers/chromium.py similarity index 100% rename from choreographer/browsers/chromium.py rename to src/choreographer/browsers/chromium.py diff --git a/choreographer/channels/README.txt b/src/choreographer/channels/README.txt similarity index 100% rename from choreographer/channels/README.txt rename to src/choreographer/channels/README.txt diff --git a/choreographer/channels/__init__.py b/src/choreographer/channels/__init__.py similarity index 100% rename from choreographer/channels/__init__.py rename to src/choreographer/channels/__init__.py diff --git a/choreographer/channels/_errors.py b/src/choreographer/channels/_errors.py similarity index 100% rename from choreographer/channels/_errors.py rename to src/choreographer/channels/_errors.py diff --git a/choreographer/channels/_interface_type.py b/src/choreographer/channels/_interface_type.py similarity index 100% rename from choreographer/channels/_interface_type.py rename to src/choreographer/channels/_interface_type.py diff --git a/choreographer/channels/_wire.py b/src/choreographer/channels/_wire.py similarity index 100% rename from choreographer/channels/_wire.py rename to src/choreographer/channels/_wire.py diff --git a/choreographer/channels/pipe.py b/src/choreographer/channels/pipe.py similarity index 100% rename from choreographer/channels/pipe.py rename to src/choreographer/channels/pipe.py diff --git a/choreographer/cli/__init__.py b/src/choreographer/cli/__init__.py similarity index 100% rename from choreographer/cli/__init__.py rename to src/choreographer/cli/__init__.py diff --git a/choreographer/cli/_cli_utils.py b/src/choreographer/cli/_cli_utils.py similarity index 100% rename from choreographer/cli/_cli_utils.py rename to src/choreographer/cli/_cli_utils.py diff --git a/choreographer/cli/_cli_utils_no_qa.py b/src/choreographer/cli/_cli_utils_no_qa.py similarity index 100% rename from choreographer/cli/_cli_utils_no_qa.py rename to src/choreographer/cli/_cli_utils_no_qa.py diff --git a/choreographer/cli/defaults.py b/src/choreographer/cli/defaults.py similarity index 100% rename from choreographer/cli/defaults.py rename to src/choreographer/cli/defaults.py diff --git a/choreographer/errors.py b/src/choreographer/errors.py similarity index 100% rename from choreographer/errors.py rename to src/choreographer/errors.py diff --git a/choreographer/protocol/__init__.py b/src/choreographer/protocol/__init__.py similarity index 100% rename from choreographer/protocol/__init__.py rename to src/choreographer/protocol/__init__.py diff --git a/choreographer/protocol/devtools_async.py b/src/choreographer/protocol/devtools_async.py similarity index 100% rename from choreographer/protocol/devtools_async.py rename to src/choreographer/protocol/devtools_async.py diff --git a/choreographer/protocol/devtools_sync.py b/src/choreographer/protocol/devtools_sync.py similarity index 100% rename from choreographer/protocol/devtools_sync.py rename to src/choreographer/protocol/devtools_sync.py diff --git a/choreographer/py.typed b/src/choreographer/py.typed similarity index 100% rename from choreographer/py.typed rename to src/choreographer/py.typed diff --git a/choreographer/pyrightconfig.json b/src/choreographer/pyrightconfig.json similarity index 100% rename from choreographer/pyrightconfig.json rename to src/choreographer/pyrightconfig.json diff --git a/src/choreographer/resources/__init__.py b/src/choreographer/resources/__init__.py new file mode 100644 index 00000000..d66e6004 --- /dev/null +++ b/src/choreographer/resources/__init__.py @@ -0,0 +1 @@ +"""A data folder only.""" diff --git a/choreographer/resources/last_known_good_chrome.json b/src/choreographer/resources/last_known_good_chrome.json similarity index 100% rename from choreographer/resources/last_known_good_chrome.json rename to src/choreographer/resources/last_known_good_chrome.json diff --git a/choreographer/utils/README.txt b/src/choreographer/utils/README.txt similarity index 100% rename from choreographer/utils/README.txt rename to src/choreographer/utils/README.txt diff --git a/choreographer/utils/__init__.py b/src/choreographer/utils/__init__.py similarity index 100% rename from choreographer/utils/__init__.py rename to src/choreographer/utils/__init__.py diff --git a/choreographer/utils/_kill.py b/src/choreographer/utils/_kill.py similarity index 100% rename from choreographer/utils/_kill.py rename to src/choreographer/utils/_kill.py diff --git a/choreographer/utils/_manual_thread_pool.py b/src/choreographer/utils/_manual_thread_pool.py similarity index 100% rename from choreographer/utils/_manual_thread_pool.py rename to src/choreographer/utils/_manual_thread_pool.py diff --git a/choreographer/utils/_tmpfile.py b/src/choreographer/utils/_tmpfile.py similarity index 100% rename from choreographer/utils/_tmpfile.py rename to src/choreographer/utils/_tmpfile.py diff --git a/choreographer/utils/_which.py b/src/choreographer/utils/_which.py similarity index 100% rename from choreographer/utils/_which.py rename to src/choreographer/utils/_which.py From a78f37f55ef1d40c98b8f9bfd99816718b74df55 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Sun, 9 Nov 2025 13:49:11 -0500 Subject: [PATCH 4/5] Fix other directory specs in toml --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 15d5a752..9f2f69a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,7 +72,7 @@ dev = [ #logistro = { path = "../logistro", editable = true } [tool.ruff] -src = ["choreographer"] +src = ["src"] [tool.ruff.lint] select = ["ALL"] @@ -129,4 +129,4 @@ help = "Run any/all tests one by one with basic settings: can include filename a [tool.pyright] venvPath = "." venv = ".venv" -include = ["choreographer", "tests"] +include = ["src", "tests"] From f015a67b78365b8d7ce23da6330b4247700fb443 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Sun, 9 Nov 2025 13:51:18 -0500 Subject: [PATCH 5/5] Fix github action. --- .github/workflows/ruff.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 5cd857d3..b9a0b78c 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -8,4 +8,4 @@ jobs: - uses: actions/checkout@v4 - uses: astral-sh/ruff-action@v3 with: - src: 'choreographer' + src: 'src'