Package: release.debian.org User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package django-qr-code [ Reason ] New upstream release, targeted release fixing 1 bug. [ Impact ] this bug is being fixed: https://github.com/dprog-philippe-docourt/django-qr-code/issues/31 with this 2-line diff: https://github.com/dprog-philippe-docourt/django-qr-code/commit/f2aee3315d3dbca4e1da72ce5b5ad5ef50c1d01f The rest of the diff is only doc changes, with no inpact on anything. [ Tests ] the commit adds a test, that is run both at build time and autopkgtest. [ Risks ] trivial fix, tested, leaf package. I'd say risk is null. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing unblock django-qr-code/2.2.0-1 -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. More about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for django-qr-code-2.1.0 django-qr-code-2.2.0
.travis.yml | 2 +-
CHANGELOG.md | 9 +++++++++
README.md | 2 +-
debian/changelog | 6 ++++++
qr_code/__init__.py | 2 +-
qr_code/qrcode/utils.py | 4 ++--
qr_code/tests/tests.py | 4 ++++
requirements-web-deployment.txt | 2 +-
scripts/run-tests.sh | 2 +-
9 files changed, 26 insertions(+), 7 deletions(-)
diff -Nru django-qr-code-2.1.0/CHANGELOG.md django-qr-code-2.2.0/CHANGELOG.md
--- django-qr-code-2.1.0/CHANGELOG.md 2021-01-24 00:38:55.000000000 +0100
+++ django-qr-code-2.2.0/CHANGELOG.md 2021-06-05 11:30:06.000000000 +0200
@@ -1,9 +1,18 @@
# Change Log
+## 2.2.0 (2021-06-03)
+* Change encoding from URL-safe Base64 to standard Base64 for `text` query
argument (used for serving QR code images).
+* Fix #31 by passing the border parameter for segno.QRCode.save.
+* Ensure compatibility with Django 3.2.
+* Drop support for Django 3.0.
+
+
## 2.1.0 (2021-01-23)
* Change encoding from URL-safe Base64 to standard Base64 for `text` query
argument (used for serving QR code images).
* Introduce setting `SERVE_QR_CODE_IMAGE_PATH` to configure the path under
which QR Code images are served.
* Reorganize and improve documentation.
+* Fix #23
+* Introduce usage of type hints.
## 2.0.1 (2020-11-24)
* Update the install_requires after the move from qrcode to Segno.
diff -Nru django-qr-code-2.1.0/debian/changelog
django-qr-code-2.2.0/debian/changelog
--- django-qr-code-2.1.0/debian/changelog 2021-01-27 19:34:54.000000000
+0100
+++ django-qr-code-2.2.0/debian/changelog 2021-07-18 11:45:54.000000000
+0200
@@ -1,3 +1,9 @@
+django-qr-code (2.2.0-1) unstable; urgency=medium
+
+ * New upstream version 2.2.0.
+
+ -- Mattia Rizzolo <mat...@debian.org> Sun, 18 Jul 2021 11:45:54 +0200
+
django-qr-code (2.1.0-1) unstable; urgency=medium
[ Mattia Rizzolo ]
diff -Nru django-qr-code-2.1.0/qr_code/__init__.py
django-qr-code-2.2.0/qr_code/__init__.py
--- django-qr-code-2.1.0/qr_code/__init__.py 2021-01-24 00:38:55.000000000
+0100
+++ django-qr-code-2.2.0/qr_code/__init__.py 2021-06-05 11:30:06.000000000
+0200
@@ -1 +1 @@
-__version__ = '2.1.0'
+__version__ = '2.2.0'
diff -Nru django-qr-code-2.1.0/qr_code/qrcode/utils.py
django-qr-code-2.2.0/qr_code/qrcode/utils.py
--- django-qr-code-2.1.0/qr_code/qrcode/utils.py 2021-01-24
00:38:55.000000000 +0100
+++ django-qr-code-2.2.0/qr_code/qrcode/utils.py 2021-06-05
11:30:06.000000000 +0200
@@ -85,7 +85,7 @@
:raises: TypeError in case an unknown argument is given.
"""
self._size = size
- self._border = border
+ self._border = int(border)
if _can_be_cast_to_int(version):
version = int(version) # type: ignore
if not 1 <= version <= 40:
@@ -142,7 +142,7 @@
:rtype: dict
"""
image_format = self._image_format
- kw = dict(kind=image_format, scale=self._size_as_int())
+ kw = dict(border=self.border, kind=image_format,
scale=self._size_as_int())
# Change the color mapping into the keywords Segno expects
# (remove the "_color" suffix from the module names)
kw.update({k[:-6]: v for k, v in self.color_mapping().items()})
diff -Nru django-qr-code-2.1.0/qr_code/tests/tests.py
django-qr-code-2.2.0/qr_code/tests/tests.py
--- django-qr-code-2.1.0/qr_code/tests/tests.py 2021-01-24 00:38:55.000000000
+0100
+++ django-qr-code-2.2.0/qr_code/tests/tests.py 2021-06-05 11:30:06.000000000
+0200
@@ -94,6 +94,10 @@
options = QRCodeOptions(image_format='invalid-image-format')
self.assertEqual(options.image_format, DEFAULT_IMAGE_FORMAT)
+ def test_kw_save(self):
+ options = QRCodeOptions(border=0, image_format="png", size=13)
+ self.assertDictEqual(options.kw_save(), {'border': 0, 'kind': 'png',
'scale': 13})
+
class TestContactDetail(SimpleTestCase):
def test_make_qr_code_text(self):
diff -Nru django-qr-code-2.1.0/README.md django-qr-code-2.2.0/README.md
--- django-qr-code-2.1.0/README.md 2021-01-24 00:38:55.000000000 +0100
+++ django-qr-code-2.2.0/README.md 2021-06-05 11:30:06.000000000 +0200
@@ -2,7 +2,7 @@
[](https://badge.fury.io/py/django-qr-code)
[](https://pypi.python.org/pypi/django-qr-code)
[](http://django-qr-code.readthedocs.io/en/latest/)
-[](https://travis-ci.org/dprog-philippe-docourt/django-qr-code)
+[](https://travis-ci.com/dprog-philippe-docourt/django-qr-code)
[](https://codeclimate.com/github/dprog-philippe-docourt/django-qr-code/maintainability)
[](https://coveralls.io/github/dprog-philippe-docourt/django-qr-code?branch=master)
diff -Nru django-qr-code-2.1.0/requirements-web-deployment.txt
django-qr-code-2.2.0/requirements-web-deployment.txt
--- django-qr-code-2.1.0/requirements-web-deployment.txt 2021-01-24
00:38:55.000000000 +0100
+++ django-qr-code-2.2.0/requirements-web-deployment.txt 2021-06-05
11:30:06.000000000 +0200
@@ -1,2 +1,2 @@
-gunicorn==20.0.4
+gunicorn==20.1.0
brotli==1.0.9
diff -Nru django-qr-code-2.1.0/scripts/run-tests.sh
django-qr-code-2.2.0/scripts/run-tests.sh
--- django-qr-code-2.1.0/scripts/run-tests.sh 2021-01-24 00:38:55.000000000
+0100
+++ django-qr-code-2.2.0/scripts/run-tests.sh 2021-06-05 11:30:06.000000000
+0200
@@ -29,7 +29,7 @@
echo "--- RAM: $(free -h)"
python_versions=("3.6 3.7 3.8 3.9")
- django_versions=("2.2.17" "3.0.11" "3.1.3")
+ django_versions=("2.2.23" "3.1.11" "3.2.4")
for python_version in ${python_versions[@]}
do
diff -Nru django-qr-code-2.1.0/.travis.yml django-qr-code-2.2.0/.travis.yml
--- django-qr-code-2.1.0/.travis.yml 2021-01-24 00:38:55.000000000 +0100
+++ django-qr-code-2.2.0/.travis.yml 2021-06-05 11:30:06.000000000 +0200
@@ -7,8 +7,8 @@
- "3.9"
env:
- DJANGO_VERSION=2.2
- - DJANGO_VERSION=3.0
- DJANGO_VERSION=3.1
+ - DJANGO_VERSION=3.2
# command to install dependencies
install:
- pip install django~=$DJANGO_VERSION
signature.asc
Description: PGP signature
