YunoHost-Apps/django-fmd_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/django-fmd_ynh.git synced 2024-09-03 18:26:27 +02:00
Code Issues Activity Actions 2

Merge pull request #11 from YunoHost-Apps/v013

Browse source 
V013
This commit is contained in:
Jens Diemer 2022-07-13 19:40:54 +02:00 committed by GitHub
commit d299482912
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -31,7 +31,7 @@ Pull requests welcome ;)
This package for YunoHost used [django-yunohost-integration](https://github.com/YunoHost-Apps/django_yunohost_integration) This package for YunoHost used [django-yunohost-integration](https://github.com/YunoHost-Apps/django_yunohost_integration)
**Shipped version:** 0.1.2~ynh1 **Shipped version:** 0.1.3~ynh1
## Disclaimers / important information ## Disclaimers / important information
## Settings and upgrades ## Settings and upgrades

2
README_fr.md
View file

@ -31,7 +31,7 @@ Pull requests welcome ;)
This package for YunoHost used [django-yunohost-integration](https://github.com/YunoHost-Apps/django_yunohost_integration) This package for YunoHost used [django-yunohost-integration](https://github.com/YunoHost-Apps/django_yunohost_integration)
**Version incluse :** 0.1.2~ynh1 **Version incluse :** 0.1.3~ynh1
## Avertissements / informations importantes ## Avertissements / informations importantes
## Settings and upgrades ## Settings and upgrades

2
conf/local_settings.py
View file

@ -5,4 +5,4 @@
Used for YunoHost config and will be **overwritten** on every config change! Used for YunoHost config and will be **overwritten** on every config change!
""" """
DEBUG = __DJANGO_DEBUG__ # Don't turn DEBUG on in production! DEBUG = __DJANGO_DEBUG__ # noqa Don't turn DEBUG on in production!

12
conf/requirements.txt
View file

@ -10,9 +10,9 @@ bleach==5.0.1; python_version >= "3.7" and python_full_version < "4.0.0" \
bx-django-utils==26; python_version >= "3.7" and python_full_version < "4.0.0" \ bx-django-utils==26; python_version >= "3.7" and python_full_version < "4.0.0" \
--hash=sha256:c04776c4c6b275ddcadae79fd1578e6ae9ba92d8cf752a9ee4f2b70a22f4236e \ --hash=sha256:c04776c4c6b275ddcadae79fd1578e6ae9ba92d8cf752a9ee4f2b70a22f4236e \
--hash=sha256:19349d0a8fa165d87b4fd544efb61418f7d6c41cfabaa46d0153bb6d844262a1 --hash=sha256:19349d0a8fa165d87b4fd544efb61418f7d6c41cfabaa46d0153bb6d844262a1
bx-py-utils==66; python_version >= "3.6" and python_full_version < "4.0.0" \ bx-py-utils==67; python_version >= "3.7" and python_full_version < "4.0.0" \
--hash=sha256:00ab6dfc063e8431d195c71c43e1063e3e28790205324fe4ceca676a11fd281a \ --hash=sha256:4810dcab69146ffd5c31d45710c47fa9ac63f074b26326bc2f17eb7eb7f5e09e \
--hash=sha256:c6a9f4f11e3465de676f09f2c6bd888afa6d8ab23a030e1bd9ff2a1697fddcf2 --hash=sha256:981877273d1c480f8d6f1de78b1a034c97b5e420df75e66799b320ff9133a047
colorama==0.4.5; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or python_version >= "3.7" and python_full_version < "4.0.0" and sys_platform == "win32" and python_full_version >= "3.5.0" \ colorama==0.4.5; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or python_version >= "3.7" and python_full_version < "4.0.0" and sys_platform == "win32" and python_full_version >= "3.5.0" \
--hash=sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da \ --hash=sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da \
--hash=sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4 --hash=sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4
@ -28,9 +28,9 @@ django-axes==5.35.0; python_version >= "3.7" and python_full_version < "4.0.0" \
django-debug-toolbar==3.5.0; python_version >= "3.7" and python_full_version < "4.0.0" \ django-debug-toolbar==3.5.0; python_version >= "3.7" and python_full_version < "4.0.0" \
--hash=sha256:97965f2630692de316ea0c1ca5bfa81660d7ba13146dbc6be2059cf55b35d0e5 \ --hash=sha256:97965f2630692de316ea0c1ca5bfa81660d7ba13146dbc6be2059cf55b35d0e5 \
--hash=sha256:89a52128309eb4da12738801ff0c202d2ff8730d1c3225fac6acf630c303e661 --hash=sha256:89a52128309eb4da12738801ff0c202d2ff8730d1c3225fac6acf630c303e661
django-fmd==0.1.2; python_version >= "3.7" and python_full_version < "4.0.0" \ django-fmd==0.1.3; python_version >= "3.7" and python_full_version < "4.0.0" \
--hash=sha256:1662f67e6fc0c714e1f585bdf43365fdcfa9fd9506538ceda838ec0827247394 \ --hash=sha256:e3b6e89a304527c6acdd838d9d9d77f26a263b6e90754da9e082d33a90621653 \
--hash=sha256:2b847f66a290e11cedc43c572c8402c2e2b4586a55b6a44cbafc1607ed7f1670 --hash=sha256:d76630df33931d7940ddb6586771f1323d34601a0277418cda7ce0b854aa491c
django-ipware==4.0.2; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version < "4.0.0" and python_full_version >= "3.6.0" \ django-ipware==4.0.2; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version < "4.0.0" and python_full_version >= "3.6.0" \
--hash=sha256:602a58325a4808bd19197fef2676a0b2da2df40d0ecf21be414b2ff48c72ad05 \ --hash=sha256:602a58325a4808bd19197fef2676a0b2da2df40d0ecf21be414b2ff48c72ad05 \
--hash=sha256:878dbb06a87e25550798e9ef3204ed70a200dd8b15e47dcef848cf08244f04c9 --hash=sha256:878dbb06a87e25550798e9ef3204ed70a200dd8b15e47dcef848cf08244f04c9

2
manifest.json
View file

@ -5,7 +5,7 @@
"description": { "description": {
"en": "Web based FritzBox management using Python/Django." "en": "Web based FritzBox management using Python/Django."
}, },
"version": "0.1.2~ynh1", "version": "0.1.3~ynh1",
"url": "https://gitlab.com/jedie/django-find-my-device", "url": "https://gitlab.com/jedie/django-find-my-device",
"upstream": { "upstream": {
"license": "GPL-3.0", "license": "GPL-3.0",

16
poetry.lock generated
View file

@ -122,11 +122,11 @@ python-stdnum = "*"
[[package]] [[package]]
name = "bx-py-utils" name = "bx-py-utils"
version = "66" version = "67"
description = "Various Python utility functions" description = "Various Python utility functions"
category = "main" category = "main"
optional = false optional = false
python-versions = ">=3.6,<4.0.0" python-versions = ">=3.7,<4.0.0"
[[package]] [[package]]
name = "certifi" name = "certifi"
@ -295,7 +295,7 @@ sqlparse = ">=0.2.0"
[[package]] [[package]]
name = "django-fmd" name = "django-fmd"
version = "0.1.2" version = "0.1.3"
description = "Server for 'Find My Device' android app, implemented in Django/Python" description = "Server for 'Find My Device' android app, implemented in Django/Python"
category = "main" category = "main"
optional = false optional = false
@ -903,7 +903,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-
[metadata] [metadata]
lock-version = "1.1" lock-version = "1.1"
python-versions = ">=3.7,<4.0.0" python-versions = ">=3.7,<4.0.0"
content-hash = "0262d33ea15ad4ec9e8234cd55634c1c34df4ce3f878c268fb1b3c8da5b94f7a" content-hash = "9289d2840e6117fe911804bb52fb9b1305c7bd96e8604c15b9fe0c98100272fa"
[metadata.files] [metadata.files]
asgiref = [ asgiref = [
@ -963,8 +963,8 @@ bx-django-utils = [
{file = "bx_django_utils-26.tar.gz", hash = "sha256:19349d0a8fa165d87b4fd544efb61418f7d6c41cfabaa46d0153bb6d844262a1"}, {file = "bx_django_utils-26.tar.gz", hash = "sha256:19349d0a8fa165d87b4fd544efb61418f7d6c41cfabaa46d0153bb6d844262a1"},
] ]
bx-py-utils = [ bx-py-utils = [
{file = "bx_py_utils-66-py3-none-any.whl", hash = "sha256:00ab6dfc063e8431d195c71c43e1063e3e28790205324fe4ceca676a11fd281a"}, {file = "bx_py_utils-67-py3-none-any.whl", hash = "sha256:4810dcab69146ffd5c31d45710c47fa9ac63f074b26326bc2f17eb7eb7f5e09e"},
{file = "bx_py_utils-66.tar.gz", hash = "sha256:c6a9f4f11e3465de676f09f2c6bd888afa6d8ab23a030e1bd9ff2a1697fddcf2"}, {file = "bx_py_utils-67.tar.gz", hash = "sha256:981877273d1c480f8d6f1de78b1a034c97b5e420df75e66799b320ff9133a047"},
] ]
certifi = [ certifi = [
{file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"}, {file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"},
@ -1058,8 +1058,8 @@ django-debug-toolbar = [
{file = "django_debug_toolbar-3.5.0-py3-none-any.whl", hash = "sha256:89a52128309eb4da12738801ff0c202d2ff8730d1c3225fac6acf630c303e661"}, {file = "django_debug_toolbar-3.5.0-py3-none-any.whl", hash = "sha256:89a52128309eb4da12738801ff0c202d2ff8730d1c3225fac6acf630c303e661"},
] ]
django-fmd = [ django-fmd = [
{file = "django-fmd-0.1.2.tar.gz", hash = "sha256:1662f67e6fc0c714e1f585bdf43365fdcfa9fd9506538ceda838ec0827247394"}, {file = "django-fmd-0.1.3.tar.gz", hash = "sha256:e3b6e89a304527c6acdd838d9d9d77f26a263b6e90754da9e082d33a90621653"},
{file = "django_fmd-0.1.2-py3-none-any.whl", hash = "sha256:2b847f66a290e11cedc43c572c8402c2e2b4586a55b6a44cbafc1607ed7f1670"}, {file = "django_fmd-0.1.3-py3-none-any.whl", hash = "sha256:d76630df33931d7940ddb6586771f1323d34601a0277418cda7ce0b854aa491c"},
] ]
django-ipware = [ django-ipware = [
{file = "django-ipware-4.0.2.tar.gz", hash = "sha256:602a58325a4808bd19197fef2676a0b2da2df40d0ecf21be414b2ff48c72ad05"}, {file = "django-ipware-4.0.2.tar.gz", hash = "sha256:602a58325a4808bd19197fef2676a0b2da2df40d0ecf21be414b2ff48c72ad05"},

4
pyproject.toml
View file

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "django-fmd_ynh" name = "django-fmd_ynh"
version = "0.1.2~ynh1" version = "0.1.3~ynh1"
description = "Test django-fmd_ynh via local_test.py" description = "Test django-fmd_ynh via local_test.py"
authors = ["JensDiemer <git@jensdiemer.de>"] authors = ["JensDiemer <git@jensdiemer.de>"]
license = "GPL" license = "GPL"
@ -8,7 +8,7 @@ license = "GPL"
[tool.poetry.dependencies] [tool.poetry.dependencies]
# Keep Python 3.7 until Yunohost contains a newer Python Version ;) # Keep Python 3.7 until Yunohost contains a newer Python Version ;)
python = ">=3.7,<4.0.0" python = ">=3.7,<4.0.0"
django-fmd = ">=0.1.2" # https://gitlab.com/jedie/django-find-my-device django-fmd = ">=0.1.3" # https://gitlab.com/jedie/django-find-my-device
# Note: "ynh" extras will install gunicorn, psycopg2, django-redis and django-axes # Note: "ynh" extras will install gunicorn, psycopg2, django-redis and django-axes
django_yunohost_integration = {version = ">=v0.2.0", extras = ["ynh"]} django_yunohost_integration = {version = ">=v0.2.0", extras = ["ynh"]}

3
tests/test_django_project_web_page_as_sso_user_1.snapshot.html
View file

@ -176,9 +176,6 @@
</div> </div>
</div> </div>
<div class="center"> <div class="center">
<p>
@Nulide FMDServer
</p>
<p id="version"> <p id="version">
v v
</p> </p>

3
tests/test_project_setup.py
View file

@ -34,6 +34,7 @@ def test_version():
def poetry_check_output(*args): def poetry_check_output(*args):
poerty_bin = shutil.which('poetry') poerty_bin = shutil.which('poetry')
assert poerty_bin, 'Executable "poetry" not found!'
output = subprocess.check_output( output = subprocess.check_output(
(poerty_bin,) + args, (poerty_bin,) + args,
@ -81,6 +82,8 @@ def test_screenshot_filenames():
renamed = [] renamed = []
for file_path in screenshot_path.iterdir(): for file_path in screenshot_path.iterdir():
file_name = file_path.name file_name = file_path.name
if file_name == '.gitkeep':
continue
cleaned_name = clean_filename(file_name) cleaned_name = clean_filename(file_name)
if cleaned_name != file_name: if cleaned_name != file_name:
new_path = file_path.with_name(cleaned_name) new_path = file_path.with_name(cleaned_name)