Commit 096a3a9a authored by Jérome Perrin's avatar Jérome Perrin

component/pillow: remove workaround for old buildout

this is actually failing with buildout 3.0.1+slapos007:

    While:
      Installing pillow-python.

    An internal error occurred due to a bug in either zc.buildout or in a
    recipe being used:
    Traceback (most recent call last):
      File "eggs/zc.buildout-3.0.1+slapos007-py3.9.egg/zc/buildout/buildout.py", line 2664, in main
        getattr(buildout, command)(args)
      File "eggs/zc.buildout-3.0.1+slapos007-py3.9.egg/zc/buildout/buildout.py", line 855, in install
        self._install_parts(install_args)
      File "eggs/zc.buildout-3.0.1+slapos007-py3.9.egg/zc/buildout/buildout.py", line 1026, in _install_parts
        installed_files = self[part]._call(recipe.install)
      File "eggs/zc.buildout-3.0.1+slapos007-py3.9.egg/zc/buildout/buildout.py", line 1948, in _call
        return f()
      File "eggs/zc.recipe.egg-2.0.8.dev0+slapos007-py3.9.egg/zc/recipe/egg/custom.py", line 80, in install
        return self._install()
      File "eggs/zc.recipe.egg-2.0.8.dev0+slapos007-py3.9.egg/zc/recipe/egg/custom.py", line 150, in _install
        return zc.buildout.easy_install.build(
      File "eggs/zc.buildout-3.0.1+slapos007-py3.9.egg/zc/buildout/easy_install.py", line 1163, in build
        return installer.build(spec, build_ext, patch_dict=patch_dict)
      File "eggs/zc.buildout-3.0.1+slapos007-py3.9.egg/zc/buildout/easy_install.py", line 970, in build
        patch_dict = patch_dict[dist.project_name]
    KeyError: 'pillow'
parent dbac8bb4
From 77f86b50f097dcf364e0d140e45593bf001d46bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 1 Mar 2024 09:49:17 +0900
Subject: [PATCH] set metadata in setup.py for compatibility with old slapos
buildout
---
setup.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/setup.py b/setup.py
index 1bf0bcff5..a93fe7b22 100755
--- a/setup.py
+++ b/setup.py
@@ -987,6 +987,11 @@ ext_modules = [
try:
setup(
+ name='pillow',
+ version='10.2.0',
+ packages=["PIL"],
+ include_package_data=True,
+ package_dir={"": "src"},
cmdclass={"build_ext": pil_build_ext},
ext_modules=ext_modules,
zip_safe=not (debug_build() or PLATFORM_MINGW),
--
2.42.0
...@@ -34,8 +34,3 @@ rpath = ...@@ -34,8 +34,3 @@ rpath =
${libjpeg:location}/lib ${libjpeg:location}/lib
${libtiff:location}/lib ${libtiff:location}/lib
${zlib:location}/lib ${zlib:location}/lib
Pillow-patches = ${:_profile_base_location_}/../../component/egg-patch/Pillow/0001-set-metadata-in-setup.py-for-compatibility-with-old-.patch#0a06cc5a94d3db24688938731e4b15e2
Pillow-patch-options = -p1
[pillow-python:python2]
Pillow-patches =
...@@ -543,7 +543,7 @@ mysqlclient = 2.1.1 ...@@ -543,7 +543,7 @@ mysqlclient = 2.1.1
paho-mqtt = 1.5.0 paho-mqtt = 1.5.0
pcpp = 1.30 pcpp = 1.30
persistent = 6.1 persistent = 6.1
Pillow = 10.2.0+SlapOSPatched001 Pillow = 10.2.0
plantuml = 0.3.0:whl plantuml = 0.3.0:whl
pypdf = 3.6.0:whl pypdf = 3.6.0:whl
pysftp = 0.2.9 pysftp = 0.2.9
......
...@@ -801,7 +801,7 @@ objgraph = 3.1.0 ...@@ -801,7 +801,7 @@ objgraph = 3.1.0
oic = 1.6.1 oic = 1.6.1
olefile = 0.44 olefile = 0.44
ordered-set = 4.1.0:whl ordered-set = 4.1.0:whl
Pillow = 10.2.0+SlapOSPatched001 Pillow = 10.2.0
polib = 1.2.0 polib = 1.2.0
pprofile = 2.1.0 pprofile = 2.1.0
Products.BTreeFolder2 = 4.4+SlapOSPatched001 Products.BTreeFolder2 = 4.4+SlapOSPatched001
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment