diff --git a/.github/workflows/zulip-ci.yml b/.github/workflows/zulip-ci.yml index 175d4a308..2c2ca8807 100644 --- a/.github/workflows/zulip-ci.yml +++ b/.github/workflows/zulip-ci.yml @@ -20,7 +20,9 @@ jobs: fail-fast: false matrix: include: - # Bullseye ships with Python 3.9.2. + # Bullseye ships with Python 3.9.2. Bullseye is EOL and its + # packages were removed from deb.debian.org, so we point apt at + # the Debian archive (see the archive-mirror setup step below). - docker_image: zulip/ci:bullseye name: Debian 11 (Python 3.9, backend) os: bullseye @@ -70,6 +72,21 @@ jobs: ref: ${{ matrix.server_version }} path: server + - name: "Rewrite apt sources to the Debian and PGDG archives (bullseye is EOL)" + if: matrix.os == 'bullseye' + run: | + sudo sed -i \ + -e 's|deb.debian.org/debian-security|archive.debian.org/debian-security|g' \ + -e 's|security.debian.org/debian-security|archive.debian.org/debian-security|g' \ + -e 's|deb.debian.org/debian|archive.debian.org/debian|g' \ + /etc/apt/sources.list + # Point the server's provision script at the archived PGDG repo; + # bullseye-pgdg no longer exists on apt.postgresql.org. + sed -i 's|apt.postgresql.org|apt-archive.postgresql.org|' server/scripts/lib/setup-apt-repo + # semgrep==0.50.1 was removed from PyPI; it is a lint-only + # dependency and is not needed to run the API tests. + sed -i '/^semgrep==/,/^ # via/d' server/requirements/dev.txt + - name: Install dependencies run: | cd server diff --git a/.github/workflows/zulip-tests.yml b/.github/workflows/zulip-tests.yml index 5e3c46353..f919c6c31 100644 --- a/.github/workflows/zulip-tests.yml +++ b/.github/workflows/zulip-tests.yml @@ -16,10 +16,10 @@ jobs: steps: - uses: actions/checkout@v6 - - name: Set up Python 3.9 + - name: Set up Python 3.10 uses: actions/setup-python@v6 with: - python-version: "3.9" + python-version: "3.10" - name: Install dependencies run: tools/provision --force @@ -35,7 +35,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v6 diff --git a/requirements.txt b/requirements.txt index 3c2af8284..f243afaea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ ruff~=0.2.2 -e ./zulip -e ./zulip_bots -e ./zulip_botserver -git+https://github.com/zulip/zulint@417b4e4971fdd5ca8e84847f1391b657b188631a#egg=zulint==1.0.0 +git+https://github.com/zulip/zulint@417b4e4971fdd5ca8e84847f1391b657b188631a mypy==1.8.0 types-httplib2 types-python-dateutil