Merge branch '2.0' into bs5

Author: lenadax

.github/workflows/test_js.yaml

@@ -1,34 +1,20 @@
-name: JS Test image
+name: JS tests
 
-on:
-  push:
-    paths:
-    - '**.js'
+on: [push]
 
 jobs:
   test:
-    name: TEST IMAGE
+    name: Test
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-      - name: Install
-        run: |
-          npm --save-dev install \
-            qunit \
-            karma \
-            karma-qunit \
-            karma-coverage \
-            karma-chrome-launcher \
-            karma-module-resolver-preprocessor
-          npm --no-save install https://github.com/jquery/jquery#main
+    - name: Install
+      run: |
+        corepack enable
+        make nodejs
 
-      - name: Run tests
-        run: |
-          node_modules/karma/bin/karma start js/karma.conf.js
-
-      - name: Run coverage
-        run: |
-          npm run karma-test:coverage
+    - name: Run tests
+      run: make wtr

.github/workflows/test_py.yaml

@@ -1,9 +1,6 @@
-name: Test image
+name: Python tests
 
-on:
-  push:
-    paths:
-    - '**.py'
+on: [push]
 
 jobs:
   test:
@@ -19,34 +16,35 @@ jobs:
           - macos-latest
 
         python:
-          - "2.7"
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python }}
-
-      - name: Install
-        run: |
-          pip install wheel
-          pip install coverage
-          pip install lxml
-          pip install zope.testrunner
-          pip install https://github.com/conestack/webresource/archive/master.zip
-          pip install https://github.com/conestack/yafowil/archive/master.zip
-          pip install -e .[test]
-      - name: Run tests
-        run: |
-          python --version
-          python -m yafowil.widget.image.tests
-      - name: Run coverage
-        run: |
-          coverage run --source=src/yafowil/widget/image --omit=src/yafowil/widget/image/example.py -m yafowil.widget.image.tests
-          coverage report --fail-under=99
+    - uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
+
+    - name: Install
+      run: |
+        pip install wheel
+        pip install coverage
+        pip install https://github.com/conestack/webresource/archive/master.zip
+        pip install https://github.com/conestack/yafowil/archive/master.zip
+        pip install -e .[test]
+
+    - name: Run tests
+      run: |
+        python --version
+        python -m pytest src/yafowil/widget/image/tests
+
+    - name: Run coverage
+      run: |
+        coverage run --source=src/yafowil/widget/image --omit=src/yafowil/widget/image/example.py -m pytest src/yafowil/widget/image/tests
+        coverage report --fail-under=99

.gitignore

@@ -2,14 +2,18 @@
 *.pyc
 *.pyo
 /.coverage
+/.mxmake/
+/coverage/
 /dist/
 /htmlcov/
 /js/karma/
 /node_modules/
 /package-lock.json
+/pnpm-lock.yaml
 /py2/
 /py3/
 /pypy3/
+/requirements-mxdev.txt
 /src/yafowil/widget/image/images_tmp
 /src/yafowil/widget/image/testing/crop_fitting_ls_18_30.png
 /src/yafowil/widget/image/testing/crop_fitting_ls_30_18.png
@@ -19,11 +23,12 @@
 /src/yafowil/widget/image/testing/crop_fitting_sq_40_50.png
 /src/yafowil/widget/image/testing/crop_fitting_sq_48_40.png
 /src/yafowil/widget/image/testing/crop_size_20_20.png
-/src/yafowil/widget/image/testing/crop_size_20_40.png
 /src/yafowil/widget/image/testing/crop_size_20_40_offset_5_3.png
+/src/yafowil/widget/image/testing/crop_size_20_40.png
 /src/yafowil/widget/image/testing/crop_size_40_20.png
 /src/yafowil/widget/image/testing/crop_size_50_20_offset_5_0.png
 /src/yafowil/widget/image/testing/cropped.png
 /src/yafowil/widget/image/testing/landscape.png
 /src/yafowil/widget/image/testing/micro.png
 /src/yafowil/widget/image/testing/portrait.png
+/venv/

LICENSE.rst

@@ -2,7 +2,7 @@ License
 =======
 
 Copyright (c) 2012-2021, BlueDynamics Alliance, Austria, Germany, Switzerland
-Copyright (c) 2021-2022, Yafowil Contributors
+Copyright (c) 2021-2024, Yafowil Contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without