diff --git a/check_process b/check_process index ba13771..e52d86f 100644 --- a/check_process +++ b/check_process @@ -46,4 +46,5 @@ manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1 ; commit=18dd9d6a59ad1f0d03dc634b20e805b5c4f6c6e9 name=Upgrade from 0.21 manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1 - + ; commit=5fe8d545994eed02707ed0133a68db919bd5d3bb + name=Upgrade from 0.21.1 diff --git a/conf/app-frontend.src b/conf/app-frontend.src index d01874d..857fe10 100644 --- a/conf/app-frontend.src +++ b/conf/app-frontend.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/0.21.1/download?job=build_front -SOURCE_SUM=94888623d44da2d5c774827e206ce4981a810b54043d7f4b2cfd04b37052718a +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.0/download?job=build_front +SOURCE_SUM=f062d7485325a78f08afaf2c641d8616e983d82d11dfc1e656cbc09a113c4202 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/app.src b/conf/app.src index 8942426..86fb56a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/0.21.1/funkwhale-0.21.1.tar.gz -SOURCE_SUM=94239023d52f1327941a28d0bec7c0eebe991f80b5ea25257485c7d27320957a +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/1.0/funkwhale-1.0.tar.gz +SOURCE_SUM=c305ad352b739f0665c775922ab657991fa3c4c6830bf93210e98659a08f37d5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 22ed87d..0ca71d5 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "A modern, convivial and free music server" }, - "version": "0.21.1~ynh1", + "version": "0.1.0.1~ynh1", "url": "https://funkwhale.audio", "license": "AGPL-3.0-or-later", "maintainer": { @@ -17,7 +17,7 @@ "email": "jean-baptiste@holcroft.fr" }], "requirements": { - "yunohost": ">= 3.6" + "yunohost": ">= 3.8" }, "multi_instance": true, "services": [ @@ -53,4 +53,4 @@ } ] } -} +} \ No newline at end of file diff --git a/scripts/upgrade b/scripts/upgrade index 956e563..ca690db 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -216,6 +216,12 @@ ynh_replace_string --match_string="__KEY__" --replace_string="$key" # Delete pre 0.17 federated tracks [manual action suggested] # https://dev.funkwhale.audio/funkwhale/funkwhale/tags/0.18 python api/manage.py script delete_pre_017_federated_uploads --no-input + + # Delete the original thumbnails and generate new ones for + # higher quality images + # https://docs.funkwhale.audio/changelog.html#increased-quality-of-jpeg-thumbnails-manual-action-required + rm -rf "$final_path/media/__sized__" + python api/manage.py fw media generate-thumbnail ) #================================================= diff --git a/sources/extra_files/app/api/requirements/base.txt b/sources/extra_files/app/api/requirements/base.txt index 6e31f85..88f7099 100644 --- a/sources/extra_files/app/api/requirements/base.txt +++ b/sources/extra_files/app/api/requirements/base.txt @@ -1,86 +1,74 @@ -# Bleeding edge Django -django>=3.0.5,<3.1; python_version > '3.5' -django>=2.2.12,<3; python_version < '3.6' -setuptools>=36 +django~=3.0.8 +setuptools>=49 # Configuration -django-environ>=0.4,<0.5 +django-environ~=0.4 # Images -Pillow>=6.2,<7 +Pillow~=7.0 -# For user registration, either via email or social -# Well-built with regular release cycles! -django-allauth>=0.41,<0.42 +django-allauth~=0.42 - -# Python-PostgreSQL Database Adapter -psycopg2-binary>=2.8,<=2.9 +psycopg2-binary~=2.8 # Time zones support -pytz==2019.3 +pytz==2020.1 # Redis support -django-redis>=4.11,<4.12 -redis>=3.4,<3.5 -kombu>=4.5,<4.6 +django-redis~=4.12 +redis~=3.5 +kombu~=4.6 -celery>=4.3,<4.4 +celery~=4.4 # Your custom requirements go here -django-cors-headers>=3.2,<3.3 -musicbrainzngs==0.6 -djangorestframework>=3.11,<3.12 -djangorestframework-jwt>=1.11,<1.12 -arrow>=0.15.5,<0.16 -persisting-theory>=0.2,<0.3 -django-versatileimagefield>=2.0,<2.1 -django-filter>=2.1,<2.2 -django-rest-auth>=0.9,<0.10 -# XXX: remove when we drop support for python 3.5 -ipython>=7.10,<8; python_version > '3.5' -ipython>=7,<7.10; python_version < '3.6' -mutagen>=1.44,<1.45 +django-cors-headers~=3.4 +musicbrainzngs~=0.7.1 +djangorestframework~=3.11 +djangorestframework-jwt~=1.11 +arrow~=0.15.5 +persisting-theory~=0.2 +django-versatileimagefield~=2.0 +django-filter~=2.3 +django-rest-auth~=0.9 +ipython~=7.10 +mutagen~=1.45 -pymemoize==1.0.3 +pymemoize~=1.0 -django-dynamic-preferences>=1.8.1,<1.9 -raven>=6.10,<7 -python-magic==0.4.15 -channels>=2.4,<2.5 -# XXX: remove when we drop support for python 3.5 -channels_redis==2.2.1; python_version < '3.6' -channels_redis>=2.3.2,<2.4; python_version > '3.5' -uvicorn==0.8.6; python_version < '3.6' -uvicorn>=0.11.3,<0.12; python_version > '3.5' -gunicorn>=20.0.4,<20.1 +django-dynamic-preferences~=1.10 +raven~=6.10 +python-magic~=0.4 +channels~=2.4 +channels_redis~=3.0 +uvicorn[standard]~=0.12 +gunicorn~=20.0 -cryptography>=2.8,<3 +cryptography~=2.9 # requests-http-signature==0.0.3 # clone until the branch is merged and released upstream git+https://github.com/EliotBerriot/requests-http-signature.git@signature-header-support -django-cleanup>=4,<4.1 -requests>=2.22<2.23 -pyOpenSSL>=19<20 +django-cleanup~=5.0 +requests~=2.24 +pyOpenSSL~=19.1 # for LDAP authentication -python-ldap>=3.2.0,<3.3 -django-auth-ldap>=2.1.0,<2.2 +python-ldap~=3.3 +django-auth-ldap~=2.2 -pydub>=0.23.1,<0.24 -pyld==1.0.4 -aiohttp>=3.6,<3.7 -autobahn>=19.3.3 +pydub~=0.24 +pyld~=1.0 +aiohttp~=3.6 -django-oauth-toolkit==1.2 -django-storages>=1.9.1,<1.10 -boto3<3 -unicode-slugify==0.1.3 -django-cacheops==4.2 +django-oauth-toolkit~=1.3 +django-storages~=1.9 +boto3~=1.14 +unicode-slugify~=0.1 +django-cacheops~=5.0 -click>=7,<8 -service_identity==18.1.0 -markdown>=3.2,<4 -bleach>=3,<4 +click~=7.1 +service_identity~=18.1 +markdown~=3.2 +bleach~=3.1 feedparser==6.0.0b3 -watchdog==0.10.2 +watchdog~=0.10 \ No newline at end of file