From a38c2b4e650ee0c6618f008ab30e50b0fcf5af71 Mon Sep 17 00:00:00 2001 From: Jens Diemer Date: Wed, 21 Dec 2022 20:26:18 +0100 Subject: [PATCH 1/3] apply manageprojects updates --- .github/workflows/package_linter.yml | 14 +++++++++++++- pyproject.toml | 8 ++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/package_linter.yml b/.github/workflows/package_linter.yml index d7c917a..60156f4 100644 --- a/.github/workflows/package_linter.yml +++ b/.github/workflows/package_linter.yml @@ -1,6 +1,8 @@ name: YunoHost apps package linter on: + # Allow to manually trigger the workflow + workflow_dispatch: push: branches: - main @@ -12,7 +14,17 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.9' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install toml - name: 'Clone YunoHost apps package linter' run: | diff --git a/pyproject.toml b/pyproject.toml index d22dc40..fe910b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ version = "0.2.0+ynh1" description = "Demo YunoHost Application to demonstrate the integration of a Django project under YunoHost." authors = ["Jens Diemer "] homepage = "https://github.com/YunoHost-Apps/django_example_ynh" -license = "GPL-3.0" +license = "GPL-3.0-or-later" readme = 'README.md' [tool.poetry.urls] @@ -17,7 +17,7 @@ django_example = ">=0.1.0rc0" # https://github.com/jedie/django-example # # extras "ynh" will install: gunicorn, psycopg2, django-redis and django-axes # see: https://github.com/YunoHost-Apps/django_yunohost_integration/blob/main/pyproject.toml -django_yunohost_integration = {version = ">=0.5.0rc1", extras = ["ynh"]} # https://github.com/YunoHost-Apps/django_yunohost_integration +django_yunohost_integration = {version = ">=0.5.0", extras = ["ynh"]} # https://github.com/YunoHost-Apps/django_yunohost_integration [tool.poetry.dev-dependencies] @@ -128,6 +128,7 @@ applied_migrations = [ "4dbd146", # 2022-11-06T17:59:58+01:00 "baf1ebc", # 2022-11-30T21:19:10+01:00 "44aa620", # 2022-12-21T19:59:39+01:00 + "b204761", # 2022-12-21T20:25:20+01:00 ] [manageprojects.cookiecutter_context.cookiecutter] @@ -142,8 +143,7 @@ ynh_app_url = "https://github.com/YunoHost-Apps/django_example_ynh" bug_tracker_url = "https://github.com/jedie/django-example/issues" upstream_version = "0.1.0rc0" ynh_version = "1" -description = "Demo YunoHost Application to demonstrate the integration of a Django project under YunoHost." package_description = "Demo YunoHost Application to demonstrate the integration of a Django project under YunoHost." -license = "GPL-3.0" +license = "GPL-3.0-or-later" _template = "https://github.com/jedie/cookiecutter_templates/" _output_dir = "~/repos_ynh/django_example_ynh" From 36f361e330f40768ce95f8b170456155f84a5679 Mon Sep 17 00:00:00 2001 From: Jens Diemer Date: Wed, 21 Dec 2022 21:17:06 +0100 Subject: [PATCH 2/3] update requirements --- conf/requirements.txt | 6 +++--- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index 49415ec..82b8522 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -34,9 +34,9 @@ django-redis==5.2.0 ; python_version >= "3.9" and python_full_version < "4.0.0" django-tools==0.54.0 ; python_version >= "3.9" and python_full_version < "4.0.0" \ --hash=sha256:5040a91282be9d1c9d379b0c65da50bcb3691bff03cee54fd4123ace238c3a43 \ --hash=sha256:a7b7bfa5b9c5a81966454d17dffb2403cee25a806c858ee0486a08798227598f -django-yunohost-integration[ynh]==0.5.0 ; python_version >= "3.9" and python_full_version < "4.0.0" \ - --hash=sha256:48063fece3630ec47e78f257e2e23890f703cc46e5f6d453e602222aa460c004 \ - --hash=sha256:6bdb4bb00e8585ff7efa43efdf42250f351f6443f2736972d10cf97ad7755879 +django-yunohost-integration[ynh]==0.5.1 ; python_version >= "3.9" and python_full_version < "4.0.0" \ + --hash=sha256:22a00dd9670ed8fbc6edb34939aa01f5e278334a445982216ebbabf93fe63c1e \ + --hash=sha256:a0f64b9f3de11b74eeb00476a7ece82be4e748d1c581e85833a7c852ffd57117 django==4.1.4 ; python_version >= "3.9" and python_full_version < "4.0.0" \ --hash=sha256:0b223bfa55511f950ff741983d408d78d772351284c75e9f77d2b830b6b4d148 \ --hash=sha256:d38a4e108d2386cb9637da66a82dc8d0733caede4c83c4afdbda78af4214211b diff --git a/poetry.lock b/poetry.lock index 2aa7810..e8943c8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -610,14 +610,14 @@ pprintpp = "*" [[package]] name = "django-yunohost-integration" -version = "0.5.0" +version = "0.5.1" description = "Glue code to package django projects as yunohost apps." category = "main" optional = false python-versions = ">=3.9,<4.0.0" files = [ - {file = "django_yunohost_integration-0.5.0-py3-none-any.whl", hash = "sha256:48063fece3630ec47e78f257e2e23890f703cc46e5f6d453e602222aa460c004"}, - {file = "django_yunohost_integration-0.5.0.tar.gz", hash = "sha256:6bdb4bb00e8585ff7efa43efdf42250f351f6443f2736972d10cf97ad7755879"}, + {file = "django_yunohost_integration-0.5.1-py3-none-any.whl", hash = "sha256:22a00dd9670ed8fbc6edb34939aa01f5e278334a445982216ebbabf93fe63c1e"}, + {file = "django_yunohost_integration-0.5.1.tar.gz", hash = "sha256:a0f64b9f3de11b74eeb00476a7ece82be4e748d1c581e85833a7c852ffd57117"}, ] [package.dependencies] @@ -1760,4 +1760,4 @@ testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools" [metadata] lock-version = "2.0" python-versions = ">=3.9,<4.0.0" # Stay with 3.9 until YunoHost used >=Debian 11 (Bullseye) -content-hash = "7b6a102ec0170e7387f0a718df873813b1686fdefd2ec3043414115aac8f2e3c" +content-hash = "9205dc40ea325863bff567160c6ccd312da5131885c9ec15b81d9b3abca0d3d8" diff --git a/pyproject.toml b/pyproject.toml index fe910b1..03052f4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ django_example = ">=0.1.0rc0" # https://github.com/jedie/django-example # # extras "ynh" will install: gunicorn, psycopg2, django-redis and django-axes # see: https://github.com/YunoHost-Apps/django_yunohost_integration/blob/main/pyproject.toml -django_yunohost_integration = {version = ">=0.5.0", extras = ["ynh"]} # https://github.com/YunoHost-Apps/django_yunohost_integration +django_yunohost_integration = {version = ">=0.5.1", extras = ["ynh"]} # https://github.com/YunoHost-Apps/django_yunohost_integration [tool.poetry.dev-dependencies] From b302e2a3628199887058d9ba6148057210d2bf97 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Dec 2022 20:17:15 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 10 +++++++--- README_fr.md | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 810c606..3efe8b2 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -[![pytest](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/pytest.yml/badge.svg)](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/pytest.yml) [![YunoHost apps package linter](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/package_linter.yml/badge.svg)](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/package_linter.yml) +[![tests](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/tests.yml) +[![codecov](https://codecov.io/github/jedie/django_example_ynh/branch/main/graph/badge.svg)](https://codecov.io/github/jedie/django_example_ynh) +[![django_example_ynh @ PyPi](https://img.shields.io/pypi/v/django_example_ynh?label=django_example_ynh%20%40%20PyPi)](https://pypi.org/project/django_example_ynh/) +[![Python Versions](https://img.shields.io/pypi/pyversions/django_example_ynh)](https://github.com/YunoHost-Apps/django_example_ynh/blob/main/pyproject.toml) +[![License GPL-3.0](https://img.shields.io/pypi/l/django_example_ynh)](https://github.com/YunoHost-Apps/django_example_ynh/blob/main/LICENSE) Demo [YunoHost Application](https://install-app.yunohost.org/?app=django_example_ynh) to demonstrate the integration of a [Python](https://www.python.org/)/[Django](https://www.djangoproject.com/) project under YunoHost using [django_yunohost_integration](https://github.com/YunoHost-Apps/django_yunohost_integration). @@ -28,7 +32,7 @@ To demonstrate the functionality the small [django-example](https://github.com/j Pull requests welcome ;) -**Shipped version:** 0.5.0rc1~ynh1 +**Shipped version:** 0.2.0~ynh1 ## Disclaimers / important information ## local test @@ -187,7 +191,7 @@ root@yunohost:~# journalctl --unit=django_example_ynh --follow ## Documentation and resources * Official app website: -* Official user documentation: +* Official user documentation: * Official admin documentation: * Upstream app code repository: * YunoHost documentation for this app: diff --git a/README_fr.md b/README_fr.md index b901c4f..6201045 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -[![pytest](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/pytest.yml/badge.svg)](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/pytest.yml) [![YunoHost apps package linter](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/package_linter.yml/badge.svg)](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/package_linter.yml) +[![tests](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/YunoHost-Apps/django_example_ynh/actions/workflows/tests.yml) +[![codecov](https://codecov.io/github/jedie/django_example_ynh/branch/main/graph/badge.svg)](https://codecov.io/github/jedie/django_example_ynh) +[![django_example_ynh @ PyPi](https://img.shields.io/pypi/v/django_example_ynh?label=django_example_ynh%20%40%20PyPi)](https://pypi.org/project/django_example_ynh/) +[![Python Versions](https://img.shields.io/pypi/pyversions/django_example_ynh)](https://github.com/YunoHost-Apps/django_example_ynh/blob/main/pyproject.toml) +[![License GPL-3.0](https://img.shields.io/pypi/l/django_example_ynh)](https://github.com/YunoHost-Apps/django_example_ynh/blob/main/LICENSE) Demo [YunoHost Application](https://install-app.yunohost.org/?app=django_example_ynh) to demonstrate the integration of a [Python](https://www.python.org/)/[Django](https://www.djangoproject.com/) project under YunoHost using [django_yunohost_integration](https://github.com/YunoHost-Apps/django_yunohost_integration). @@ -28,7 +32,7 @@ To demonstrate the functionality the small [django-example](https://github.com/j Pull requests welcome ;) -**Version incluse :** 0.5.0rc1~ynh1 +**Version incluse :** 0.2.0~ynh1 ## Avertissements / informations importantes ## local test @@ -187,7 +191,7 @@ root@yunohost:~# journalctl --unit=django_example_ynh --follow ## Documentations et ressources * Site officiel de l'app : -* Documentation officielle utilisateur : +* Documentation officielle utilisateur : * Documentation officielle de l'admin : * Dépôt de code officiel de l'app : * Documentation YunoHost pour cette app :