Merge pull request #154 from acesseonline/feature/improvements

Upgrade of JasperReports to version 6.20.6

.azure/build.yml

@@ -0,0 +1,65 @@
+# pyreportjasper CI pipeline
+trigger:
+  branches:
+    include:
+    - master
+    - releases/*
+  paths:
+    include:
+    - .azure/build.yml
+    - docs/*
+    - setup.py
+    - setupext/*
+    - pyreportjasper/*
+    - tests/*
+
+jobs:
+- job: Documentation
+  pool:
+    vmImage: "ubuntu-latest"
+  steps:
+  - template: scripts/documentation.yml
+
+- job: Test
+  # dependsOn: Deps
+  strategy:
+    matrix:
+      linux-3.8:
+        imageName: "ubuntu-latest"
+        python.version: '3.8'
+      linux-3.9:
+        imageName: "ubuntu-latest"
+        python.version: '3.9'
+      linux-3.10:
+        imageName: "ubuntu-latest"
+        python.version: '3.10'
+      linux-3.11:
+        imageName: "ubuntu-latest"
+        python.version: '3.11'
+      # linux-3.12:
+      #   imageName: "ubuntu-latest"
+      #   python.version: '3.12'
+      windows-3.8:
+        imageName: "windows-2019"
+        python.version: '3.8'
+      windows-3.9:
+        imageName: "windows-2019"
+        python.version: '3.9'
+      windows-3.10:
+        imageName: "windows-2019"
+        python.version: '3.10'
+      windows-3.11:
+        imageName: "windows-2019"
+        python.version: '3.11'
+      # windows-3.12:
+      #   imageName: "windows-2019"
+      #   python.version: '3.12'
+      mac-3.9:
+        imageName: "macos-11"
+        python.version: '3.9'
+
+  pool:
+    vmImage: $(imageName)
+  # steps:
+  # # - template: scripts/deps.yml
+  # # - template: scripts/test.yml

.azure/release.yml

@@ -0,0 +1,108 @@
+# pyreportjasper Release pipeline
+trigger: none
+pr: 
+  branches:
+    include:
+    -  releases/*
+    -  feature/*
+  paths:
+    include:
+    - .bumpversion.cfg
+    - .azure/release.yml
+
+variables:
+  package_name: pyreportjasper
+
+stages:
+- stage: Initial
+  jobs:
+  - job: SourceDistribution
+    pool: 
+      vmImage: "ubuntu-latest"
+    steps:
+    - template: scripts/sdist.yml
+
+- stage: Package
+  jobs:
+  # From https://iscinumpy.gitlab.io/post/azure-devops-python-wheels/
+  - job: ManyLinux
+    condition: eq(1,1)
+    strategy:
+      matrix:
+        64Bit:
+          arch: x86_64
+          plat: manylinux2014_x86_64
+          image: quay.io/pypa/manylinux2014_x86_64
+          python.architecture: x64
+        32Bit:
+          arch: i686
+          plat: manylinux2014_i686
+          image: quay.io/pypa/manylinux2014_i686
+          python.architecture: x86
+    pool:
+      vmImage: "ubuntu-latest"
+    steps:
+    # - template: scripts/deps.yml
+    - template: scripts/wheels-linux.yml
+    - template: scripts/publish-dist.yml
+
+  - job: Windows_x64
+    condition: eq(1,1)
+    strategy:
+      matrix:
+        Python38:
+          python.version: '3.8'
+          python.architecture: 'x64'
+        Python39:
+          python.version: '3.9'
+          python.architecture: 'x64'
+        Python310:
+          python.version: '3.10'
+          python.architecture: 'x64'
+        Python311:
+          python.version: '3.11'
+          python.architecture: 'x64'
+        Python312:
+          python.version: '3.12'
+          python.architecture: 'x64'
+    pool:
+      vmImage: "windows-2019"
+    steps:
+    # - template: scripts/deps.yml
+    - task: UsePythonVersion@0
+      inputs:
+        versionSpec: '$(python.version)'
+        architecture: '$(python.architecture)'
+    # - template: scripts/jdk.yml
+    #   parameters:
+    #     version: '8'
+    - template: scripts/wheels.yml
+    - template: scripts/publish-dist.yml
+
+  - job: OSX
+    condition: eq(1,1)
+    variables:
+      python.architecture: 'x64'
+    strategy:
+      matrix:
+        Python38:
+          python.version: '3.8'
+        Python39:
+          python.version: '3.9'
+        Python310:
+          python.version: '3.10'
+        Python311:
+          python.version: '3.11'
+        # Python312:
+        #   python.version: '3.12'
+    pool:
+      vmImage: "macos-11"
+    steps:
+    # - template: scripts/deps.yml
+    - script: .azure/scripts/osx-python.sh '$(python.version)'
+      displayName: Install Python.org Python
+    # - template: scripts/jdk.yml
+    #   parameters:
+    #     version: '8'
+    - template: scripts/wheels.yml
+    - template: scripts/publish-dist.yml

.azure/scripts/build-wheels.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e -x
+
+# Collect the pythons
+pys=(/opt/python/cp*/bin)
+
+# Exclude specific Pythons (3.6)
+pys=(${pys[@]//*36*/})
+
+# Compile wheels
+for PYBIN in "${pys[@]}"; do
+    echo "Compile $PYBIN"
+    ls -l /io/dist
+    "${PYBIN}/pip" install jpype1
+    "${PYBIN}/pip" wheel /io/dist/$package_name-*.tar.gz -w /io/wheelhouse/ -v
+done
+echo "=============="
+
+# # Bundle external shared libraries into the wheels
+# for whl in wheelhouse/$package_name-*.whl; do
+#     echo "Audit $whl"
+#     auditwheel repair --plat $PLAT "$whl" -w /io/wheelhouse/
+# done
+# echo "=============="
+
+# # Install packages and test
+# for PYBIN in "${pys[@]}"; do
+#     echo "Test install $PYBIN $package_name"
+#     "${PYBIN}/python" -m pip install $package_name --no-index -f /io/wheelhouse
+#     # Manylinux does not have a JVM so there is no way to test the wheel in the docker
+#     # "${PYBIN}/pip" install -r /io/test-requirements.txt
+#     # "${PYBIN}/pytest" /io/test/jpypetest
+# done

.azure/scripts/deps.yml

@@ -0,0 +1,7 @@
+steps:
+- task: DownloadPipelineArtifact@2
+  inputs:
+    source: current
+    artifact: artifact_Deps
+    path: lib
+

.azure/scripts/documentation.yml

@@ -0,0 +1,24 @@
+# This task tries to verify if the documentation will build properly on RTD
+steps:
+- task: UsePythonVersion@0
+  inputs:
+    versionSpec: '3.8'
+
+- script: |
+    pip install  --exists-action=w --no-cache-dir -r .azure/doc-requirements.txt
+  displayName: 'Install requirements'
+
+- script: |
+    python -m sphinx -T -b readthedocs -d _build/doctrees-readthedocs -D language=en doc build/html
+  displayName: 'Check documentation'
+
+- task: CopyFiles@2
+  inputs:
+    contents: 'build/html/**'
+    targetFolder: $(Build.ArtifactStagingDirectory)
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathToPublish: $(Build.ArtifactStagingDirectory)
+    artifactName: documentation
+

.azure/scripts/jdk.yml

@@ -0,0 +1,14 @@
+parameters:
+- name: version
+  type: string
+  default: 8
+
+steps:
+- script: |
+    set v="##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_${{parameters.version}}_X64%"
+    echo %v:"=%
+  condition: eq(variables['Agent.OS'], 'Windows_NT')
+
+- script: |
+    echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_${{parameters.version}}_X64)"
+  condition: ne(variables['Agent.OS'], 'Windows_NT')

.azure/scripts/osx-python.sh

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+PYTHON_VERSION="$1"
+
+case $PYTHON_VERSION in
+3.7)
+  FULL_VERSION=3.7.9
+  INSTALLER_NAME=python-$FULL_VERSION-macosx10.9.pkg
+  ;;
+3.8)
+  FULL_VERSION=3.8.10
+  INSTALLER_NAME=python-$FULL_VERSION-macosx10.9.pkg
+  ;;
+3.9)
+  FULL_VERSION=3.9.12
+  INSTALLER_NAME=python-$FULL_VERSION-macosx10.9.pkg
+  ;;
+3.10)
+  FULL_VERSION=3.10.11
+  INSTALLER_NAME=python-$FULL_VERSION-macos11.pkg
+  ;;
+3.11)
+  FULL_VERSION=3.11.7
+  INSTALLER_NAME=python-$FULL_VERSION-macos11.pkg
+  ;;
+3.12)
+  FULL_VERSION=3.12.0
+  INSTALLER_NAME=python-$FULL_VERSION-macos11.pkg
+esac
+
+URL=https://www.python.org/ftp/python/$FULL_VERSION/$INSTALLER_NAME
+
+PY_PREFIX=/Library/Frameworks/Python.framework/Versions
+
+set -e -x
+
+curl $URL > $INSTALLER_NAME
+
+sudo installer -pkg $INSTALLER_NAME -target /
+
+sudo rm -f /usr/local/bin/python
+sudo ln -s /usr/local/bin/python$PYTHON_VERSION /usr/local/bin/python
+
+which python
+python --version
+python -m ensurepip
+python -m pip install setuptools wheel

.azure/scripts/publish-dist.yml

@@ -0,0 +1,5 @@
+steps:
+- task: PublishPipelineArtifact@0
+  inputs:
+    artifactName: 'artifact_$(Agent.JobName)_$(Agent.OS)_$(python.architecture)'
+    targetPath: 'dist'

.azure/scripts/sdist.yml

@@ -0,0 +1,13 @@
+steps:
+- task: UsePythonVersion@0
+  inputs:
+    versionSpec: '3.8'
+- script: |
+    python -m pip install setuptools jpype1
+    python setup.py sdist
+  displayName: Build sdist
+- task: PublishPipelineArtifact@0
+  inputs:
+    artifactName: 'artifact_SourceDistribution'
+    targetPath: 'dist'
+  displayName: Publish sdist

.azure/scripts/wheels-linux.yml

@@ -0,0 +1,33 @@
+steps:
+- task: UsePythonVersion@0
+  inputs:
+    versionSpec: '3.8'
+
+- task: DownloadPipelineArtifact@2
+  inputs:
+    source: current
+    artifact: artifact_SourceDistribution
+    path: dist
+
+- script: |
+    sudo apt-get update
+    sudo apt-get install -y qemu qemu-user-static qemu-user binfmt-support
+    sudo docker run --rm --privileged hypriot/qemu-register
+  condition: and(succeeded(), eq(variables['arch'], 'aarch64'))
+  displayName: 'Install QEMU'
+
+- script: |
+    ls -l
+    ls -l dist
+  displayName: Sanity check 
+
+- script: |
+    set -ex
+    docker run -e PLAT=$(plat) -e package_name=$(package_name) --rm -v `pwd`:/io $(image) /io/.azure/scripts/build-wheels.sh
+  displayName: Build wheels
+
+- script: |
+    ls -lh wheelhouse/
+    rm dist/*
+    cp wheelhouse/$(package_name)*.whl dist/.
+  displayName: Copy wheels

.azure/scripts/wheels.yml

@@ -0,0 +1,21 @@
+# This job creates wheels for Windows/OSX
+steps:
+- script: |
+    mkdir -p dist
+    python -m pip install --upgrade pip
+    python -m pip install --upgrade wheel setuptools
+  displayName: 'Install dependencies'
+
+- script: |
+    python -m pip wheel . -w wheelhouse/
+  displayName: 'Build wheel'
+
+- script: |
+    ls -lh wheelhouse
+    cp wheelhouse/$(package_name)* dist/.
+  displayName: 'Show wheelhouse'
+
+- script: |
+    python -m pip install pyreportjasper --no-index -f wheelhouse
+  displayName: 'Install module'
+