diff --git a/pyproject.toml b/pyproject.toml index a9316b6721..81dd1c40ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,6 +76,7 @@ module = [ "pyinotify.*", "pyoembed.*", "pyuca.*", + "pyvips.*", "re2.*", "requests_oauthlib.*", # https://github.com/requests/requests-oauthlib/issues/428 "scim2_filter_parser.attr_paths", diff --git a/requirements/common.in b/requirements/common.in index 6a4a3fdc64..2ab7b95833 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -25,8 +25,9 @@ regex # Needed for manage.py ipython -# Needed for image processing +# Needed for image processing and thumbnailing Pillow +pyvips # Needed for building complex DB queries SQLAlchemy==1.4.* diff --git a/requirements/dev.txt b/requirements/dev.txt index ca3565b8ab..a182498798 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -327,6 +327,7 @@ cffi==1.16.0 \ # argon2-cffi-bindings # cairocffi # cryptography + # pyvips chardet==5.2.0 \ --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \ --hash=sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970 @@ -2479,6 +2480,9 @@ pyuca==1.2 \ --hash=sha256:8a382fe74627f08c0d18908c0713ca4a20aad5385f077579e56208beea2893b2 \ --hash=sha256:abaa12e1bd2c7c68ca8396ff8383bc0654a739cef3ae68fd7af58bf29af0a91e # via -r requirements/common.in +pyvips==2.2.3 \ + --hash=sha256:43bceced0db492654c93008246a58a508e0373ae1621116b87b322f2ac72212f + # via -r requirements/common.in pyyaml==6.0.1 \ --hash=sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5 \ --hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \ diff --git a/requirements/prod.txt b/requirements/prod.txt index 4ccb545507..81ff1fea85 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -249,6 +249,7 @@ cffi==1.16.0 \ # via # argon2-cffi-bindings # cryptography + # pyvips charset-normalizer==3.3.2 \ --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \ --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \ @@ -1958,6 +1959,9 @@ pyuca==1.2 \ --hash=sha256:8a382fe74627f08c0d18908c0713ca4a20aad5385f077579e56208beea2893b2 \ --hash=sha256:abaa12e1bd2c7c68ca8396ff8383bc0654a739cef3ae68fd7af58bf29af0a91e # via -r requirements/common.in +pyvips==2.2.3 \ + --hash=sha256:43bceced0db492654c93008246a58a508e0373ae1621116b87b322f2ac72212f + # via -r requirements/common.in pyyaml==6.0.1 \ --hash=sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5 \ --hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \ diff --git a/scripts/lib/setup_venv.py b/scripts/lib/setup_venv.py index f09a0d1698..2124fc4bb3 100644 --- a/scripts/lib/setup_venv.py +++ b/scripts/lib/setup_venv.py @@ -31,6 +31,7 @@ VENV_DEPENDENCIES = [ "pkg-config", "jq", # No longer used in production (clean me up later) "libsasl2-dev", # For building python-ldap from source + "libvips", # For thumbnailing ] COMMON_YUM_VENV_DEPENDENCIES = [ @@ -51,6 +52,7 @@ COMMON_YUM_VENV_DEPENDENCIES = [ "postgresql-libs", # libpq-dev on apt "openssl-devel", "jq", + "libvips", # For thumbnailing ] REDHAT_VENV_DEPENDENCIES = [ diff --git a/version.py b/version.py index 304d80a80e..3f80e307cb 100644 --- a/version.py +++ b/version.py @@ -48,4 +48,4 @@ API_FEATURE_LEVEL = 266 # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = (281, 1) # bumped 2024-06-16 for updating simplebar +PROVISION_VERSION = (281, 2) # bumped 2024-06-18 for adding libvips diff --git a/zproject/computed_settings.py b/zproject/computed_settings.py index 5d91651417..3621b60eb9 100644 --- a/zproject/computed_settings.py +++ b/zproject/computed_settings.py @@ -889,6 +889,11 @@ LOGGING: Dict[str, Any] = { "handlers": ["scim_file", "errors_file"], "propagate": False, }, + "pyvips": { + "level": "WARNING", + "handlers": ["console", "errors_file"], + "propagate": False, + }, "pika": { # pika is super chatty on INFO. "level": "WARNING",