Make installable on Ubuntu Jammy
- Move to python3.10 - Move to ruby3.0
This commit is contained in:
parent
8aa9c1ed9f
commit
e01e2351b2
26 changed files with 50 additions and 50 deletions
|
|
@ -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:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import pydoc
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import asyncio
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import asyncio
|
||||
|
|
|
|||
|
|
@ -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"]},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import asyncio
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import pickle
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import contextlib
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import asyncio
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/python3.9
|
||||
#!/usr/bin/python3.10
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import os
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
|
|
|
|||
14
install
14
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import os
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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} $@
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import os
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
||||
|
|
|
|||
|
|
@ -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="")
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3.9
|
||||
#!/usr/bin/env python3.10
|
||||
|
||||
|
||||
import os
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue