Move to python3.8.
This commit is contained in:
parent
c4fc5a8b10
commit
0054c8dfd2
26 changed files with 41 additions and 41 deletions
|
|
@ -10,6 +10,6 @@ RUN cd eris && git checkout b696c65f4cec1ae53a3d49352dd1380a6a8f9510
|
||||||
RUN rm -rf eris/.git
|
RUN rm -rf eris/.git
|
||||||
RUN DEBIAN_FRONTEND=noninteractive apt install -y tzdata
|
RUN DEBIAN_FRONTEND=noninteractive apt install -y tzdata
|
||||||
RUN cd eris && ./install-dependencies
|
RUN cd eris && ./install-dependencies
|
||||||
RUN python3.7 -m pip install ./eris
|
RUN python3.8 -m pip install ./eris
|
||||||
|
|
||||||
ENTRYPOINT ["eris"]
|
ENTRYPOINT ["eris"]
|
||||||
|
|
|
||||||
|
|
@ -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
|
# git clone https://github.com/ahamilton/eris
|
||||||
# cd eris
|
# cd eris
|
||||||
# ./install-dependencies
|
# ./install-dependencies
|
||||||
# python3.7 -m pip install .
|
# python3.8 -m pip install .
|
||||||
# eris -h
|
# eris -h
|
||||||
|
|
||||||
### Flatpak
|
### Flatpak
|
||||||
|
|
|
||||||
|
|
@ -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.7/dist-packages:"${PYTHONPATH}"
|
export PYTHONPATH=/usr/local/lib/python3.8/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} $@
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python3.7
|
#!/usr/bin/python3.8
|
||||||
|
|
||||||
# Copyright (C) 2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python3.7
|
#!/usr/bin/python3.8
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
|
|
@ -35,7 +35,7 @@ import eris.lscolors as lscolors
|
||||||
import eris.termstr as termstr
|
import eris.termstr as termstr
|
||||||
|
|
||||||
|
|
||||||
PYTHON_VERSION = "3.7"
|
PYTHON_VERSION = "3.8"
|
||||||
PYTHON_EXECUTABLE = "python" + PYTHON_VERSION
|
PYTHON_EXECUTABLE = "python" + PYTHON_VERSION
|
||||||
CACHE_PATH = ".eris"
|
CACHE_PATH = ".eris"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,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.7 -m py_compile"
|
command = "python3.8 -m py_compile"
|
||||||
|
|
||||||
[pydoc]
|
[pydoc]
|
||||||
dependencies = []
|
dependencies = []
|
||||||
|
|
@ -63,34 +63,34 @@ tools_for_extensions = [
|
||||||
[pycodestyle]
|
[pycodestyle]
|
||||||
dependencies = ["pip/pycodestyle"]
|
dependencies = ["pip/pycodestyle"]
|
||||||
url = "http://pycodestyle.pycqa.org/en/latest/"
|
url = "http://pycodestyle.pycqa.org/en/latest/"
|
||||||
command = "python3.7 -m pycodestyle"
|
command = "python3.8 -m pycodestyle"
|
||||||
|
|
||||||
[pydocstyle]
|
[pydocstyle]
|
||||||
dependencies = ["pip/pydocstyle"]
|
dependencies = ["pip/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.7 -m pydocstyle --ignore=D1,D213"
|
command = "python3.8 -m pydocstyle --ignore=D1,D213"
|
||||||
|
|
||||||
[pyflakes]
|
[pyflakes]
|
||||||
dependencies = ["pip/pyflakes"]
|
dependencies = ["pip/pyflakes"]
|
||||||
url = "https://pypi.org/project/pyflakes/"
|
url = "https://pypi.org/project/pyflakes/"
|
||||||
command = "python3.7 -m pyflakes"
|
command = "python3.8 -m pyflakes"
|
||||||
|
|
||||||
[pylint]
|
[pylint]
|
||||||
dependencies = ["pip/pylint"]
|
dependencies = ["pip/pylint"]
|
||||||
url = "https://www.pylint.org/"
|
url = "https://www.pylint.org/"
|
||||||
command = "python3.7 -m pylint -f colorized --errors-only"
|
command = "python3.8 -m pylint -f colorized --errors-only"
|
||||||
has_color = true
|
has_color = true
|
||||||
|
|
||||||
[python_modulefinder]
|
[python_modulefinder]
|
||||||
dependencies = []
|
dependencies = []
|
||||||
url = "https://docs.python.org/3/library/modulefinder.html"
|
url = "https://docs.python.org/3/library/modulefinder.html"
|
||||||
command = "python3.7 -m modulefinder"
|
command = "python3.8 -m modulefinder"
|
||||||
success_status = "normal"
|
success_status = "normal"
|
||||||
|
|
||||||
[bandit]
|
[bandit]
|
||||||
dependencies = ["pip/bandit"]
|
dependencies = ["pip/bandit"]
|
||||||
url = "https://pypi.org/project/bandit/"
|
url = "https://pypi.org/project/bandit/"
|
||||||
command = "python3.7 -m bandit.cli.main -f screen"
|
command = "python3.8 -m bandit.cli.main -f screen"
|
||||||
has_color = true
|
has_color = true
|
||||||
timeout = 60
|
timeout = 60
|
||||||
|
|
||||||
|
|
@ -132,7 +132,7 @@ tools_for_extensions = [
|
||||||
[dis]
|
[dis]
|
||||||
dependencies = []
|
dependencies = []
|
||||||
url = "https://docs.python.org/3/library/dis.html"
|
url = "https://docs.python.org/3/library/dis.html"
|
||||||
command = "python3.7 -m dis"
|
command = "python3.8 -m dis"
|
||||||
success_status = "normal"
|
success_status = "normal"
|
||||||
|
|
||||||
[objdump_headers]
|
[objdump_headers]
|
||||||
|
|
@ -317,7 +317,7 @@ tools_for_extensions = [
|
||||||
[yamllint]
|
[yamllint]
|
||||||
dependencies = ["pip/yamllint"]
|
dependencies = ["pip/yamllint"]
|
||||||
url = "https://github.com/adrienverge/yamllint"
|
url = "https://github.com/adrienverge/yamllint"
|
||||||
command = "python3.7 -m yamllint -f colored"
|
command = "python3.8 -m yamllint -f colored"
|
||||||
has_color = true
|
has_color = true
|
||||||
|
|
||||||
[mediainfo]
|
[mediainfo]
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2018-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2018-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,8 @@ if [ $DIST_ID != "ubuntu" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "Installing the dependencies of the eris script…"
|
echo "Installing the dependencies of the eris script…"
|
||||||
sudo apt --yes install python3-pip python3.7 util-linux python3-sortedcontainers
|
sudo apt --yes install python3-pip python3.8 util-linux python3-sortedcontainers
|
||||||
python3.7 -m pip install pyinotify pygments docopt pillow toml
|
python3.8 -m pip install pyinotify pygments docopt pillow toml
|
||||||
echo
|
echo
|
||||||
echo "Installing all the tools eris may need…"
|
echo "Installing all the tools eris may need…"
|
||||||
./install-tools
|
./install-tools
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2017-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2017-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python3.7
|
#!/usr/bin/python3.8
|
||||||
|
|
||||||
# Copyright (C) 2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
@ -106,7 +106,7 @@ def haskell_modules(dep):
|
||||||
|
|
||||||
|
|
||||||
def python_modules(package):
|
def python_modules(package):
|
||||||
python_version = "python3.7"
|
python_version = "python3.8"
|
||||||
with tempfile.TemporaryDirectory() as temp_dir:
|
with tempfile.TemporaryDirectory() as temp_dir:
|
||||||
output = subprocess.check_output(
|
output = subprocess.check_output(
|
||||||
[python_version, "-m", "pip", "download", "--dest", temp_dir,
|
[python_version, "-m", "pip", "download", "--dest", temp_dir,
|
||||||
|
|
@ -130,7 +130,7 @@ def python_modules(package):
|
||||||
|
|
||||||
|
|
||||||
def python_modules_all(packages):
|
def python_modules_all(packages):
|
||||||
python_version = "python3.7"
|
python_version = "python3.8"
|
||||||
with tempfile.TemporaryDirectory() as temp_dir:
|
with tempfile.TemporaryDirectory() as temp_dir:
|
||||||
output = subprocess.check_output(
|
output = subprocess.check_output(
|
||||||
[python_version, "-m", "pip", "download", "--dest", temp_dir] +
|
[python_version, "-m", "pip", "download", "--dest", temp_dir] +
|
||||||
|
|
@ -422,7 +422,7 @@ def eris_modules():
|
||||||
modules.append({"name": "eris",
|
modules.append({"name": "eris",
|
||||||
"buildsystem": "simple",
|
"buildsystem": "simple",
|
||||||
"build-commands": [
|
"build-commands": [
|
||||||
"python3.7 -m pip install --no-index --prefix=/app .",
|
"python3.8 -m pip install --no-index --prefix=/app .",
|
||||||
"cp -a tests test-all /app/bin"],
|
"cp -a tests test-all /app/bin"],
|
||||||
"sources": [{"type": "git", "url": eris_url,
|
"sources": [{"type": "git", "url": eris_url,
|
||||||
"commit": get_latest_commit()}]})
|
"commit": get_latest_commit()}]})
|
||||||
|
|
@ -513,7 +513,7 @@ def main():
|
||||||
save_manifest(make_manifest(modules, dep), manifest_path)
|
save_manifest(make_manifest(modules, dep), manifest_path)
|
||||||
|
|
||||||
manifest_path = os.path.join(manifests_dir, "python.json")
|
manifest_path = os.path.join(manifests_dir, "python.json")
|
||||||
dep = "python3.7"
|
dep = "python3.8"
|
||||||
print(f"Making manifest for {dep} …".ljust(70), end="", flush=True)
|
print(f"Making manifest for {dep} …".ljust(70), end="", flush=True)
|
||||||
if os.path.exists(manifest_path):
|
if os.path.exists(manifest_path):
|
||||||
print(" (cached)")
|
print(" (cached)")
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
|
|
@ -31,7 +31,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase.
|
||||||
# git clone https://github.com/ahamilton/eris
|
# git clone https://github.com/ahamilton/eris
|
||||||
# cd eris
|
# cd eris
|
||||||
# ./install-dependencies
|
# ./install-dependencies
|
||||||
# python3.7 -m pip install .
|
# python3.8 -m pip install .
|
||||||
# eris -h
|
# eris -h
|
||||||
|
|
||||||
### Flatpak
|
### Flatpak
|
||||||
|
|
|
||||||
2
setup.py
2
setup.py
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2017-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2017-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2017-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2017-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2011, 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2011, 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2015-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2016-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2016-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3.7
|
#!/usr/bin/env python3.8
|
||||||
|
|
||||||
# Copyright (C) 2016-2019 Andrew Hamilton. All rights reserved.
|
# Copyright (C) 2016-2019 Andrew Hamilton. All rights reserved.
|
||||||
# Licensed under the Artistic License 2.0.
|
# Licensed under the Artistic License 2.0.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue