Merge pull request #6 from YunoHost-Apps/testing

master <- testing
This commit is contained in:
Jens Diemer 2021-01-08 08:55:17 +01:00 committed by GitHub
commit bc6b7ab9a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 8 deletions

View file

@ -121,8 +121,11 @@ Notes:
## history
* [compare v0.1.2...master](https://github.com/YunoHost-Apps/django_ynh/compare/v0.1.2...master) **dev**
* [compare v0.1.3...master](https://github.com/YunoHost-Apps/django_ynh/compare/v0.1.3...master) **dev**
* tbc
* [v0.1.3 - 08.01.2021](https://github.com/YunoHost-Apps/django_ynh/compare/v0.1.2...v0.1.3)
* set "DEBUG = True" in local_test (so static files are served and auth works)
* Bugfixes and cleanups
* [v0.1.2 - 29.12.2020](https://github.com/YunoHost-Apps/django_ynh/compare/v0.1.1...v0.1.2)
* Bugfixes
* [v0.1.1 - 29.12.2020](https://github.com/YunoHost-Apps/django_ynh/compare/v0.1.0...v0.1.1)

View file

@ -1 +1 @@
__version__ = '0.1.2'
__version__ = '0.1.3'

View file

@ -54,12 +54,15 @@ def copy_patch(src_file, replaces, final_home_path):
def create_local_test(django_settings_path, destination, runserver=False):
django_settings_path = django_settings_path.resolve()
assert_is_file(django_settings_path)
django_settings_name = django_settings_path.stem
conf_path = django_settings_path.parent
project_name = conf_path.parent.name
assert isinstance(destination, Path)
destination = destination.resolve()
if not destination.is_dir():
@ -69,12 +72,12 @@ def create_local_test(django_settings_path, destination, runserver=False):
final_home_path = destination / 'opt_yunohost'
final_www_path = destination / 'var_www'
log_file = destination / 'var_log_django_ynh.log'
log_file = destination / f'var_log_{project_name}.log'
REPLACES = {
'__FINAL_HOME_PATH__': str(final_home_path),
'__FINAL_WWW_PATH__': str(final_www_path),
'__LOG_FILE__': str(destination / 'var_log_django_ynh.log'),
'__LOG_FILE__': str(log_file),
'__PATH_URL__': 'app_path',
'__DOMAIN__': '127.0.0.1',
'django.db.backends.postgresql': 'django.db.backends.sqlite3',
@ -98,7 +101,7 @@ def create_local_test(django_settings_path, destination, runserver=False):
with Path(final_home_path / 'local_settings.py').open('w') as f:
f.write('# Only for local test run\n')
f.write('DEBUG = True\n')
f.write('SERVE_FILES = True # used in src/inventory_project/urls.py\n')
f.write('SERVE_FILES = True # May used in urls.py\n')
f.write('AUTH_PASSWORD_VALIDATORS = [] # accept all passwords\n')
# call "local_test/manage.py" via subprocess:

View file

@ -5,7 +5,7 @@
"description": {
"en": "Glue code to package django projects as yunohost apps."
},
"version": "0.1.2~ynh1",
"version": "0.1.3~ynh1",
"url": "https://github.com/jedie/django_ynh",
"license": "GPL-3.0",
"maintainer": {

View file

@ -1,10 +1,11 @@
[tool.poetry]
name = "django_ynh"
version = "0.1.2"
version = "0.1.3"
description = "Glue code to package django projects as yunohost apps."
authors = ["JensDiemer <git@jensdiemer.de>"]
license = "GPL"
readme = "README.md"
homepage = "https://github.com/YunoHost-Apps/django_ynh"
packages = [
{ include = "django_ynh" },
]

View file

@ -28,7 +28,7 @@ log_file="${log_path}/django_ynh.log"
pkg_dependencies="build-essential python3-dev python3-pip python3-venv git postgresql postgresql-contrib"
# To install/upgrade this project via pip:
pip_install_string="django_ynh==0.1.2"
pip_install_string="django_ynh==0.1.3"
#=================================================
# Redis HELPERS