Skip to content

Commit 8758271

Browse files
bartTCbartTC
committed
Merge branch 'main' into coverage-improvements
2 parents 7536037 + b75b160 commit 8758271

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1097
-951
lines changed

‎.editorconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
indent_style = space
7+
indent_size = 2
8+
end_of_line = lf
9+
charset = utf-8
10+
trim_trailing_whitespace = true
11+
insert_final_newline = true
12+
13+
[*.py]
14+
indent_size = 4
15+
max_line_length = 88
16+
17+
[*.{rst,md}]
18+
indent_size = 4

‎.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Ruff format the entire project
2+
5d60da17455607e9c8b7e7fef9940d20027894f2

‎.github/workflows/linting.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Code Quality Checks
2+
3+
on:
4+
push:
5+
6+
jobs:
7+
linting:
8+
name: Code Quality Checks
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout Code
12+
uses: actions/checkout@v4
13+
14+
- name: Install Dependencies
15+
run: pip install ruff
16+
17+
- name: Code Linting
18+
if: always()
19+
run: ruff check qrcode
20+
21+
- name: Code Formatting
22+
if: always()
23+
run: ruff format --check qrcode

‎.github/workflows/push.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Testsuite Run
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
max-parallel: 4
10+
matrix:
11+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
12+
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Set up Python ${{ matrix.python-version }}
17+
uses: actions/setup-python@v5
18+
with:
19+
python-version: ${{ matrix.python-version }}
20+
21+
- name: Install dependencies
22+
run: |
23+
pip install --disable-pip-version-check tox tox-gh-actions
24+
- name: Test with tox
25+
run: tox

‎.gitignore

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
*.pyc
2-
.tox
3-
dist/
42
.coverage
53
.coverage.*
6-
htmlcov/
7-
build/
8-
qrcode.egg-info/
9-
.pytest_cache/
104
.idea/
5+
.pytest_cache/
6+
.tox
7+
build/
118
cov.xml
9+
dist/
10+
htmlcov/
11+
poetry.lock
12+
qrcode.egg-info/

‎CHANGES.rst

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,65 @@
22
Change log
33
==========
44

5-
7.5 (unreleased)
6-
================
5+
WIP
6+
===
7+
8+
- Added ``GappedCircleModuleDrawer`` (PIL) to render QR code modules as non-contiguous circles. (BenwestGate in `#373`_)
9+
- Migrate pyproject.toml to PEP 621-compliant [project] metadata format. (hroncok in `#399`_)
10+
- Allow execution as a Python module. (stefansjs in `#400`_)
11+
12+
::
13+
14+
python -m qrcode --output qrcode.png "hello world"
15+
16+
.. _#373: https://github.com/lincolnloop/python-qrcode/pull/373
17+
.. _#399: https://github.com/lincolnloop/python-qrcode/pull/399
18+
.. _#400: https://github.com/lincolnloop/python-qrcode/pull/400
19+
20+
8.2 (01 May 2025)
21+
=================
22+
23+
- Optimize QRColorMask apply_mask method for enhanced performance
24+
- Fix typos on StyledPilImage embeded_* parameters.
25+
The old parameters with the typos are still accepted
26+
for backward compatibility.
27+
28+
29+
8.1 (02 April 2025)
30+
====================
31+
32+
- Added support for Python 3.13.
33+
34+
8.0 (27 September 2024)
35+
========================
36+
37+
- Added support for Python 3.11 and 3.12.
38+
39+
- Drop support for Python <=3.8.
40+
41+
- Change local development setup to use Poetry_.
42+
43+
- Testsuite and code quality checks are done through Github Actions.
44+
45+
- Code quality and formatting utilises ruff_.
46+
47+
- Removed ``typing_extensions`` as a dependency, as it's no longer required
48+
with having Python 3.9+ as a requirement.
49+
having Python 3.9+ as a requirement.
50+
51+
- Only allow high error correction rate (`qrcode.ERROR_CORRECT_H`)
52+
when generating
53+
QR codes with embedded images to ensure content is readable
754

8-
- Nothing changed yet.
55+
.. _Poetry: https://python-poetry.org
56+
.. _ruff: https://astral.sh/ruff
957

1058

1159
7.4.2 (6 February 2023)
1260
=======================
1361

1462
- Allow ``pypng`` factory to allow for saving to a string (like
15-
``qr.save("some_file.png")``) in addition to file-like objects.
63+
``qr.save("some_file.png")``) in addition to file-like objects.
1664

1765

1866
7.4.1 (3 February 2023)

‎MANIFEST.in

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎PACKAGING.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Packaging quick reminder
33

44
Make sure maintainer dependencies are installed::
55

6-
pip install -e .[maintainer,dev]
6+
poetry install
77

88
Run release command and follow prompt instructions::
99

10-
fullrelease
10+
poetry run fullrelease

‎README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ circles by reducing this less than the default of ``Decimal(1)``.
211211

212212
The ``StyledPilImage`` additionally accepts an optional ``color_mask``
213213
parameter to change the colors of the QR Code, and an optional
214-
``embeded_image_path`` to embed an image in the center of the code.
214+
``embedded_image_path`` to embed an image in the center of the code.
215215

216216
Other color masks:
217217

@@ -227,12 +227,12 @@ and an embedded image:
227227
from qrcode.image.styles.moduledrawers.pil import RoundedModuleDrawer
228228
from qrcode.image.styles.colormasks import RadialGradiantColorMask
229229
230-
qr = qrcode.QRCode(error_correction=qrcode.constants.ERROR_CORRECT_L)
230+
qr = qrcode.QRCode(error_correction=qrcode.constants.ERROR_CORRECT_H)
231231
qr.add_data('Some data')
232232
233233
img_1 = qr.make_image(image_factory=StyledPilImage, module_drawer=RoundedModuleDrawer())
234234
img_2 = qr.make_image(image_factory=StyledPilImage, color_mask=RadialGradiantColorMask())
235-
img_3 = qr.make_image(image_factory=StyledPilImage, embeded_image_path="/path/to/image.png")
235+
img_3 = qr.make_image(image_factory=StyledPilImage, embedded_image_path="/path/to/image.png")
236236
237237
Examples
238238
========

‎TESTING.rst

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Testing
22
=======
33

4-
First, install tox into your virtualenv::
4+
First, install dev dependencies::
55

6-
pip install --upgrade tox
6+
poetry install --with dev
77

88
To run all tests, you'll need to install multiple Python interpreters. On a
99
modern Ubuntu distribution you can use ``add-apt-repository
@@ -15,5 +15,23 @@ the libraries to build PIL, too. Here's the Ubuntu commands::
1515
sudo apt-get install build-essential python-dev python3-dev
1616
sudo apt-get install libjpeg8-dev zlib1g-dev
1717

18-
Finally, just run ``tox``!
19-
If you want, you can test against a specific version like this: ``tox -e py36``
18+
Here's the OSX Homebrew command:
19+
20+
brew install libjpeg libtiff little-cms2 openjpeg webp
21+
22+
Finally, just run ``tox``::
23+
24+
poetry run tox
25+
# or
26+
poetry shell
27+
tox
28+
29+
If you want, you can test against a specific version like this: ``tox -e py312-pil``
30+
31+
32+
Linting
33+
-------
34+
35+
Run `ruff` to check formatting::
36+
37+
ruff format qrcode

0 commit comments

Comments
 (0)