From 3e8525673b53b4215b5f3354a61e850be7ace934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benito=20L=C3=B3pez?= Date: Fri, 21 Feb 2025 10:33:28 +0100 Subject: [PATCH 1/4] New feature: Software columns - Part 4: Examples (#673) * Add software_colums example * Fix docs build --- .github/workflows/documentation.yml | 2 +- examples/software_columns.py | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 examples/software_columns.py diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index ee08a27..32efd1a 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -27,6 +27,6 @@ jobs: sudo apt-get update -y && sudo apt-get install -y git python3-sphinx graphviz libenchant-2-2 && sudo apt-get install -y gcc libcups2-dev python3-dev python3-setuptools && - sudo pip install tox pycups + sudo pip install --ignore-installed tox pycups - name: Test doc build run: tox -e docs diff --git a/examples/software_columns.py b/examples/software_columns.py new file mode 100644 index 0000000..a89e1d4 --- /dev/null +++ b/examples/software_columns.py @@ -0,0 +1,25 @@ +""" Example for software_columns: Print text arranged into columns.""" + +from escpos import printer + +p = printer.Dummy(profile="TM-U220") + +font = "a" +p.set(font=font) + +# Default: Automatic column width given the characters per line of the printer. +text_list = ["col1", "col2", "col3"] +charsxline = p.profile.get_columns(font) +p.software_columns(text_list=text_list, widths=charsxline, align="center") + +# Tuning some columns: +text_list = ["col1", "col2", "col3"] +widths = [5, 20] # col1 = 5 chars width, col2 + col3 = 20 chars width +align = ["left", "center"] # col1 = left aligned, col2 + col3 = center aligned +p.software_columns(text_list=text_list, widths=widths, align=align) + +# Tuning them all: +text_list = ["col1", "col2", "col3"] +widths = [5, 20, 15] +align = ["left", "center", "right"] +p.software_columns(text_list=text_list, widths=widths, align=align) From 5d943566c9cba5433a595f3e3efd21048251e3af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 10:37:15 +0100 Subject: [PATCH 2/4] Bump actions/setup-python from 5.3.0 to 5.4.0 (#674) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.3.0 to 5.4.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5.3.0...v5.4.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Patrick Kanzler <4189642+patkan@users.noreply.github.com> --- .github/workflows/pythonpackage-windows.yml | 2 +- .github/workflows/pythonpackage.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonpackage-windows.yml b/.github/workflows/pythonpackage-windows.yml index 7da19a7..ff70f08 100644 --- a/.github/workflows/pythonpackage-windows.yml +++ b/.github/workflows/pythonpackage-windows.yml @@ -19,7 +19,7 @@ jobs: with: submodules: 'recursive' - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5.3.0 + uses: actions/setup-python@v5.4.0 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 1bf57a7..de29ef0 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -22,7 +22,7 @@ jobs: with: submodules: 'recursive' - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5.3.0 + uses: actions/setup-python@v5.4.0 with: python-version: ${{ matrix.python-version }} - name: Install dependencies From dc0d9e6bf66840025bd8edbe5123d71a19c154df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 10:45:27 +0100 Subject: [PATCH 3/4] Bump jinja2 from 3.1.4 to 3.1.5 in /examples/docker-flask (#671) Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.4...3.1.5) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/docker-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/docker-flask/requirements.txt b/examples/docker-flask/requirements.txt index 84b0be9..1a9b0ae 100644 --- a/examples/docker-flask/requirements.txt +++ b/examples/docker-flask/requirements.txt @@ -4,7 +4,7 @@ blinker==1.6.2 click==8.1.3 Flask==2.3.2 itsdangerous==2.1.2 -Jinja2==3.1.4 +Jinja2==3.1.5 MarkupSafe==2.1.2 Pillow==10.3.0 pycups==2.0.1 From e39ec9e50dc025c7653f28b68df9132c8d756473 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 10:53:59 +0100 Subject: [PATCH 4/4] Bump codecov/codecov-action from 4 to 5 (#668) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4 to 5. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v4...v5) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pythonpackage-windows.yml | 2 +- .github/workflows/pythonpackage.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonpackage-windows.yml b/.github/workflows/pythonpackage-windows.yml index ff70f08..0929fb5 100644 --- a/.github/workflows/pythonpackage-windows.yml +++ b/.github/workflows/pythonpackage-windows.yml @@ -44,7 +44,7 @@ jobs: env: ESCPOS_CAPABILITIES_FILE: D:\a\python-escpos\python-escpos\capabilities-data\dist\capabilities.json - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index de29ef0..320063f 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -54,7 +54,7 @@ jobs: env: ESCPOS_CAPABILITIES_FILE: /home/runner/work/python-escpos/python-escpos/capabilities-data/dist/capabilities.json - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: