diff --git a/README.md b/README.md index 033e674..f4edaf1 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase. ## Installation -#### Ubuntu (21.10) +#### Ubuntu (22.04) Install eris directly using pip, and apt install the tools eris relies on: diff --git a/eris/eris/__main__.py b/eris/eris/__main__.py index 0f371f5..1f1b9d8 100755 --- a/eris/eris/__main__.py +++ b/eris/eris/__main__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 # -*- coding: utf-8 -*- diff --git a/eris/eris/pydoc_color.py b/eris/eris/pydoc_color.py index 9955978..f6678e9 100755 --- a/eris/eris/pydoc_color.py +++ b/eris/eris/pydoc_color.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import pydoc diff --git a/eris/eris/tools.py b/eris/eris/tools.py index 7e56a24..91e87d2 100755 --- a/eris/eris/tools.py +++ b/eris/eris/tools.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 # -*- coding: utf-8 -*- @@ -35,7 +35,7 @@ import toml import eris -PYTHON_VERSION = "3.9" +PYTHON_VERSION = "3.10" PYTHON_EXECUTABLE = "python" + PYTHON_VERSION CACHE_PATH = ".eris" diff --git a/eris/eris/tools.toml b/eris/eris/tools.toml index 9b377e8..aef39d3 100644 --- a/eris/eris/tools.toml +++ b/eris/eris/tools.toml @@ -46,7 +46,7 @@ tools_for_extensions = [ [python_syntax] dependencies = [] url = "https://en.wikipedia.org/wiki/Python_syntax_and_semantics" - command = "python3.9 -m py_compile" + command = "python3.10 -m py_compile" [pydoc] dependencies = [] @@ -59,28 +59,28 @@ tools_for_extensions = [ [pycodestyle] dependencies = ["python3-pycodestyle"] url = "http://pycodestyle.pycqa.org/en/latest/" - command = "python3.9 -m pycodestyle --max-line-length=100" + command = "python3.10 -m pycodestyle --max-line-length=100" [pydocstyle] dependencies = ["python3-pydocstyle"] url = "http://www.pydocstyle.org/en/2.1.1/usage.html" - command = "python3.9 -m pydocstyle --ignore=D1,D213" + command = "python3.10 -m pydocstyle --ignore=D1,D213" [pyflakes] dependencies = ["python3-pyflakes"] url = "https://pypi.org/project/pyflakes/" - command = "python3.9 -m pyflakes" + command = "python3.10 -m pyflakes" [pylint] dependencies = ["pylint"] url = "https://www.pylint.org/" - command = "python3.9 -m pylint -f colorized --errors-only" + command = "python3.10 -m pylint -f colorized --errors-only" has_color = true [bandit] dependencies = ["python3-bandit"] url = "https://pypi.org/project/bandit/" - command = "python3.9 -m bandit.cli.main -f screen" + command = "python3.10 -m bandit.cli.main -f screen" has_color = true timeout = 60 @@ -230,7 +230,7 @@ tools_for_extensions = [ command = "cppcheck --error-exitcode=1" [ruby_syntax] - dependencies = ["ruby2.7"] + dependencies = ["ruby3.0"] url = "http://www.ruby-lang.org/" command = "ruby -c" @@ -268,7 +268,7 @@ tools_for_extensions = [ [yamllint] dependencies = ["yamllint"] url = "https://github.com/adrienverge/yamllint" - command = "python3.9 -m yamllint -f colored" + command = "python3.10 -m yamllint -f colored" has_color = true [mediainfo] diff --git a/eris/eris/webserver.py b/eris/eris/webserver.py index 9021050..57f7810 100755 --- a/eris/eris/webserver.py +++ b/eris/eris/webserver.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import asyncio diff --git a/eris/eris/worker.py b/eris/eris/worker.py index 3460b01..4f76194 100755 --- a/eris/eris/worker.py +++ b/eris/eris/worker.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import asyncio diff --git a/eris/setup.py b/eris/setup.py index 0d76d5f..a4e5750 100755 --- a/eris/setup.py +++ b/eris/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 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.9.0", + python_requires=">=3.10.0", packages=["eris"], py_modules=["lscolors", "sorted_collection"], package_data={"eris": ["LS_COLORS.sh", "tools.toml"]}, diff --git a/eris/tests/__main___test.py b/eris/tests/__main___test.py index 0e336a5..07e45e8 100755 --- a/eris/tests/__main___test.py +++ b/eris/tests/__main___test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import asyncio diff --git a/eris/tests/paged_list_test.py b/eris/tests/paged_list_test.py index 64c3625..760a2cb 100755 --- a/eris/tests/paged_list_test.py +++ b/eris/tests/paged_list_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import pickle diff --git a/eris/tests/tools_test.py b/eris/tests/tools_test.py index e50dd74..a81e61c 100755 --- a/eris/tests/tools_test.py +++ b/eris/tests/tools_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import contextlib diff --git a/eris/tests/worker_test.py b/eris/tests/worker_test.py index 3e1d470..7a5eea4 100755 --- a/eris/tests/worker_test.py +++ b/eris/tests/worker_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import asyncio diff --git a/fill3/fill3/__init__.py b/fill3/fill3/__init__.py index fc31582..19e090e 100755 --- a/fill3/fill3/__init__.py +++ b/fill3/fill3/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 +#!/usr/bin/python3.10 # -*- coding: utf-8 -*- diff --git a/fill3/setup.py b/fill3/setup.py index e979afe..22a8b7f 100755 --- a/fill3/setup.py +++ b/fill3/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import os diff --git a/fill3/tests/fill3_test.py b/fill3/tests/fill3_test.py index d67f2e2..d9814ec 100755 --- a/fill3/tests/fill3_test.py +++ b/fill3/tests/fill3_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 # -*- coding: utf-8 -*- diff --git a/install b/install index 68c6563..ff941a0 100755 --- a/install +++ b/install @@ -4,12 +4,12 @@ set -e -sudo apt-get install -y python3.9 python3-pip -python3.9 -m pip install --upgrade pip -python3.9 -m pip install $1 ./eris +sudo apt-get install -y python3.10 python3-pip +python3.10 -m pip install --upgrade pip +python3.10 -m pip install $1 ./eris eris --apt-install-tools # When developing... -# python3.9 -m pip install -e ./eris -# python3.9 -m pip install -e ./fill3 -# python3.9 -m pip install -e ./termstr -# python3.9 -m pip install -e ./lscolors +# python3.10 -m pip install -e ./eris +# python3.10 -m pip install -e ./fill3 +# python3.10 -m pip install -e ./termstr +# python3.10 -m pip install -e ./lscolors diff --git a/lscolors/setup.py b/lscolors/setup.py index 1c5d749..2113ae4 100755 --- a/lscolors/setup.py +++ b/lscolors/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 try: diff --git a/lscolors/tests/lscolors_test.py b/lscolors/tests/lscolors_test.py index ad2bdd4..4a9c808 100755 --- a/lscolors/tests/lscolors_test.py +++ b/lscolors/tests/lscolors_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import os diff --git a/packaging/Dockerfile b/packaging/Dockerfile index 1313d76..e7580ad 100644 --- a/packaging/Dockerfile +++ b/packaging/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:impish RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata -RUN apt-get install -y sudo python3.9 python3-pip -RUN python3.9 -m pip install --upgrade pip +RUN apt-get install -y sudo python3.10 python3-pip +RUN python3.10 -m pip install --upgrade pip COPY . eris RUN cd eris && ./install diff --git a/packaging/appimage/AppRun b/packaging/appimage/AppRun index d2ad94c..46887f6 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.9/dist-packages:"${PYTHONPATH}" +export PYTHONPATH=/usr/local/lib/python3.10/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 0fa29f4..53f5aa8 100755 --- a/packaging/make-appimage.py +++ b/packaging/make-appimage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import os diff --git a/packaging/make-readme.py b/packaging/make-readme.py index 3afd433..dd61ae6 100755 --- a/packaging/make-readme.py +++ b/packaging/make-readme.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 # -*- coding: utf-8 -*- @@ -22,7 +22,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase. ## Installation -#### Ubuntu (21.10) +#### Ubuntu (22.04) Install eris directly using pip, and apt install the tools eris relies on: diff --git a/packaging/make-snapcraft.py b/packaging/make-snapcraft.py index b0fe93f..30f08f2 100755 --- a/packaging/make-snapcraft.py +++ b/packaging/make-snapcraft.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 # -*- coding: utf-8 -*- @@ -27,13 +27,13 @@ apps: eris: command: bin/eris environment: - PYTHONPATH: $SNAP/lib/python3.9/site-packages:$SNAP/lib/python3.9/dist-packages:$PYTHONPATH + PYTHONPATH: $SNAP/lib/python3.10/site-packages:$SNAP/lib/python3.10/dist-packages:$PYTHONPATH plugs: - home webserver: command: bin/eris-webserver environment: - PYTHONPATH: $SNAP/lib/python3.9/site-packages:$SNAP/lib/python3.9/dist-packages:$PYTHONPATH + PYTHONPATH: $SNAP/lib/python3.10/site-packages:$SNAP/lib/python3.10/dist-packages:$PYTHONPATH plugs: - home - network-bind @@ -53,9 +53,9 @@ parts: - ./fill3 - ./eris build-environment: - - SNAPCRAFT_PYTHON_INTERPRETER: python3.9 + - SNAPCRAFT_PYTHON_INTERPRETER: python3.10 stage-packages: - - python3.9-venv + - python3.10-venv - python3-distutils - python3-pkg-resources - """, end="") diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 6a6c4c8..6a60d0f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -18,13 +18,13 @@ apps: eris: command: bin/eris environment: - PYTHONPATH: $SNAP/lib/python3.9/site-packages:$SNAP/lib/python3.9/dist-packages:$PYTHONPATH + PYTHONPATH: $SNAP/lib/python3.10/site-packages:$SNAP/lib/python3.10/dist-packages:$PYTHONPATH plugs: - home webserver: command: bin/eris-webserver environment: - PYTHONPATH: $SNAP/lib/python3.9/site-packages:$SNAP/lib/python3.9/dist-packages:$PYTHONPATH + PYTHONPATH: $SNAP/lib/python3.10/site-packages:$SNAP/lib/python3.10/dist-packages:$PYTHONPATH plugs: - home - network-bind @@ -44,9 +44,9 @@ parts: - ./fill3 - ./eris build-environment: - - SNAPCRAFT_PYTHON_INTERPRETER: python3.9 + - SNAPCRAFT_PYTHON_INTERPRETER: python3.10 stage-packages: - - python3.9-venv + - python3.10-venv - python3-distutils - python3-pkg-resources - binutils diff --git a/termstr/setup.py b/termstr/setup.py index 41d25de..2a08076 100755 --- a/termstr/setup.py +++ b/termstr/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 try: diff --git a/termstr/tests/termstr_test.py b/termstr/tests/termstr_test.py index 274500d..be38474 100755 --- a/termstr/tests/termstr_test.py +++ b/termstr/tests/termstr_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env python3.10 import os