Skip to content

Commit

Permalink
Bump dependencies and update OS matrix (#6492)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jackenmen authored Dec 24, 2024
1 parent 3aac07a commit 8ad9c55
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 95 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/scripts/compile_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ def pip_compile(version: str, name: str) -> None:
if EXCLUDE_STEM_RE.fullmatch(stem):
return

constraint_flags = [
arg
for file in REQUIREMENTS_FOLDER.glob(f"{sys.platform}-3.8-*.txt")
for arg in ("-c", file.name)
]

executable = ("py", f"-{version}") if sys.platform == "win32" else (f"python{version}",)
subprocess.check_call(
(
Expand All @@ -30,6 +36,7 @@ def pip_compile(version: str, name: str) -> None:
f"{name}.in",
"--output-file",
f"{stem}.txt",
*constraint_flags,
)
)

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/scripts/merge_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ def get_requirements(fp: TextIO) -> List[RequirementData]:
via_prefix = "via "
if source.startswith(via_prefix):
source = source[len(via_prefix) :]
if source.startswith("-c ") and source != "-c base.txt":
continue
current.comments.add(source)
elif line and not line.startswith(("#", " ")):
current = RequirementData(line)
Expand Down
27 changes: 0 additions & 27 deletions docs/install_guides/debian-11.rst

This file was deleted.

2 changes: 1 addition & 1 deletion docs/install_guides/fedora.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Installing Red on Fedora Linux
Installing the pre-requirements
-------------------------------

Fedora Linux 39 and above has all required packages available in official repositories. Install
Fedora Linux 40 and above has all required packages available in official repositories. Install
them with dnf:

.. prompt:: bash
Expand Down
1 change: 0 additions & 1 deletion docs/install_guides/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ we recommend **Ubuntu 24.04 LTS**.
amazon-linux-2023
arch
centos-stream-9
debian-11
debian-12
fedora
opensuse-leap-15
Expand Down
23 changes: 5 additions & 18 deletions docs/install_guides/ubuntu-non-lts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,10 @@
Installing Red on Ubuntu non-LTS versions
=========================================

.. include:: _includes/supported-arch-x64+aarch64.rst
Latest Ubuntu non-LTS version (24.10 at the time of writing) is not supported at current time
due to lack of availability of Python 3.11 or older in its repositories.

.. include:: _includes/linux-preamble.rst
The support should come back once we get back on track with supporting current Python versions.

-------------------------------
Installing the pre-requirements
-------------------------------

Now install the pre-requirements with apt:

.. prompt:: bash

sudo apt update
sudo apt -y install python3.11 python3.11-dev python3.11-venv git openjdk-17-jre-headless build-essential nano

.. Include common instructions:
.. include:: _includes/create-env-with-venv3.11.rst

.. include:: _includes/install-and-setup-red-unix.rst
We recommend usage of latest Ubuntu **LTS** versions instead, you can find
`an install guide for Ubuntu 24.04 <ubuntu-2404>` in our docs.
9 changes: 4 additions & 5 deletions docs/version_guarantees.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ Operating system version Supported architectures Ideally supported u
================================ ======================= ============================================================
Windows 10 x86-64 2025-10-14 (`End/Retirement Date <https://docs.microsoft.com/en-us/lifecycle/products/windows-10-home-and-pro>`__)
Windows 11 x86-64 `Retirement Date <https://docs.microsoft.com/en-us/lifecycle/products/windows-11-home-and-pro-version-21h2>`__
macOS 12 (Monterey) x86-64, aarch64 ~2024-10
macOS 13 (Ventura) x86-64, aarch64 ~2025-10
macOS 14 (Sonoma) x86-64, aarch64 ~2026-10
macOS 15 (Sequoia) x86-64, aarch64 ~2027-10
Alma Linux 8 x86-64, aarch64 2029-05-31 (`How long will CloudLinux support AlmaLinux? <https://wiki.almalinux.org/FAQ.html#how-long-will-almalinux-be-supported>`__)
Alma Linux 9 x86-64, aarch64 2032-05-31
Amazon Linux 2023 x86-64, aarch64 2028-03-15 (`end-of-life <https://docs.aws.amazon.com/linux/al2023/release-notes/support-info-by-support-statement.html#support-info-by-support-statement-eol>`__)
Arch Linux x86-64 forever (support is only provided for an up-to-date system)
CentOS Stream 9 x86-64, aarch64 2027-05-31 (`expected EOL <https://centos.org/stream9/#timeline>`__)
Debian 11 Bullseye x86-64, aarch64, armv7l ~2024-07 (`End of life <https://wiki.debian.org/DebianReleases#Production_Releases>`__)
Debian 12 Bookworm x86-64, aarch64, armv7l ~2026-09 (`End of life <https://wiki.debian.org/DebianReleases#Production_Releases>`__)
Fedora Linux 39 x86-64, aarch64 2024-11-12 (`End of Life <https://docs.fedoraproject.org/en-US/releases/lifecycle/#_maintenance_schedule>`__)
Fedora Linux 40 x86-64, aarch64 2025-05-13 (`End of Life <https://docs.fedoraproject.org/en-US/releases/lifecycle/#_maintenance_schedule>`__)
Fedora Linux 40 x86-64, aarch64 2025-05-28 (`End of Life <https://docs.fedoraproject.org/en-US/releases/lifecycle/#_maintenance_schedule>`__)
Fedora Linux 41 x86-64, aarch64 2025-11-19 (`End of Life <https://docs.fedoraproject.org/en-US/releases/lifecycle/#_maintenance_schedule>`__)
openSUSE Leap 15.5 x86-64, aarch64 2024-12-31 (`end of maintenance life cycle <https://en.opensuse.org/Lifetime#openSUSE_Leap>`__)
openSUSE Leap 15.6 x86-64, aarch64 2025-12-31 (`end of maintenance life cycle <https://en.opensuse.org/Lifetime#openSUSE_Leap>`__)
openSUSE Tumbleweed x86-64, aarch64 forever (support is only provided for an up-to-date system)
Oracle Linux 8 x86-64, aarch64 2029-07-31 (`End of Premier Support <https://www.oracle.com/us/support/library/elsp-lifetime-069338.pdf>`__)
Oracle Linux 9 x86-64, aarch64 2032-06-31 (`End of Premier Support <https://www.oracle.com/us/support/library/elsp-lifetime-069338.pdf>`__)
Expand All @@ -80,7 +80,6 @@ Rocky Linux 8 x86-64, aarch64 2029-05-31 (`end-of
Rocky Linux 9 x86-64, aarch64 2032-05-31 (`end-of-life <https://rockylinux.org/download/>`__)
Ubuntu 20.04 LTS x86-64, aarch64 2025-06-30 (`End of Standard Support <https://wiki.ubuntu.com/Releases#Current>`__)
Ubuntu 22.04 LTS x86-64, aarch64 2027-06-30 (`End of Standard Support <https://wiki.ubuntu.com/Releases#Current>`__)
Ubuntu 23.10 x86-64, aarch64 2024-07-31 (`End of Standard Support <https://wiki.ubuntu.com/Releases#Current>`__)
Ubuntu 24.04 LTS x86-64, aarch64 2029-06-30 (`End of Standard Support <https://wiki.ubuntu.com/Releases#Current>`__)
================================ ======================= ============================================================

Expand Down
37 changes: 20 additions & 17 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,67 +10,70 @@ aiosignal==1.3.1
# via aiohttp
apsw==3.46.1.0
# via -r base.in
attrs==24.2.0
attrs==24.3.0
# via aiohttp
babel==2.16.0
# via -r base.in
brotli==1.1.0
# via -r base.in
click==8.1.7
click==8.1.8
# via -r base.in
discord-py==2.4.0
# via
# -r base.in
# red-lavalink
frozenlist==1.4.1
frozenlist==1.5.0
# via
# aiohttp
# aiosignal
idna==3.8
idna==3.10
# via yarl
markdown==3.7
# via -r base.in
markdown-it-py==3.0.0
# via rich
mdurl==0.1.2
# via markdown-it-py
multidict==6.0.5
multidict==6.1.0
# via
# aiohttp
# yarl
orjson==3.10.7
orjson==3.10.12
# via -r base.in
packaging==24.1
packaging==24.2
# via -r base.in
platformdirs==4.2.2
platformdirs==4.3.6
# via -r base.in
psutil==6.0.0
propcache==0.2.0
# via yarl
psutil==6.1.1
# via -r base.in
pygments==2.18.0
# via rich
python-dateutil==2.9.0.post0
# via -r base.in
pyyaml==6.0.2
# via -r base.in
rapidfuzz==3.9.6
rapidfuzz==3.9.7
# via -r base.in
red-commons==1.0.0
# via
# -r base.in
# red-lavalink
red-lavalink==0.11.0
# via -r base.in
rich==13.8.0
rich==13.9.4
# via -r base.in
schema==0.7.7
# via -r base.in
six==1.16.0
six==1.17.0
# via python-dateutil
typing-extensions==4.12.2
# via
# -r base.in
# multidict
# rich
yarl==1.9.4
yarl==1.15.2
# via
# -r base.in
# aiohttp
Expand All @@ -80,11 +83,11 @@ colorama==0.4.6; sys_platform == "win32"
# via click
distro==1.9.0; sys_platform == "linux" and sys_platform == "linux"
# via -r base.in
importlib-metadata==8.4.0; python_version != "3.10" and python_version != "3.11"
importlib-metadata==8.5.0; python_version != "3.10" and python_version != "3.11"
# via markdown
pytz==2024.1; python_version == "3.8"
pytz==2024.2; python_version == "3.8"
# via babel
uvloop==0.20.0; (sys_platform != "win32" and platform_python_implementation == "CPython") and sys_platform != "win32"
uvloop==0.21.0; (sys_platform != "win32" and platform_python_implementation == "CPython") and sys_platform != "win32"
# via -r base.in
zipp==3.20.1; python_version != "3.10" and python_version != "3.11"
zipp==3.20.2; python_version != "3.10" and python_version != "3.11"
# via importlib-metadata
28 changes: 11 additions & 17 deletions requirements/extra-doc.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
alabaster==0.7.13
# via sphinx
certifi==2024.7.4
certifi==2024.12.14
# via requests
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via requests
docutils==0.20.1
# via
Expand All @@ -11,18 +11,14 @@ docutils==0.20.1
# sphinx-rtd-theme
imagesize==1.4.1
# via sphinx
importlib-metadata==8.4.0
# via
# -c base.txt
# sphinx
jinja2==3.1.4
importlib-metadata==8.5.0
# via sphinx
jinja2==3.1.5
# via sphinx
markupsafe==2.1.5
# via jinja2
pytz==2024.1
# via
# -c base.txt
# babel
pytz==2024.2
# via babel
requests==2.32.3
# via sphinx
snowballstemmer==2.2.0
Expand All @@ -36,7 +32,7 @@ sphinx==7.1.2
# sphinxcontrib-trio
sphinx-prompt==1.7.0
# via -r extra-doc.in
sphinx-rtd-theme==2.0.0
sphinx-rtd-theme==3.0.2
# via -r extra-doc.in
sphinxcontrib-applehelp==1.0.4
# via sphinx
Expand All @@ -54,9 +50,7 @@ sphinxcontrib-serializinghtml==1.1.5
# via sphinx
sphinxcontrib-trio==1.1.2
# via -r extra-doc.in
urllib3==2.2.2
urllib3==2.2.3
# via requests
zipp==3.20.1
# via
# -c base.txt
# importlib-metadata
zipp==3.20.2
# via importlib-metadata
6 changes: 1 addition & 5 deletions requirements/extra-postgres.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
async-timeout==4.0.3
# via
# -c base.txt
# asyncpg
asyncpg==0.29.0
asyncpg==0.30.0
# via -r extra-postgres.in
2 changes: 1 addition & 1 deletion requirements/extra-style.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ mypy-extensions==1.0.0
# via black
pathspec==0.12.1
# via black
tomli==2.0.1
tomli==2.2.1
# via black
6 changes: 3 additions & 3 deletions requirements/extra-test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
astroid==3.2.4
# via pylint
dill==0.3.8
dill==0.3.9
# via pylint
iniconfig==2.0.0
# via pytest
Expand All @@ -10,7 +10,7 @@ mccabe==0.7.0
# via pylint
pluggy==1.5.0
# via pytest
pylint==3.2.6
pylint==3.2.7
# via -r extra-test.in
pytest==7.4.4
# via
Expand All @@ -25,7 +25,7 @@ tomlkit==0.13.2
# via pylint
exceptiongroup==1.2.2; python_version != "3.11"
# via pytest
tomli==2.0.1; python_version != "3.11"
tomli==2.2.1; python_version != "3.11"
# via
# pylint
# pytest

0 comments on commit 8ad9c55

Please sign in to comment.