From 5d553a6542ef61ad5cdf9cc020affd054155c139 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Tue, 18 May 2021 20:39:25 +1000 Subject: [PATCH] release: Move to python3.9 --- Dockerfile | 2 +- README.md | 2 +- appimage/AppRun | 2 +- build-flatpak.py | 2 +- eris/__main__.py | 2 +- eris/fill3.py | 2 +- eris/pydoc_color.py | 2 +- eris/tools.py | 4 ++-- eris/tools.toml | 18 +++++++++--------- eris/webserver.py | 2 +- eris/worker.py | 2 +- install-dependencies | 4 ++-- install-tools | 2 +- make-appimage.py | 2 +- make-flatpak-manifest.py | 10 +++++----- make-readme.py | 4 ++-- setup.py | 2 +- test_distributions.py | 2 +- tests/__main___test.py | 2 +- tests/fill3_test.py | 2 +- tests/lscolors_test.py | 2 +- tests/paged_list_test.py | 2 +- tests/termstr_test.py | 2 +- tests/tools_test.py | 2 +- tests/worker_test.py | 2 +- 25 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ae107a..c20792b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,6 @@ RUN cd eris && git checkout afa6870484e50ad4ba7b8d662c4ed708c29a759b RUN rm -rf eris/.git RUN DEBIAN_FRONTEND=noninteractive apt install -y tzdata RUN cd eris && ./install-dependencies -RUN python3.8 -m pip install ./eris +RUN python3.9 -m pip install ./eris ENTRYPOINT ["eris"] diff --git a/README.md b/README.md index 2bdfd88..619acce 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase. # git clone https://github.com/ahamilton/eris # cd eris # ./install-dependencies - # python3.8 -m pip install . + # python3.9 -m pip install . # eris -h ### Flatpak diff --git a/appimage/AppRun b/appimage/AppRun index 8c1daa9..d2ad94c 100755 --- a/appimage/AppRun +++ b/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.8/dist-packages:"${PYTHONPATH}" +export PYTHONPATH=/usr/local/lib/python3.9/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/build-flatpak.py b/build-flatpak.py index e0a6aa1..f3d7f9e 100755 --- a/build-flatpak.py +++ b/build-flatpak.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.8 +#!/usr/bin/python3.9 import json diff --git a/eris/__main__.py b/eris/__main__.py index 7073c36..2db882b 100755 --- a/eris/__main__.py +++ b/eris/__main__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 # -*- coding: utf-8 -*- diff --git a/eris/fill3.py b/eris/fill3.py index 3ef1a5b..77a0890 100755 --- a/eris/fill3.py +++ b/eris/fill3.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.8 +#!/usr/bin/python3.9 # -*- coding: utf-8 -*- diff --git a/eris/pydoc_color.py b/eris/pydoc_color.py index fd1d981..cefa066 100755 --- a/eris/pydoc_color.py +++ b/eris/pydoc_color.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import pydoc diff --git a/eris/tools.py b/eris/tools.py index b5c231d..024088b 100755 --- a/eris/tools.py +++ b/eris/tools.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.8 +#!/usr/bin/python3.9 # -*- coding: utf-8 -*- @@ -34,7 +34,7 @@ import eris.lscolors as lscolors import eris.termstr as termstr -PYTHON_VERSION = "3.8" +PYTHON_VERSION = "3.9" PYTHON_EXECUTABLE = "python" + PYTHON_VERSION CACHE_PATH = ".eris" diff --git a/eris/tools.toml b/eris/tools.toml index d3a72e2..40e0566 100644 --- a/eris/tools.toml +++ b/eris/tools.toml @@ -47,7 +47,7 @@ tools_for_extensions = [ [python_syntax] dependencies = [] url = "https://en.wikipedia.org/wiki/Python_syntax_and_semantics" - command = "python3.8 -m py_compile" + command = "python3.9 -m py_compile" [pydoc] dependencies = [] @@ -61,34 +61,34 @@ tools_for_extensions = [ [pycodestyle] dependencies = ["pip/pycodestyle"] url = "http://pycodestyle.pycqa.org/en/latest/" - command = "python3.8 -m pycodestyle" + command = "python3.9 -m pycodestyle" [pydocstyle] dependencies = ["pip/pydocstyle"] url = "http://www.pydocstyle.org/en/2.1.1/usage.html" - command = "python3.8 -m pydocstyle --ignore=D1,D213" + command = "python3.9 -m pydocstyle --ignore=D1,D213" [pyflakes] dependencies = ["pip/pyflakes"] url = "https://pypi.org/project/pyflakes/" - command = "python3.8 -m pyflakes" + command = "python3.9 -m pyflakes" [pylint] dependencies = ["pip/pylint"] url = "https://www.pylint.org/" - command = "python3.8 -m pylint -f colorized --errors-only" + command = "python3.9 -m pylint -f colorized --errors-only" has_color = true [python_modulefinder] dependencies = [] url = "https://docs.python.org/3/library/modulefinder.html" - command = "python3.8 -m modulefinder" + command = "python3.9 -m modulefinder" success_status = "normal" [bandit] dependencies = ["pip/bandit"] url = "https://pypi.org/project/bandit/" - command = "python3.8 -m bandit.cli.main -f screen" + command = "python3.9 -m bandit.cli.main -f screen" has_color = true timeout = 60 @@ -122,7 +122,7 @@ tools_for_extensions = [ [dis] dependencies = [] url = "https://docs.python.org/3/library/dis.html" - command = "python3.8 -m dis" + command = "python3.9 -m dis" success_status = "normal" [objdump_headers] @@ -301,7 +301,7 @@ tools_for_extensions = [ [yamllint] dependencies = ["pip/yamllint"] url = "https://github.com/adrienverge/yamllint" - command = "python3.8 -m yamllint -f colored" + command = "python3.9 -m yamllint -f colored" has_color = true [mediainfo] diff --git a/eris/webserver.py b/eris/webserver.py index e2e38f3..3b58303 100755 --- a/eris/webserver.py +++ b/eris/webserver.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import gzip diff --git a/eris/worker.py b/eris/worker.py index 2a1c406..ae5840b 100755 --- a/eris/worker.py +++ b/eris/worker.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import asyncio diff --git a/install-dependencies b/install-dependencies index 521eb76..b319532 100755 --- a/install-dependencies +++ b/install-dependencies @@ -10,8 +10,8 @@ if [ $DIST_ID != "ubuntu" ]; then exit 1 fi echo "Installing the dependencies of the eris script…" -sudo apt --yes install python3-pip python3.8 util-linux -python3.8 -m pip install pyinotify pygments docopt pillow toml +sudo apt --yes install python3-pip python3.9 util-linux +python3.9 -m pip install pyinotify pygments docopt pillow toml echo echo "Installing all the tools eris may need…" ./install-tools diff --git a/install-tools b/install-tools index 67aa06c..2004fdb 100755 --- a/install-tools +++ b/install-tools @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import subprocess diff --git a/make-appimage.py b/make-appimage.py index aa6f955..d205a4e 100755 --- a/make-appimage.py +++ b/make-appimage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import os diff --git a/make-flatpak-manifest.py b/make-flatpak-manifest.py index 2491d43..64aad64 100755 --- a/make-flatpak-manifest.py +++ b/make-flatpak-manifest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.8 +#!/usr/bin/python3.9 import json @@ -103,7 +103,7 @@ def haskell_modules(dep): def python_modules(package): - python_version = "python3.8" + python_version = "python3.9" with tempfile.TemporaryDirectory() as temp_dir: output = subprocess.check_output( [python_version, "-m", "pip", "-v", "download", "--dest", temp_dir, @@ -126,7 +126,7 @@ def python_modules(package): def python_modules_all(packages): - python_version = "python3.8" + python_version = "python3.9" with tempfile.TemporaryDirectory() as temp_dir: output = subprocess.check_output( [python_version, "-m", "pip", "-v", "download", "--dest", temp_dir] @@ -420,7 +420,7 @@ def eris_modules(): modules.append({"name": "eris", "buildsystem": "simple", "build-commands": [ - "python3.8 -m pip install --no-index --prefix=/app .", + "python3.9 -m pip install --no-index --prefix=/app .", "cp -a tests test-all /app/bin"], "sources": [{"type": "git", "url": eris_url, "commit": get_latest_commit()}]}) @@ -513,7 +513,7 @@ def main(): save_manifest(make_manifest(modules, dep), manifest_path) manifest_path = os.path.join(manifests_dir, "python.json") - dep = "python3.8" + dep = "python3.9" print(f"Making manifest for {dep} …".ljust(70), end="", flush=True) if os.path.exists(manifest_path): print(" (cached)") diff --git a/make-readme.py b/make-readme.py index 8697288..bc84c69 100755 --- a/make-readme.py +++ b/make-readme.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 # -*- coding: utf-8 -*- @@ -28,7 +28,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase. # git clone https://github.com/ahamilton/eris # cd eris # ./install-dependencies - # python3.8 -m pip install . + # python3.9 -m pip install . # eris -h ### Flatpak diff --git a/setup.py b/setup.py index bc918fc..0a521b2 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 try: diff --git a/test_distributions.py b/test_distributions.py index ff006a3..7636ca0 100755 --- a/test_distributions.py +++ b/test_distributions.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import os diff --git a/tests/__main___test.py b/tests/__main___test.py index a26589f..fda96c1 100755 --- a/tests/__main___test.py +++ b/tests/__main___test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import asyncio diff --git a/tests/fill3_test.py b/tests/fill3_test.py index dcc418e..ca2a60c 100755 --- a/tests/fill3_test.py +++ b/tests/fill3_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 # -*- coding: utf-8 -*- diff --git a/tests/lscolors_test.py b/tests/lscolors_test.py index 3d41508..9615dc0 100755 --- a/tests/lscolors_test.py +++ b/tests/lscolors_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import os diff --git a/tests/paged_list_test.py b/tests/paged_list_test.py index 6de27ff..179bbe9 100755 --- a/tests/paged_list_test.py +++ b/tests/paged_list_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import pickle diff --git a/tests/termstr_test.py b/tests/termstr_test.py index 3105eab..394d68c 100755 --- a/tests/termstr_test.py +++ b/tests/termstr_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import os diff --git a/tests/tools_test.py b/tests/tools_test.py index c0f464a..7a13f01 100755 --- a/tests/tools_test.py +++ b/tests/tools_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import contextlib diff --git a/tests/worker_test.py b/tests/worker_test.py index 8d15f74..6dae85a 100755 --- a/tests/worker_test.py +++ b/tests/worker_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.8 +#!/usr/bin/env python3.9 import asyncio