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
19 changes: 17 additions & 2 deletions pywebdriver/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@
import gettext
import logging.config
import os
import sys
from configparser import ConfigParser
from locale import getdefaultlocale

if sys.version_info >= (3, 8):
from importlib import metadata as importlib_metadata
else: # Python < 3.8
import importlib_metadata

# Librairies Imports
from flask import Flask
from flask_babel import Babel
Expand Down Expand Up @@ -50,6 +56,17 @@
app, resources={r"/*": {"origins": cors_origins, "headers": ["Content-Type"]}}
)

try:
version = importlib_metadata.version("pywebdriver")
except importlib_metadata.PackageNotFoundError:
version = "unknown"


@app.context_processor
def inject_pywebdriver_version():
return {"pywebdriver_version": version}


from . import plugins # noqa: E402
from . import views # noqa: E402

Expand Down Expand Up @@ -82,8 +99,6 @@
if config.has_option("flask", "sslcert"):
sslcert = config.get("flask", "sslcert")
if sslcert:
import sys

if not config.has_option("flask", "sslkey"):
print("If you want SSL, you must also provide the sslkey")
sys.exit(-1)
Expand Down
3 changes: 3 additions & 0 deletions pywebdriver/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
{{_('System')}}</a
>
</div>
<p class="navbar-text navbar-right">
{{_('Version')}} {{ pywebdriver_version }}
</p>
</div>
</nav>
<div id="content" style="margin-top: 70px">
Expand Down
7 changes: 7 additions & 0 deletions test-scripts/telium-test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
#!/usr/bin/env python3
# /// script
# requires-python = ">=3.10"
# dependencies = [
# "pypostelium>=0.0.5",
# ]
# ///

# Copyright (C) 2014-Today Akretion (http://www.akretion.com).
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
"""
Expand Down
7 changes: 6 additions & 1 deletion windows/pywebdriver.spec
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from PyInstaller.utils.hooks import copy_metadata

block_cipher = None

a = Analysis(
Expand All @@ -16,7 +18,10 @@ a = Analysis(
("..\\pywebdriver\\static\\js\\*", "pywebdriver\\static\\js"),
("..\\pywebdriver\\translations\\*", "pywebdriver\\translations"),
("..\\pywebdriver\\translations\\fr", "pywebdriver\\translations\\fr"),
],
]
# so importlib.metadata.version("pywebdriver") works in the frozen exe
# (PyInstaller doesn't bundle .dist-info metadata by default)
+ copy_metadata("pywebdriver"),
hiddenimports=[
"pywebdriver.plugins.cups_driver",
"pywebdriver.plugins.display_driver",
Expand Down
Loading