From 5d3f99a68d11d1468f02fdc38db92045f86300bf Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 13 Jul 2022 19:17:47 +0200 Subject: [PATCH 1/2] Update to v0.1.3 --- conf/local_settings.py | 2 +- conf/requirements.txt | 12 ++++++------ manifest.json | 2 +- poetry.lock | 16 ++++++++-------- pyproject.toml | 4 ++-- ..._project_web_page_as_sso_user_1.snapshot.html | 3 --- tests/test_project_setup.py | 3 +++ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/conf/local_settings.py b/conf/local_settings.py index 6e3b208..57b6600 100644 --- a/conf/local_settings.py +++ b/conf/local_settings.py @@ -5,4 +5,4 @@ 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! diff --git a/conf/requirements.txt b/conf/requirements.txt index b8be581..cffd9b8 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -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" \ --hash=sha256:c04776c4c6b275ddcadae79fd1578e6ae9ba92d8cf752a9ee4f2b70a22f4236e \ --hash=sha256:19349d0a8fa165d87b4fd544efb61418f7d6c41cfabaa46d0153bb6d844262a1 -bx-py-utils==66; python_version >= "3.6" and python_full_version < "4.0.0" \ - --hash=sha256:00ab6dfc063e8431d195c71c43e1063e3e28790205324fe4ceca676a11fd281a \ - --hash=sha256:c6a9f4f11e3465de676f09f2c6bd888afa6d8ab23a030e1bd9ff2a1697fddcf2 +bx-py-utils==67; python_version >= "3.7" and python_full_version < "4.0.0" \ + --hash=sha256:4810dcab69146ffd5c31d45710c47fa9ac63f074b26326bc2f17eb7eb7f5e09e \ + --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" \ --hash=sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da \ --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" \ --hash=sha256:97965f2630692de316ea0c1ca5bfa81660d7ba13146dbc6be2059cf55b35d0e5 \ --hash=sha256:89a52128309eb4da12738801ff0c202d2ff8730d1c3225fac6acf630c303e661 -django-fmd==0.1.2; python_version >= "3.7" and python_full_version < "4.0.0" \ - --hash=sha256:1662f67e6fc0c714e1f585bdf43365fdcfa9fd9506538ceda838ec0827247394 \ - --hash=sha256:2b847f66a290e11cedc43c572c8402c2e2b4586a55b6a44cbafc1607ed7f1670 +django-fmd==0.1.3; python_version >= "3.7" and python_full_version < "4.0.0" \ + --hash=sha256:e3b6e89a304527c6acdd838d9d9d77f26a263b6e90754da9e082d33a90621653 \ + --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" \ --hash=sha256:602a58325a4808bd19197fef2676a0b2da2df40d0ecf21be414b2ff48c72ad05 \ --hash=sha256:878dbb06a87e25550798e9ef3204ed70a200dd8b15e47dcef848cf08244f04c9 diff --git a/manifest.json b/manifest.json index 29dc49a..fbf1275 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "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", "upstream": { "license": "GPL-3.0", diff --git a/poetry.lock b/poetry.lock index c2ee037..2b22019 100644 --- a/poetry.lock +++ b/poetry.lock @@ -122,11 +122,11 @@ python-stdnum = "*" [[package]] name = "bx-py-utils" -version = "66" +version = "67" description = "Various Python utility functions" category = "main" optional = false -python-versions = ">=3.6,<4.0.0" +python-versions = ">=3.7,<4.0.0" [[package]] name = "certifi" @@ -295,7 +295,7 @@ sqlparse = ">=0.2.0" [[package]] name = "django-fmd" -version = "0.1.2" +version = "0.1.3" description = "Server for 'Find My Device' android app, implemented in Django/Python" category = "main" optional = false @@ -903,7 +903,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" python-versions = ">=3.7,<4.0.0" -content-hash = "0262d33ea15ad4ec9e8234cd55634c1c34df4ce3f878c268fb1b3c8da5b94f7a" +content-hash = "9289d2840e6117fe911804bb52fb9b1305c7bd96e8604c15b9fe0c98100272fa" [metadata.files] asgiref = [ @@ -963,8 +963,8 @@ bx-django-utils = [ {file = "bx_django_utils-26.tar.gz", hash = "sha256:19349d0a8fa165d87b4fd544efb61418f7d6c41cfabaa46d0153bb6d844262a1"}, ] bx-py-utils = [ - {file = "bx_py_utils-66-py3-none-any.whl", hash = "sha256:00ab6dfc063e8431d195c71c43e1063e3e28790205324fe4ceca676a11fd281a"}, - {file = "bx_py_utils-66.tar.gz", hash = "sha256:c6a9f4f11e3465de676f09f2c6bd888afa6d8ab23a030e1bd9ff2a1697fddcf2"}, + {file = "bx_py_utils-67-py3-none-any.whl", hash = "sha256:4810dcab69146ffd5c31d45710c47fa9ac63f074b26326bc2f17eb7eb7f5e09e"}, + {file = "bx_py_utils-67.tar.gz", hash = "sha256:981877273d1c480f8d6f1de78b1a034c97b5e420df75e66799b320ff9133a047"}, ] certifi = [ {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"}, ] django-fmd = [ - {file = "django-fmd-0.1.2.tar.gz", hash = "sha256:1662f67e6fc0c714e1f585bdf43365fdcfa9fd9506538ceda838ec0827247394"}, - {file = "django_fmd-0.1.2-py3-none-any.whl", hash = "sha256:2b847f66a290e11cedc43c572c8402c2e2b4586a55b6a44cbafc1607ed7f1670"}, + {file = "django-fmd-0.1.3.tar.gz", hash = "sha256:e3b6e89a304527c6acdd838d9d9d77f26a263b6e90754da9e082d33a90621653"}, + {file = "django_fmd-0.1.3-py3-none-any.whl", hash = "sha256:d76630df33931d7940ddb6586771f1323d34601a0277418cda7ce0b854aa491c"}, ] django-ipware = [ {file = "django-ipware-4.0.2.tar.gz", hash = "sha256:602a58325a4808bd19197fef2676a0b2da2df40d0ecf21be414b2ff48c72ad05"}, diff --git a/pyproject.toml b/pyproject.toml index 25fd370..a36dfd8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "django-fmd_ynh" -version = "0.1.2~ynh1" +version = "0.1.3~ynh1" description = "Test django-fmd_ynh via local_test.py" authors = ["JensDiemer "] license = "GPL" @@ -8,7 +8,7 @@ license = "GPL" [tool.poetry.dependencies] # Keep Python 3.7 until Yunohost contains a newer Python Version ;) 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 django_yunohost_integration = {version = ">=v0.2.0", extras = ["ynh"]} diff --git a/tests/test_django_project_web_page_as_sso_user_1.snapshot.html b/tests/test_django_project_web_page_as_sso_user_1.snapshot.html index 300d02c..a76b95a 100644 --- a/tests/test_django_project_web_page_as_sso_user_1.snapshot.html +++ b/tests/test_django_project_web_page_as_sso_user_1.snapshot.html @@ -176,9 +176,6 @@
-

- @Nulide FMDServer -

v

diff --git a/tests/test_project_setup.py b/tests/test_project_setup.py index f326315..d1a3d5c 100644 --- a/tests/test_project_setup.py +++ b/tests/test_project_setup.py @@ -34,6 +34,7 @@ def test_version(): def poetry_check_output(*args): poerty_bin = shutil.which('poetry') + assert poerty_bin, 'Executable "poetry" not found!' output = subprocess.check_output( (poerty_bin,) + args, @@ -81,6 +82,8 @@ def test_screenshot_filenames(): renamed = [] for file_path in screenshot_path.iterdir(): file_name = file_path.name + if file_name == '.gitkeep': + continue cleaned_name = clean_filename(file_name) if cleaned_name != file_name: new_path = file_path.with_name(cleaned_name) From 1fe9e19995c244654ce30bb0f6fb6f2926387cd5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 13 Jul 2022 17:40:14 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f6ba11d..5bf4606 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Pull requests welcome ;) 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 ## Settings and upgrades diff --git a/README_fr.md b/README_fr.md index 350ed9d..433b8db 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ Pull requests welcome ;) 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 ## Settings and upgrades