packaging: Bring dependencies up to date

- python 3.10 -> 3.11
This commit is contained in:
Andrew Hamilton 2023-09-10 21:03:17 +10:00
parent 9fde870c37
commit 4001692b52
25 changed files with 48 additions and 48 deletions

View file

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

View file

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

View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.10
#!/usr/bin/env python3.11
# -*- coding: utf-8 -*-
@ -35,7 +35,7 @@ import toml
import eris
PYTHON_VERSION = "3.10"
PYTHON_VERSION = "3.11"
PYTHON_EXECUTABLE = "python" + PYTHON_VERSION
CACHE_PATH = ".eris"
@ -381,7 +381,7 @@ MAX_IMAGE_SIZE = 200
def _resize_image(image, new_width):
import PIL.Image # Here to avoid 'Segmentation Fault' in apt-install-tools
scale = new_width / image.width
return image.resize((int(image.width * scale), int(image.height * scale)), PIL.Image.ANTIALIAS)
return image.resize((int(image.width * scale), int(image.height * scale)), PIL.Image.LANCZOS)
def _image_to_text(image):

View file

@ -46,7 +46,7 @@ tools_for_extensions = [
[python_syntax]
dependencies = []
url = "https://en.wikipedia.org/wiki/Python_syntax_and_semantics"
command = "python3.10 -m py_compile"
command = "python3.11 -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.10 -m pycodestyle --max-line-length=100"
command = "python3.11 -m pycodestyle --max-line-length=100"
[pydocstyle]
dependencies = ["python3-pydocstyle"]
url = "http://www.pydocstyle.org/en/2.1.1/usage.html"
command = "python3.10 -m pydocstyle --ignore=D1,D213"
command = "python3.11 -m pydocstyle --ignore=D1,D213"
[pyflakes]
dependencies = ["python3-pyflakes"]
url = "https://pypi.org/project/pyflakes/"
command = "python3.10 -m pyflakes"
command = "python3.11 -m pyflakes"
[pylint]
dependencies = ["pylint"]
url = "https://www.pylint.org/"
command = "python3.10 -m pylint -f colorized --errors-only"
command = "python3.11 -m pylint -f colorized --errors-only"
has_color = true
[bandit]
dependencies = ["python3-bandit"]
url = "https://pypi.org/project/bandit/"
command = "python3.10 -m bandit.cli.main -f screen"
command = "python3.11 -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 = ["ruby3.0"]
dependencies = ["ruby3.1"]
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.10 -m yamllint -f colored"
command = "python3.11 -m yamllint -f colored"
has_color = true
[mediainfo]

View file

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

View file

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

View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.10
#!/usr/bin/env python3.11
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.10.0",
python_requires=">=3.11",
packages=["eris"],
py_modules=["sorted_collection"],
package_data={"eris": ["tools.toml"]},
@ -24,6 +24,6 @@ setup(name="eris",
["eris=eris.__main__:entry_point", "eris-worker=eris.worker:main",
"eris-webserver=eris.webserver:main", "pydoc_color=eris.pydoc_color:main"]},
install_requires=[
"pyinotify==0.9.6", "pygments==2.10.0", "docopt==0.6.2", "pillow==8.4.0", "toml==0.10.2",
"decorator==5.1.0", "pexpect==4.8.0", f"fill3 @ file://{REPO_PATH}/fill3",
"pyinotify==0.9.6", "pygments==2.16.1", "docopt==0.6.2", "pillow==10.0.0", "toml==0.10.2",
"decorator==5.1.1", "pexpect==4.8.0", f"fill3 @ file://{REPO_PATH}/fill3",
f"termstr @ file://{REPO_PATH}/termstr", f"lscolors @ file://{REPO_PATH}/lscolors"])

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

14
install
View file

@ -4,12 +4,12 @@
set -e
sudo apt-get install -y python3.10 python3-pip
python3.10 -m pip install --upgrade pip
python3.10 -m pip install $1 ./eris
sudo apt-get install -y python3.11 python3-pip
python3.11 -m pip install --upgrade pip
python3.11 -m pip install $1 ./eris
eris --apt-install-tools
# When developing...
# 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
# python3.11 -m pip install -e ./eris
# python3.11 -m pip install -e ./fill3
# python3.11 -m pip install -e ./termstr
# python3.11 -m pip install -e ./lscolors

View file

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

View file

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

View file

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

View file

@ -3,7 +3,7 @@
- Allow custom config files.
- Can install with pip.
- Minor bug fixes.
- Don't have a new snap until core22 is released with python3.10.
- Don't have a new snap until core22 is released with python3.11.
6 December 2021

View file

@ -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.10/dist-packages:"${PYTHONPATH}"
export PYTHONPATH=/usr/local/lib/python3.11/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} $@

View file

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

View file

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

View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.10
#!/usr/bin/env python3.11
# -*- coding: utf-8 -*-
@ -27,13 +27,13 @@ apps:
eris:
command: bin/eris
environment:
PYTHONPATH: $SNAP/lib/python3.10/site-packages:$SNAP/lib/python3.10/dist-packages:$PYTHONPATH
PYTHONPATH: $SNAP/lib/python3.11/site-packages:$SNAP/lib/python3.11/dist-packages:$PYTHONPATH
plugs:
- home
webserver:
command: bin/eris-webserver
environment:
PYTHONPATH: $SNAP/lib/python3.10/site-packages:$SNAP/lib/python3.10/dist-packages:$PYTHONPATH
PYTHONPATH: $SNAP/lib/python3.11/site-packages:$SNAP/lib/python3.11/dist-packages:$PYTHONPATH
plugs:
- home
- network-bind
@ -53,9 +53,9 @@ parts:
- ./fill3
- ./eris
build-environment:
- SNAPCRAFT_PYTHON_INTERPRETER: python3.10
- SNAPCRAFT_PYTHON_INTERPRETER: python3.11
stage-packages:
- python3.10-venv
- python3.11-venv
- python3-distutils
- python3-pkg-resources
- """, end="")

View file

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

View file

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