papyru 2.11.2.dev131__tar.gz → 2.13.0__tar.gz

{papyru-2.11.2.dev131/papyru.egg-info → papyru-2.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papyru
-Version: 2.11.2.dev131
+Version: 2.13.0
 Summary: minimal REST library with OpenAPI-based validation for django
 Home-page: http://www.puzzleyou.net/
 Author: puzzleYOU GmbH

{papyru-2.11.2.dev131 → papyru-2.13.0}/papyru/create_variant/edit_template/xml.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from typing import Optional
 from xml.etree.ElementTree import Element, SubElement
 
 from papyru import XMLHelper
@@ -10,13 +11,20 @@ class PlaceholderInfo:
     placeholder: Element
 
 
+@dataclass(frozen=True)
+class ImageCrop:
+    x: float
+    y: float
+    width: float
+    height: float
+
+
 @dataclass(frozen=True)
 class ImageInfo:
     location: str
     width: int
     height: int
-    x_pos: int = None
-    y_pos: int = None
+    crop: Optional[ImageCrop] = None
 
 
 def find_placeholder(doc: XMLHelper,
@@ -85,11 +93,10 @@ def fit_image(doc: XMLHelper,
     image_dims = (float(image_info.width),
                   float(image_info.height))
 
-    image_position = (
-          '0.0' if image_info.x_pos is None else float(image_info.x_pos),
-          '0.0' if image_info.y_pos is None else float(image_info.y_pos))
-
-    viewbox = _fit_dimensions(wrapper_dims, image_dims)
+    viewbox = (_fit_dimensions(wrapper_dims, image_dims)
+               if image_info.crop is None else
+               (image_info.crop.x, image_info.crop.y,
+                image_info.crop.width, image_info.crop.height))
 
     doc.set_attribute(ph.wrapper,
                       'viewBox',
@@ -100,11 +107,21 @@ def fit_image(doc: XMLHelper,
                       'href', image_info.location,
                       'xlink' if has_xlink else None)
 
-    doc.set_attribute(ph.placeholder, 'x', '%s' % image_position[0])
-    doc.set_attribute(ph.placeholder, 'y', '%s' % image_position[1])
+    doc.set_attribute(ph.placeholder, 'x', '0.0')
+    doc.set_attribute(ph.placeholder, 'y', '0.0')
     doc.set_attribute(ph.placeholder, 'width', '%s' % image_dims[0])
     doc.set_attribute(ph.placeholder, 'height', '%s' % image_dims[1])
 
+    if image_info.crop is not None:
+        doc.set_attribute(ph.placeholder, 'bbox',
+                          '{"x": %s, "y": %s, "width": %s, "height": %s}'
+                          % (image_info.crop.x, image_info.crop.y,
+                             image_info.crop.width,
+                             image_info.crop.height), 'pap')
+        doc.set_attribute(ph.placeholder, 'img-dimensions',
+                          '{"width": %s, "height": %s}'
+                          % (image_dims[0], image_dims[1]), 'pap')
+
     _set_changed(doc, ph.placeholder)
 
     return doc

{papyru-2.11.2.dev131 → papyru-2.13.0}/papyru/varspool/command/__init__.py

@@ -1,8 +1,8 @@
+import multiprocessing
 import signal
 import traceback
 from datetime import timedelta
 from functools import wraps
-from multiprocessing import Pool
 from os import getpid, kill
 from sys import exit
 from threading import Condition, Event
@@ -135,7 +135,8 @@ def enter_job_loop(config: VarspoolJobProcessorConfig):
             with active_jobs_reduced:
                 active_jobs_reduced.wait(timeout)
 
-        with Pool(processes=config.max_parallel_job_count) as pool:
+        with multiprocessing.get_context('fork').Pool(
+                processes=config.max_parallel_job_count) as pool:
             @loop_until(
                 time_range=timedelta(minutes=config.max_runtime_in_minutes))
             def wrapper():

{papyru-2.11.2.dev131 → papyru-2.13.0/papyru.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papyru
-Version: 2.11.2.dev131
+Version: 2.13.0
 Summary: minimal REST library with OpenAPI-based validation for django
 Home-page: http://www.puzzleyou.net/
 Author: puzzleYOU GmbH

{papyru-2.11.2.dev131 → papyru-2.13.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='papyru',
-    version='2.11.2.dev131',
+    version='2.13.0',
     description=(
         'minimal REST library with OpenAPI-based validation for django'),
     author='puzzleYOU GmbH',