From 86055cf39fc695306a7bbef469954c27f3a6a818 Mon Sep 17 00:00:00 2001 From: Niloth P <20315308+Niloth-p@users.noreply.github.com> Date: Wed, 13 Nov 2024 07:55:00 +0530 Subject: [PATCH] ci: Remove Python 3.8; add Python 3.11. --- .github/workflows/zulip-ci.yml | 14 +++++++------- .github/workflows/zulip-tests.yml | 7 ++++--- pyproject.toml | 2 +- zulip/README.md | 2 +- zulip/setup.py | 4 ++-- zulip_bots/setup.py | 4 ++-- zulip_botserver/setup.py | 4 ++-- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/zulip-ci.yml b/.github/workflows/zulip-ci.yml index a80573c8a..d1054233a 100644 --- a/.github/workflows/zulip-ci.yml +++ b/.github/workflows/zulip-ci.yml @@ -5,7 +5,7 @@ # server release. name: Zulip server CI -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] defaults: run: @@ -17,12 +17,6 @@ jobs: fail-fast: false matrix: include: - # Focal ships with Python 3.8.10. - - docker_image: zulip/ci:focal - name: Ubuntu 20.04 (Python 3.8, backend) - os: focal - legacy_client_interface: "3" - server_version: refs/tags/3.2 # Bullseye ships with Python 3.9.2. - docker_image: zulip/ci:bullseye name: Debian 11 (Python 3.9, backend) @@ -35,6 +29,12 @@ jobs: os: jammy legacy_client_interface: "6" server_version: refs/tags/6.0 + # Debian 12 ships with Python 3.11.2. + - docker_image: zulip/ci:bookworm + name: Debian 12 (Python 3.11, backend + documentation) + os: bookworm + legacy_client_interface: "7" + server_version: refs/tags/7.0 runs-on: ubuntu-latest name: ${{ matrix.name }} (Zulip ${{matrix.server_version}}) diff --git a/.github/workflows/zulip-tests.yml b/.github/workflows/zulip-tests.yml index 3ac833fc2..5ba1700b7 100644 --- a/.github/workflows/zulip-tests.yml +++ b/.github/workflows/zulip-tests.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - ci-11 pull_request: jobs: @@ -13,10 +14,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies run: tools/provision --force @@ -32,7 +33,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/pyproject.toml b/pyproject.toml index 13eecfd94..159c85e23 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.black] line-length = 100 -target-version = ["py38"] +target-version = ["py39"] [tool.isort] src_paths = [ diff --git a/zulip/README.md b/zulip/README.md index 024f78615..75845bfee 100644 --- a/zulip/README.md +++ b/zulip/README.md @@ -3,7 +3,7 @@ The [Zulip API](https://zulip.com/api) Python bindings require the following dependencies: -* **Python (version >= 3.8)** +* **Python (version >= 3.9)** * requests (version >= 0.12.1) **Note**: If you'd like to use the Zulip bindings with Python 2, we diff --git a/zulip/setup.py b/zulip/setup.py index 853908d29..137fc29ee 100755 --- a/zulip/setup.py +++ b/zulip/setup.py @@ -42,12 +42,12 @@ def recur_expand(target_root: Any, dir: Any) -> Generator[Tuple[str, List[str]], "License :: OSI Approved :: Apache Software License", "Topic :: Communications :: Chat", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], - python_requires=">=3.8", + python_requires=">=3.9", url="https://www.zulip.org/", project_urls={ "Source": "https://github.com/zulip/python-zulip-api/", diff --git a/zulip_bots/setup.py b/zulip_bots/setup.py index d81a40a12..8bc956568 100644 --- a/zulip_bots/setup.py +++ b/zulip_bots/setup.py @@ -32,12 +32,12 @@ "License :: OSI Approved :: Apache Software License", "Topic :: Communications :: Chat", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], - python_requires=">=3.8", + python_requires=">=3.9", url="https://www.zulip.org/", project_urls={ "Source": "https://github.com/zulip/python-zulip-api/", diff --git a/zulip_botserver/setup.py b/zulip_botserver/setup.py index de3428c8d..cd891dea2 100644 --- a/zulip_botserver/setup.py +++ b/zulip_botserver/setup.py @@ -20,12 +20,12 @@ "License :: OSI Approved :: Apache Software License", "Topic :: Communications :: Chat", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], - python_requires=">=3.8", + python_requires=">=3.9", url="https://www.zulip.org/", project_urls={ "Source": "https://github.com/zulip/python-zulip-api/",