diff options
| author | Calum Lind <calumlind+deluge@gmail.com> | 2023-09-18 12:45:01 +0200 |
|---|---|---|
| committer | Calum Lind <calumlind+deluge@gmail.com> | 2023-09-18 14:00:43 +0200 |
| commit | 7082d9cec4f13395cff8e997bf13361ce2d3ee9f (patch) | |
| tree | 7112adc93105782c1c7d20885eef997fe6cda83d | |
| parent | [CI] Remove chardet version constraint (diff) | |
| download | deluge-7082d9cec4f13395cff8e997bf13361ce2d3ee9f.tar.xz deluge-7082d9cec4f13395cff8e997bf13361ce2d3ee9f.zip | |
[CI] Fix packaging errors with Python 3.7
The latest Pillow 10 does not support Py3.7 therefore wheels are no
longer available and we need to specify previous major version.
Older versions of setuptools do not correctly determine the Twisted
requirement for zope.interface>5 on Python 3.7 so ensure latest
installed. For the CD builds we don't want any surprises so keep the
setuptools version pinned.
Refs: https://pillow.readthedocs.io/en/stable/installation.html
Closes: https://github.com/deluge-torrent/deluge/pull/433
| -rw-r--r-- | .github/workflows/cd.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | requirements.txt | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 2abfac0f3..ce0d032c1 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -49,7 +49,7 @@ jobs: cache: pip - name: Prepare pip - run: python -m pip install wheel + run: python -m pip install wheel setuptools==68.* - name: Install GTK run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ad554e0c..6fc6b5b72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: - name: Install dependencies run: | - pip install --upgrade pip wheel + pip install --upgrade pip wheel setuptools pip install -r requirements.txt -r requirements-tests.txt pip install -e . @@ -91,7 +91,7 @@ jobs: - name: Install dependencies run: | - pip install --upgrade pip wheel + pip install --upgrade pip wheel setuptools pip install -r requirements.txt -r requirements-tests.txt pip install -e . diff --git a/requirements.txt b/requirements.txt index 86ffca6ac..a26ec758d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ rencode pyopenssl pyxdg pillow +pillow<=9; python_version=="3.7" mako setuptools chardet |