ahamilton/eris
1
0
Fork 0
Code Releases Activity

packaging: Bring dependencies up to date

Browse source 
- python 3.11 -> 3.12
This commit is contained in:
Andrew Hamilton 2024-07-11 20:14:14 +10:00
parent a3fd5635d0
commit a059ae8192
25 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eris/eris/__main__.py
View file

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

2
eris/eris/pydoc_color.py
View file

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

4
eris/eris/tools.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.11 #!/usr/bin/env python3.12
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
@ -35,7 +35,7 @@ import toml
import eris import eris
PYTHON_VERSION = "3.11" PYTHON_VERSION = "3.12"
PYTHON_EXECUTABLE = "python" + PYTHON_VERSION PYTHON_EXECUTABLE = "python" + PYTHON_VERSION
CACHE_PATH = ".eris" CACHE_PATH = ".eris"

14
eris/eris/tools.toml
View file

@ -45,7 +45,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.11 -m py_compile" command = "python3.12 -m py_compile"
[pydoc] [pydoc]
dependencies = [] dependencies = []
@ -58,28 +58,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.11 -m pycodestyle --max-line-length=100" command = "python3.12 -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.11 -m pydocstyle --ignore=D1,D213" command = "python3.12 -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.11 -m pyflakes" command = "python3.12 -m pyflakes"
[pylint] [pylint]
dependencies = ["pylint"] dependencies = ["pylint"]
url = "https://www.pylint.org/" url = "https://www.pylint.org/"
command = "python3.11 -m pylint -f colorized --errors-only" command = "python3.12 -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.11 -m bandit.cli.main -f screen" command = "python3.12 -m bandit.cli.main -f screen"
has_color = true has_color = true
timeout = 60 timeout = 60
@ -262,7 +262,7 @@ tools_for_extensions = [
[yamllint] [yamllint]
dependencies = ["yamllint"] dependencies = ["yamllint"]
url = "https://github.com/adrienverge/yamllint" url = "https://github.com/adrienverge/yamllint"
command = "python3.11 -m yamllint -f colored" command = "python3.12 -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.11 #!/usr/bin/env python3.12
import asyncio import asyncio

2
eris/eris/worker.py
View file

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

6
eris/setup.py
View file

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

2
eris/tests/__main___test.py
View file

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

2
eris/tests/paged_list_test.py
View file

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

2
eris/tests/tools_test.py
View file

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

2
eris/tests/worker_test.py
View file

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

2
fill3/fill3/__init__.py
View file

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

2
fill3/setup.py
View file

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

2
fill3/tests/fill3_test.py
View file

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

2
lscolors/setup.py
View file

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

2
lscolors/tests/lscolors_test.py
View file

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

2
packaging/Dockerfile.debian
View file

@ -3,7 +3,7 @@
FROM debian:bookworm FROM debian:bookworm
RUN apt-get update RUN apt-get update
RUN apt-get install -y python3.11 python3-pip pipx RUN apt-get install -y python3.12 python3-pip pipx
COPY . eris COPY . eris
RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris
RUN chmod a+rwx -R /root RUN chmod a+rwx -R /root

2
packaging/Dockerfile.fedora
View file

@ -2,7 +2,7 @@
FROM fedora:38 FROM fedora:38
RUN dnf -y install python3.11 python3-pip pipx gcc python3.11-devel RUN dnf -y install python3.12 python3-pip pipx gcc python3.12-devel
COPY . eris COPY . eris
RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris
RUN chmod a+rwx -R /root RUN chmod a+rwx -R /root

2
packaging/Dockerfile.ubuntu
View file

@ -3,7 +3,7 @@
FROM ubuntu:lunar FROM ubuntu:lunar
RUN apt-get update RUN apt-get update
RUN apt-get install -y python3.11 python3-pip pipx RUN apt-get install -y python3.12 python3-pip pipx
COPY . eris COPY . eris
RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris
RUN chmod a+rwx -R /root RUN chmod a+rwx -R /root

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.11/dist-packages:"${PYTHONPATH}" export PYTHONPATH=/usr/local/lib/python3.12/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.11 #!/usr/bin/env python3.12
import os import os

2
packaging/make-readme.py
View file

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

10
packaging/make-snapcraft.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.11 #!/usr/bin/env python3.12
# -*- 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.11/site-packages:$SNAP/lib/python3.11/dist-packages:$PYTHONPATH PYTHONPATH: $SNAP/lib/python3.12/site-packages:$SNAP/lib/python3.12/dist-packages:$PYTHONPATH
plugs: plugs:
- home - home
webserver: webserver:
command: bin/eris-webserver command: bin/eris-webserver
environment: environment:
PYTHONPATH: $SNAP/lib/python3.11/site-packages:$SNAP/lib/python3.11/dist-packages:$PYTHONPATH PYTHONPATH: $SNAP/lib/python3.12/site-packages:$SNAP/lib/python3.12/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.11 - SNAPCRAFT_PYTHON_INTERPRETER: python3.12
stage-packages: stage-packages:
- python3.11-venv - python3.12-venv
- python3-distutils - python3-distutils
- python3-pkg-resources - python3-pkg-resources
- """, end="") - """, end="")

2
termstr/setup.py
View file

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

2
termstr/tests/termstr_test.py
View file

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