From b91c4bda3ee8207f6dbb19213ef16c234cde0d6a Mon Sep 17 00:00:00 2001 From: Heinrich Kruger Date: Sat, 8 Oct 2022 16:11:03 +0100 Subject: [PATCH 1/2] Promote PyYaml to a direct dependency After installing in a fresh Python virtual environment, `tmuxp` fails with `ModuleNotFoundError: No module named 'yaml'`. This happens because since switching from `kaptan` to `ConfigReader`, `PyYaml` is no longer pulled in as a transitive dependency. Adding `PyYaml` as a direct "main" dependency should fix this. --- poetry.lock | 11 +++++++++-- pyproject.toml | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/poetry.lock b/poetry.lock index cde9a5895ac..ed9b1b03346 100644 --- a/poetry.lock +++ b/poetry.lock @@ -644,7 +644,7 @@ python-versions = "*" name = "PyYAML" version = "6.0" description = "YAML parser and emitter for Python" -category = "dev" +category = "main" optional = false python-versions = ">=3.6" @@ -1019,7 +1019,7 @@ test = [] [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "e8612d01080dc3d84b2a3181885f35d227fcb5a9406b5239422cb6e1503143b1" +content-hash = "02bbfa0e2fd180baa58c1474307f15ecdc4304156e52dce31bbce4c7120c4140" [metadata.files] aafigure = [ @@ -1420,6 +1420,13 @@ PyYAML = [ {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, + {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"}, + {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"}, + {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"}, + {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"}, + {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"}, + {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"}, + {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"}, {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, diff --git a/pyproject.toml b/pyproject.toml index ed44e02ba98..1b505eb4400 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,6 +49,7 @@ python = "^3.7" click = "~8" libtmux = "~0.15.8" colorama = ">=0.3.9" +PyYAML = "^6.0" [tool.poetry.dev-dependencies] ### Docs ### From dd56d61fc5e78e1648e7cfb1447a57b2bb3447d8 Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Sat, 8 Oct 2022 10:28:58 -0500 Subject: [PATCH 2/2] docs(CHANGES): Note yaml packaging dependency fix --- CHANGES | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES b/CHANGES index 122086a7873..cc7e182e180 100644 --- a/CHANGES +++ b/CHANGES @@ -19,6 +19,12 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force - _Insert changes/features/fixes for next release here_ +## tmuxp 1.16.2 (unreleased) + +### Packaging + +- Add `yaml` to required dependencies (#833, credit: @heindsight) + ## tmuxp 1.16.1 (2022-10-02) ### Bug fix