Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flask_qrcode/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def _insert_img(qr_img, icon_img=None, factor=4, icon_box=None, static_dir=None)
icon_w, icon_h = icon.size
icon_w = size_w if icon_w > size_w else icon_w
icon_h = size_h if icon_h > size_h else icon_h
icon = icon.resize((int(icon_w), int(icon_h)), Image.ANTIALIAS)
icon = icon.resize((int(icon_w), int(icon_h)), Image.Resampling.LANCZOS)
icon = icon.convert("RGBA")

left = int((img_w - icon_w) / 2)
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Flask>=0.12.3
qrcode==6.1
Pillow>=5.0.0
qrcode>=6.1,<7.4
pillow>=9.1.0
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-r base.txt

pytest==3.4.1
sphinx==1.7.1
pytest==6.2.5
Sphinx==1.7.1
Flask-Sphinx-Themes==1.0.2
jinja2<3.1.0
Jinja2<3.1.0
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def run_tests(self):

setup(
name="Flask-QRcode",
version="3.1.0",
version="3.2.0",
license="GPLv3",
description="A concise Flask extension to render QR codes on Jinja2 "
"templates using python-qrcode",
Expand Down Expand Up @@ -71,6 +71,8 @@ def run_tests(self):
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Software Development :: Libraries :: Python Modules",
],
Expand Down
3 changes: 1 addition & 2 deletions tests/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@ class TestServer(socketserver.TCPServer):
def start_test_server(port=5000):
handler = http.server.SimpleHTTPRequestHandler
httpd = TestServer(("", port), handler)
httpd_thread = threading.Thread(target=httpd.serve_forever)
httpd_thread.setDaemon(True)
httpd_thread = threading.Thread(target=httpd.serve_forever, daemon=True)
httpd_thread.start()