ahamilton/eris
1
0
Fork 0
Code Releases Activity

Make installable on Ubuntu Jammy

Browse source 
- Move to python3.10
- Move to ruby3.0
This commit is contained in:
Andrew Hamilton 2022-04-23 17:36:22 +10:00
parent 8aa9c1ed9f
commit e01e2351b2
26 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -6,7 +6,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase.
## Installation ## Installation
#### Ubuntu (21.10) #### Ubuntu (22.04)
Install eris directly using pip, and apt install the tools eris relies on: Install eris directly using pip, and apt install the tools eris relies on:

2
eris/eris/__main__.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-

2
eris/eris/pydoc_color.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import pydoc import pydoc

4
eris/eris/tools.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
@ -35,7 +35,7 @@ import toml
import eris import eris
PYTHON_VERSION = "3.9" PYTHON_VERSION = "3.10"
PYTHON_EXECUTABLE = "python" + PYTHON_VERSION PYTHON_EXECUTABLE = "python" + PYTHON_VERSION
CACHE_PATH = ".eris" CACHE_PATH = ".eris"

16
eris/eris/tools.toml
View file

@ -46,7 +46,7 @@ tools_for_extensions = [
[python_syntax] [python_syntax]
dependencies = [] dependencies = []
url = "https://en.wikipedia.org/wiki/Python_syntax_and_semantics" url = "https://en.wikipedia.org/wiki/Python_syntax_and_semantics"
command = "python3.9 -m py_compile" command = "python3.10 -m py_compile"
[pydoc] [pydoc]
dependencies = [] dependencies = []
@ -59,28 +59,28 @@ tools_for_extensions = [
[pycodestyle] [pycodestyle]
dependencies = ["python3-pycodestyle"] dependencies = ["python3-pycodestyle"]
url = "http://pycodestyle.pycqa.org/en/latest/" 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] [pydocstyle]
dependencies = ["python3-pydocstyle"] dependencies = ["python3-pydocstyle"]
url = "http://www.pydocstyle.org/en/2.1.1/usage.html" 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] [pyflakes]
dependencies = ["python3-pyflakes"] dependencies = ["python3-pyflakes"]
url = "https://pypi.org/project/pyflakes/" url = "https://pypi.org/project/pyflakes/"
command = "python3.9 -m pyflakes" command = "python3.10 -m pyflakes"
[pylint] [pylint]
dependencies = ["pylint"] dependencies = ["pylint"]
url = "https://www.pylint.org/" 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 has_color = true
[bandit] [bandit]
dependencies = ["python3-bandit"] dependencies = ["python3-bandit"]
url = "https://pypi.org/project/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 has_color = true
timeout = 60 timeout = 60
@ -230,7 +230,7 @@ tools_for_extensions = [
command = "cppcheck --error-exitcode=1" command = "cppcheck --error-exitcode=1"
[ruby_syntax] [ruby_syntax]
dependencies = ["ruby2.7"] dependencies = ["ruby3.0"]
url = "http://www.ruby-lang.org/" url = "http://www.ruby-lang.org/"
command = "ruby -c" command = "ruby -c"
@ -268,7 +268,7 @@ tools_for_extensions = [
[yamllint] [yamllint]
dependencies = ["yamllint"] dependencies = ["yamllint"]
url = "https://github.com/adrienverge/yamllint" url = "https://github.com/adrienverge/yamllint"
command = "python3.9 -m yamllint -f colored" command = "python3.10 -m yamllint -f colored"
has_color = true has_color = true
[mediainfo] [mediainfo]

2
eris/eris/webserver.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import asyncio import asyncio

2
eris/eris/worker.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import asyncio import asyncio

4
eris/setup.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import os import os
@ -16,7 +16,7 @@ setup(name="eris",
author="Andrew Hamilton", author="Andrew Hamilton",
author_email="and_hamilton@yahoo.com", author_email="and_hamilton@yahoo.com",
license="Artistic 2.0", license="Artistic 2.0",
python_requires=">=3.9.0", python_requires=">=3.10.0",
packages=["eris"], packages=["eris"],
py_modules=["lscolors", "sorted_collection"], py_modules=["lscolors", "sorted_collection"],
package_data={"eris": ["LS_COLORS.sh", "tools.toml"]}, package_data={"eris": ["LS_COLORS.sh", "tools.toml"]},

2
eris/tests/__main___test.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import asyncio import asyncio

2
eris/tests/paged_list_test.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import pickle import pickle

2
eris/tests/tools_test.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import contextlib import contextlib

2
eris/tests/worker_test.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import asyncio import asyncio

2
fill3/fill3/__init__.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/python3.9 #!/usr/bin/python3.10
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-

2
fill3/setup.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import os import os

2
fill3/tests/fill3_test.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-

14
install
View file

@ -4,12 +4,12 @@
set -e set -e
sudo apt-get install -y python3.9 python3-pip sudo apt-get install -y python3.10 python3-pip
python3.9 -m pip install --upgrade pip python3.10 -m pip install --upgrade pip
python3.9 -m pip install $1 ./eris python3.10 -m pip install $1 ./eris
eris --apt-install-tools eris --apt-install-tools
# When developing... # When developing...
# python3.9 -m pip install -e ./eris # python3.10 -m pip install -e ./eris
# python3.9 -m pip install -e ./fill3 # python3.10 -m pip install -e ./fill3
# python3.9 -m pip install -e ./termstr # python3.10 -m pip install -e ./termstr
# python3.9 -m pip install -e ./lscolors # python3.10 -m pip install -e ./lscolors

2
lscolors/setup.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
try: try:

2
lscolors/tests/lscolors_test.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import os import os

4
packaging/Dockerfile
View file

@ -3,8 +3,8 @@ FROM ubuntu:impish
RUN apt-get update RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
RUN apt-get install -y sudo python3.9 python3-pip RUN apt-get install -y sudo python3.10 python3-pip
RUN python3.9 -m pip install --upgrade pip RUN python3.10 -m pip install --upgrade pip
COPY . eris COPY . eris
RUN cd eris && ./install RUN cd eris && ./install

2
packaging/appimage/AppRun
View file

@ -13,7 +13,7 @@ export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/local/bin/:"${PATH}"
export UNION_PRELOAD="${HERE}" export UNION_PRELOAD="${HERE}"
export LD_PRELOAD="${HERE}/libunionpreload.so" 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 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 if [ -z $APPIMAGE_ENTER ]; then
EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2- | sed -e 's|%.||g') EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2- | sed -e 's|%.||g')
exec ${EXEC} $@ exec ${EXEC} $@

2
packaging/make-appimage.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import os import os

4
packaging/make-readme.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
@ -22,7 +22,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase.
## Installation ## Installation
#### Ubuntu (21.10) #### Ubuntu (22.04)
Install eris directly using pip, and apt install the tools eris relies on: Install eris directly using pip, and apt install the tools eris relies on:

10
packaging/make-snapcraft.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
@ -27,13 +27,13 @@ apps:
eris: eris:
command: bin/eris command: bin/eris
environment: 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: plugs:
- home - home
webserver: webserver:
command: bin/eris-webserver command: bin/eris-webserver
environment: 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: plugs:
- home - home
- network-bind - network-bind
@ -53,9 +53,9 @@ parts:
- ./fill3 - ./fill3
- ./eris - ./eris
build-environment: build-environment:
- SNAPCRAFT_PYTHON_INTERPRETER: python3.9 - SNAPCRAFT_PYTHON_INTERPRETER: python3.10
stage-packages: stage-packages:
- python3.9-venv - python3.10-venv
- python3-distutils - python3-distutils
- python3-pkg-resources - python3-pkg-resources
- """, end="") - """, end="")

8
snap/snapcraft.yaml
View file

@ -18,13 +18,13 @@ apps:
eris: eris:
command: bin/eris command: bin/eris
environment: 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: plugs:
- home - home
webserver: webserver:
command: bin/eris-webserver command: bin/eris-webserver
environment: 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: plugs:
- home - home
- network-bind - network-bind
@ -44,9 +44,9 @@ parts:
- ./fill3 - ./fill3
- ./eris - ./eris
build-environment: build-environment:
- SNAPCRAFT_PYTHON_INTERPRETER: python3.9 - SNAPCRAFT_PYTHON_INTERPRETER: python3.10
stage-packages: stage-packages:
- python3.9-venv - python3.10-venv
- python3-distutils - python3-distutils
- python3-pkg-resources - python3-pkg-resources
- binutils - binutils

2
termstr/setup.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
try: try:

2
termstr/tests/termstr_test.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.9 #!/usr/bin/env python3.10
import os import os