From 3e5efba666b319ca9080b6face0b225f75baf1c5 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Sat, 8 Jan 2022 18:26:19 +0100 Subject: [PATCH 1/4] fix README "django_ynh" -> "django-yunohost-integration" --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f8fea79..1bd90d4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # PyInventory for YunoHost -[![Integration level](https://dash.yunohost.org/integration/pyinventory.svg)](https://dash.yunohost.org/appci/app/pyinventory) [![CI Pipeline](https://ci-apps.yunohost.org/ci/badges/pyinventory.status.svg)](https://ci-apps.yunohost.org/ci/apps/pyinventory/) [![Maintain status](https://ci-apps.yunohost.org/ci/badges/pyinventory.maintain.svg)](https://dash.yunohost.org/appci/app/pyinventory) +[![Integration level](https://dash.yunohost.org/integration/pyinventory.svg)](https://dash.yunohost.org/appci/app/pyinventory) [![CI Pipeline](https://ci-apps.yunohost.org/ci/badges/pyinventory.status.svg)](https://ci-apps.yunohost.org/ci/apps/pyinventory/) [![Maintain status](https://ci-apps.yunohost.org/ci/badges/pyinventory.maintain.svg)](https://dash.yunohost.org/appci/app/pyinventory) [![pytest](https://github.com/YunoHost-Apps/pyinventory_ynh/actions/workflows/pytest.yml/badge.svg?branch=master)](https://github.com/YunoHost-Apps/pyinventory_ynh/actions/workflows/pytest.yml) [![YunoHost apps package linter](https://github.com/YunoHost-Apps/pyinventory_ynh/actions/workflows/package_linter.yml/badge.svg)](https://github.com/YunoHost-Apps/pyinventory_ynh/actions/workflows/package_linter.yml) [![Coverage Status on codecov.io](https://codecov.io/gh/YunoHost-Apps/pyinventory_ynh/branch/master/graph/badge.svg)](https://codecov.io/gh/YunoHost-Apps/pyinventory_ynh) @@ -79,7 +79,7 @@ To check the effective settings, run this: ## SSO authentication -[SSOwat](https://github.com/YunoHost/SSOwat) is fully supported via [django_ynh](https://github.com/YunoHost-Apps/django_ynh): +[SSOwat](https://github.com/YunoHost/SSOwat) is fully supported via [django-yunohost-integration](https://github.com/YunoHost-Apps/django_yunohost_integration): * First user (`$YNH_APP_ARG_ADMIN`) will be created as Django's super user * All new users will be created as normal users From 5ffc2a240cfe3cfc6344d0e7c4ef6b3d4360eabf Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Sat, 8 Jan 2022 18:26:36 +0100 Subject: [PATCH 2/4] fix logs 'django_ynh' -> 'django_yunohost_integration' --- conf/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/settings.py b/conf/settings.py index 8d79f25..750ba08 100644 --- a/conf/settings.py +++ b/conf/settings.py @@ -174,7 +174,7 @@ LOGGING = { 'django': {'handlers': ['log_file', 'mail_admins'], 'level': 'INFO', 'propagate': False}, 'axes': {'handlers': ['log_file', 'mail_admins'], 'level': 'WARNING', 'propagate': False}, 'django_tools': {'handlers': ['log_file', 'mail_admins'], 'level': 'INFO', 'propagate': False}, - 'django_ynh': {'handlers': ['log_file', 'mail_admins'], 'level': 'INFO', 'propagate': False}, + 'django_yunohost_integration': {'handlers': ['log_file', 'mail_admins'], 'level': 'INFO', 'propagate': False}, 'inventory': {'handlers': ['log_file', 'mail_admins'], 'level': 'INFO', 'propagate': False}, }, } From 800c854b3c402d43dd4c0835bc0dc5f87d990aa3 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Sat, 8 Jan 2022 18:26:47 +0100 Subject: [PATCH 3/4] update some DocStrings --- tests/test_django_project.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_django_project.py b/tests/test_django_project.py index 84cb7a6..7f1372b 100644 --- a/tests/test_django_project.py +++ b/tests/test_django_project.py @@ -42,7 +42,7 @@ class DjangoYnhTestCase(HtmlAssertionMixin, TestCase): def test_urls(self): assert reverse('admin:index') == '/app_path/' - # The django_ynh debug view should not be avaiable: + # The django_yunohost_integration debug view should not be available: with self.assertRaises(NoReverseMatch): reverse(request_media_debug_view) @@ -83,7 +83,7 @@ class DjangoYnhTestCase(HtmlAssertionMixin, TestCase): user = User.objects.first() assert user.username == 'test' assert user.is_active is True - assert user.is_staff is True # Set by: conf.django_ynh_demo_urls.setup_user_handler + assert user.is_staff is True # Set by: django_yunohost_integration assert user.is_superuser is False assert response.status_code == 200 @@ -113,7 +113,7 @@ class DjangoYnhTestCase(HtmlAssertionMixin, TestCase): user = User.objects.first() assert user.username == 'test' assert user.is_active is True - assert user.is_staff is True # Set by: conf.django_ynh_demo_urls.setup_user_handler + assert user.is_staff is True # Set by: django_yunohost_integration assert user.is_superuser is False assert AccessLog.objects.count() == 1 @@ -138,7 +138,7 @@ class DjangoYnhTestCase(HtmlAssertionMixin, TestCase): user = User.objects.first() assert user.username == 'test' assert user.is_active is True - assert user.is_staff is True # Set by: conf.django_ynh_demo_urls.setup_user_handler + assert user.is_staff is True # Set by: django_yunohost_integration assert user.is_superuser is False assert AccessLog.objects.count() == 1 @@ -162,7 +162,7 @@ class DjangoYnhTestCase(HtmlAssertionMixin, TestCase): user = User.objects.first() assert user.username == 'test' assert user.is_active is True - assert user.is_staff is True # Set by: conf.django_ynh_demo_urls.setup_user_handler + assert user.is_staff is True # Set by: django_yunohost_integration assert user.is_superuser is False assert AccessLog.objects.count() == 1 From 2c9cc91f9fed9883dd6651ec1fcc82ce44ed98d7 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Sat, 8 Jan 2022 18:28:09 +0100 Subject: [PATCH 4/4] Release as 0.13.0~ynh3 --- manifest.json | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index b551841..81b677d 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Web based management to catalog things including state and location etc." }, - "version": "0.13.0~ynh2", + "version": "0.13.0~ynh3", "url": "https://github.com/jedie/PyInventory", "license": "GPL-3.0", "maintainer": { diff --git a/pyproject.toml b/pyproject.toml index 51d5e08..6c3efa6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyinventory_ynh" -version = "0.13.0~ynh2" +version = "0.13.0~ynh3" description = "Test pyinventory_ynh via local_test.py" authors = ["JensDiemer "] license = "GPL"