From 611f70ec572163482a8ae3c45d1adf95ef743e94 Mon Sep 17 00:00:00 2001 From: Phill Kelley <34226495+Paraphraser@users.noreply.github.com> Date: Mon, 3 Jul 2023 23:42:26 +1000 Subject: [PATCH] 2023-07-03 Python requirements files + Bookworm - master branch The underlying cause of the problem reported in #660 is the Python requirements files containing pins for (almost) every line item. I appreciate that pinning is what happens by default when requirements files are generated but some of the pinned versions which might have been appropriate for Bullseye when the files were generated will not actually install on Bookworm. This Pull Request removes pins from every line item in each requirements file. In other words, the defaults will become the latest and greatest for each system (Buster or Bullseye or Bookworm). I have tested this on Bullseye and Bookworm (but not Buster), and only to the extent of confirming that each listed package gets installed and the menu doesn't chuck up any complaints. The test systems were built with [PiBuilder](https://github.com/Paraphraser/PiBuilder). **IF** we encounter a problem which needs to be solved by pinning a package to a specific version, we will have to sort out how to do that across OS releases. Fixes: #660 Signed-off-by: Phill Kelley <34226495+Paraphraser@users.noreply.github.com> --- requirements-menu.txt | 10 ++++----- requirements-mkdocs.txt | 48 ++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/requirements-menu.txt b/requirements-menu.txt index 29eca295c..9cf29d1ef 100644 --- a/requirements-menu.txt +++ b/requirements-menu.txt @@ -1,5 +1,5 @@ -blessed==1.19.0 -ruamel.yaml==0.16.12 -ruamel.yaml.clib==0.2.6 -six==1.16.0 -wcwidth==0.2.5 +blessed +ruamel.yaml +ruamel.yaml.clib +six +wcwidth diff --git a/requirements-mkdocs.txt b/requirements-mkdocs.txt index dcf0f8cd7..56851693d 100644 --- a/requirements-mkdocs.txt +++ b/requirements-mkdocs.txt @@ -1,25 +1,25 @@ -bracex==2.2.1 -click==8.0.4 -ghp-import==2.0.2 -importlib-metadata==4.11.2 -Jinja2==3.0.3 -Markdown==3.3.6 -MarkupSafe==2.1.0 -mergedeep==1.3.4 -mkdocs==1.3.0 -mkdocs-awesome-pages-plugin==2.7.0 -mkdocs-material==8.2.13 -mkdocs-material-extensions==1.0.3 +bracex +click +ghp-import +importlib-metadata +Jinja2 +Markdown +MarkupSafe +mergedeep +mkdocs +mkdocs-awesome-pages-plugin +mkdocs-material +mkdocs-material-extensions mkdocs-pagenav-generator @ git+https://github.com/Andre601/mkdocs-pagenav-generator@acb5b1561695e8f69d67fda029779f40e4b0beef -mkdocs-redirects==1.0.3 -packaging==21.3 -Pygments==2.12.0 -pymdown-extensions==9.4 -pyparsing==3.0.7 -python-dateutil==2.8.2 -PyYAML==6.0 -pyyaml_env_tag==0.1 -six==1.16.0 -watchdog==2.1.6 -wcmatch==8.3 -zipp==3.7.0 +mkdocs-redirects +packaging +Pygments +pymdown-extensions +pyparsing +python-dateutil +PyYAML +pyyaml_env_tag +six +watchdog +wcmatch +zipp