From 79287c19ee8f9319c0b191fce8531b35b1d24e11 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Thu, 11 Jul 2024 20:27:19 +1000 Subject: [PATCH] Revert "packaging: Bring dependencies up to date" This reverts commit a059ae81924adb205ef644b84856c9f52c046265. Python3.12 is not in the stable distros yet. --- eris/eris/__main__.py | 2 +- eris/eris/pydoc_color.py | 2 +- eris/eris/tools.py | 4 ++-- eris/eris/tools.toml | 14 +++++++------- eris/eris/webserver.py | 2 +- eris/eris/worker.py | 2 +- eris/setup.py | 6 +++--- eris/tests/__main___test.py | 2 +- eris/tests/paged_list_test.py | 2 +- eris/tests/tools_test.py | 2 +- eris/tests/worker_test.py | 2 +- fill3/fill3/__init__.py | 2 +- fill3/setup.py | 2 +- fill3/tests/fill3_test.py | 2 +- lscolors/setup.py | 2 +- lscolors/tests/lscolors_test.py | 2 +- packaging/Dockerfile.debian | 2 +- packaging/Dockerfile.fedora | 2 +- packaging/Dockerfile.ubuntu | 2 +- packaging/appimage/AppRun | 2 +- packaging/make-appimage.py | 2 +- packaging/make-readme.py | 2 +- packaging/make-snapcraft.py | 10 +++++----- termstr/setup.py | 2 +- termstr/tests/termstr_test.py | 2 +- 25 files changed, 38 insertions(+), 38 deletions(-) diff --git a/eris/eris/__main__.py b/eris/eris/__main__.py index 51c7e3c..9fd7d6d 100755 --- a/eris/eris/__main__.py +++ b/eris/eris/__main__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 # -*- coding: utf-8 -*- diff --git a/eris/eris/pydoc_color.py b/eris/eris/pydoc_color.py index 607b885..99e6514 100755 --- a/eris/eris/pydoc_color.py +++ b/eris/eris/pydoc_color.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import pydoc diff --git a/eris/eris/tools.py b/eris/eris/tools.py index 02c7722..9d90ae8 100755 --- a/eris/eris/tools.py +++ b/eris/eris/tools.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 # -*- coding: utf-8 -*- @@ -35,7 +35,7 @@ import toml import eris -PYTHON_VERSION = "3.12" +PYTHON_VERSION = "3.11" PYTHON_EXECUTABLE = "python" + PYTHON_VERSION CACHE_PATH = ".eris" diff --git a/eris/eris/tools.toml b/eris/eris/tools.toml index 241ca42..3e94f14 100644 --- a/eris/eris/tools.toml +++ b/eris/eris/tools.toml @@ -45,7 +45,7 @@ tools_for_extensions = [ [python_syntax] dependencies = [] url = "https://en.wikipedia.org/wiki/Python_syntax_and_semantics" - command = "python3.12 -m py_compile" + command = "python3.11 -m py_compile" [pydoc] dependencies = [] @@ -58,28 +58,28 @@ tools_for_extensions = [ [pycodestyle] dependencies = ["python3-pycodestyle"] url = "http://pycodestyle.pycqa.org/en/latest/" - command = "python3.12 -m pycodestyle --max-line-length=100" + command = "python3.11 -m pycodestyle --max-line-length=100" [pydocstyle] dependencies = ["python3-pydocstyle"] url = "http://www.pydocstyle.org/en/2.1.1/usage.html" - command = "python3.12 -m pydocstyle --ignore=D1,D213" + command = "python3.11 -m pydocstyle --ignore=D1,D213" [pyflakes] dependencies = ["python3-pyflakes"] url = "https://pypi.org/project/pyflakes/" - command = "python3.12 -m pyflakes" + command = "python3.11 -m pyflakes" [pylint] dependencies = ["pylint"] url = "https://www.pylint.org/" - command = "python3.12 -m pylint -f colorized --errors-only" + command = "python3.11 -m pylint -f colorized --errors-only" has_color = true [bandit] dependencies = ["python3-bandit"] url = "https://pypi.org/project/bandit/" - command = "python3.12 -m bandit.cli.main -f screen" + command = "python3.11 -m bandit.cli.main -f screen" has_color = true timeout = 60 @@ -262,7 +262,7 @@ tools_for_extensions = [ [yamllint] dependencies = ["yamllint"] url = "https://github.com/adrienverge/yamllint" - command = "python3.12 -m yamllint -f colored" + command = "python3.11 -m yamllint -f colored" has_color = true [mediainfo] diff --git a/eris/eris/webserver.py b/eris/eris/webserver.py index 0e83a2c..bc29c49 100755 --- a/eris/eris/webserver.py +++ b/eris/eris/webserver.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import asyncio diff --git a/eris/eris/worker.py b/eris/eris/worker.py index b990853..c54b8ac 100755 --- a/eris/eris/worker.py +++ b/eris/eris/worker.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import asyncio diff --git a/eris/setup.py b/eris/setup.py index 881d07e..0e0def6 100755 --- a/eris/setup.py +++ b/eris/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import os @@ -16,7 +16,7 @@ setup(name="eris", author="Andrew Hamilton", author_email="and_hamilton@yahoo.com", license="Artistic 2.0", - python_requires=">=3.12", + python_requires=">=3.11", packages=["eris"], py_modules=["sorted_collection"], package_data={"eris": ["tools.toml"]}, @@ -24,6 +24,6 @@ setup(name="eris", ["eris=eris.__main__:entry_point", "eris-worker=eris.worker:main", "eris-webserver=eris.webserver:main", "pydoc_color=eris.pydoc_color:main"]}, install_requires=[ - "pyinotify==0.9.6", "pyasyncore==1.0.4", "pygments==2.16.1", "docopt==0.6.2", "pillow==10.0.0", + "pyinotify==0.9.6", "pygments==2.16.1", "docopt==0.6.2", "pillow==10.0.0", "toml==0.10.2", "decorator==5.1.1", "pexpect==4.8.0", f"fill3 @ file://{REPO_PATH}/fill3", f"termstr @ file://{REPO_PATH}/termstr", f"lscolors @ file://{REPO_PATH}/lscolors"]) diff --git a/eris/tests/__main___test.py b/eris/tests/__main___test.py index 5803283..e962110 100755 --- a/eris/tests/__main___test.py +++ b/eris/tests/__main___test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import asyncio diff --git a/eris/tests/paged_list_test.py b/eris/tests/paged_list_test.py index 83cd303..0299642 100755 --- a/eris/tests/paged_list_test.py +++ b/eris/tests/paged_list_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import pickle diff --git a/eris/tests/tools_test.py b/eris/tests/tools_test.py index ee1ce8c..e708bf3 100755 --- a/eris/tests/tools_test.py +++ b/eris/tests/tools_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import contextlib diff --git a/eris/tests/worker_test.py b/eris/tests/worker_test.py index 072fbc0..fe24fcf 100755 --- a/eris/tests/worker_test.py +++ b/eris/tests/worker_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import asyncio diff --git a/fill3/fill3/__init__.py b/fill3/fill3/__init__.py index 1d45846..a8b59c8 100755 --- a/fill3/fill3/__init__.py +++ b/fill3/fill3/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.12 +#!/usr/bin/python3.11 # -*- coding: utf-8 -*- diff --git a/fill3/setup.py b/fill3/setup.py index a17e6a4..a9ec6bc 100755 --- a/fill3/setup.py +++ b/fill3/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import os diff --git a/fill3/tests/fill3_test.py b/fill3/tests/fill3_test.py index c93384b..e6ddec0 100755 --- a/fill3/tests/fill3_test.py +++ b/fill3/tests/fill3_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 # -*- coding: utf-8 -*- diff --git a/lscolors/setup.py b/lscolors/setup.py index 5028f3e..c9e14fa 100755 --- a/lscolors/setup.py +++ b/lscolors/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import os diff --git a/lscolors/tests/lscolors_test.py b/lscolors/tests/lscolors_test.py index f610d3d..a19f74b 100755 --- a/lscolors/tests/lscolors_test.py +++ b/lscolors/tests/lscolors_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import os diff --git a/packaging/Dockerfile.debian b/packaging/Dockerfile.debian index 70251b4..2eb076c 100644 --- a/packaging/Dockerfile.debian +++ b/packaging/Dockerfile.debian @@ -3,7 +3,7 @@ FROM debian:bookworm RUN apt-get update -RUN apt-get install -y python3.12 python3-pip pipx +RUN apt-get install -y python3.11 python3-pip pipx COPY . eris RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris RUN chmod a+rwx -R /root diff --git a/packaging/Dockerfile.fedora b/packaging/Dockerfile.fedora index c536a3b..5b1482b 100644 --- a/packaging/Dockerfile.fedora +++ b/packaging/Dockerfile.fedora @@ -2,7 +2,7 @@ FROM fedora:38 -RUN dnf -y install python3.12 python3-pip pipx gcc python3.12-devel +RUN dnf -y install python3.11 python3-pip pipx gcc python3.11-devel COPY . eris RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris RUN chmod a+rwx -R /root diff --git a/packaging/Dockerfile.ubuntu b/packaging/Dockerfile.ubuntu index debc94a..80507e3 100644 --- a/packaging/Dockerfile.ubuntu +++ b/packaging/Dockerfile.ubuntu @@ -3,7 +3,7 @@ FROM ubuntu:lunar RUN apt-get update -RUN apt-get install -y python3.12 python3-pip pipx +RUN apt-get install -y python3.11 python3-pip pipx COPY . eris RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris RUN chmod a+rwx -R /root diff --git a/packaging/appimage/AppRun b/packaging/appimage/AppRun index e8abc34..f3bfefe 100755 --- a/packaging/appimage/AppRun +++ b/packaging/appimage/AppRun @@ -13,7 +13,7 @@ export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/local/bin/:"${PATH}" export UNION_PRELOAD="${HERE}" export LD_PRELOAD="${HERE}/libunionpreload.so" export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}" -export PYTHONPATH=/usr/local/lib/python3.12/dist-packages:"${PYTHONPATH}" +export PYTHONPATH=/usr/local/lib/python3.11/dist-packages:"${PYTHONPATH}" if [ -z $APPIMAGE_ENTER ]; then EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2- | sed -e 's|%.||g') exec ${EXEC} $@ diff --git a/packaging/make-appimage.py b/packaging/make-appimage.py index 5217f0a..2fdbb15 100755 --- a/packaging/make-appimage.py +++ b/packaging/make-appimage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import os diff --git a/packaging/make-readme.py b/packaging/make-readme.py index 778c327..a33383a 100755 --- a/packaging/make-readme.py +++ b/packaging/make-readme.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 # -*- coding: utf-8 -*- diff --git a/packaging/make-snapcraft.py b/packaging/make-snapcraft.py index 2a1c434..e5d9292 100755 --- a/packaging/make-snapcraft.py +++ b/packaging/make-snapcraft.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 # -*- coding: utf-8 -*- @@ -27,13 +27,13 @@ apps: eris: command: bin/eris environment: - PYTHONPATH: $SNAP/lib/python3.12/site-packages:$SNAP/lib/python3.12/dist-packages:$PYTHONPATH + PYTHONPATH: $SNAP/lib/python3.11/site-packages:$SNAP/lib/python3.11/dist-packages:$PYTHONPATH plugs: - home webserver: command: bin/eris-webserver environment: - PYTHONPATH: $SNAP/lib/python3.12/site-packages:$SNAP/lib/python3.12/dist-packages:$PYTHONPATH + PYTHONPATH: $SNAP/lib/python3.11/site-packages:$SNAP/lib/python3.11/dist-packages:$PYTHONPATH plugs: - home - network-bind @@ -53,9 +53,9 @@ parts: - ./fill3 - ./eris build-environment: - - SNAPCRAFT_PYTHON_INTERPRETER: python3.12 + - SNAPCRAFT_PYTHON_INTERPRETER: python3.11 stage-packages: - - python3.12-venv + - python3.11-venv - python3-distutils - python3-pkg-resources - """, end="") diff --git a/termstr/setup.py b/termstr/setup.py index 74a4878..affb1d0 100755 --- a/termstr/setup.py +++ b/termstr/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 try: diff --git a/termstr/tests/termstr_test.py b/termstr/tests/termstr_test.py index f88da42..666f1b8 100755 --- a/termstr/tests/termstr_test.py +++ b/termstr/tests/termstr_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.11 import os