Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Uprade to 1.1 and fixes Twisted by retrograding it #129

Merged
merged 15 commits into from
Mar 11, 2021
Merged

Uprade to 1.1 and fixes Twisted by retrograding it #129

merged 15 commits into from
Mar 11, 2021

Conversation

Thovi98
Copy link
Member

@Thovi98 Thovi98 commented Mar 10, 2021

Tested install, but not upgrade.

@ericgaspar
Copy link
Member

!testme

@yunohost-bot
Copy link
Contributor

🌻
Test Badge

@Thovi98
Copy link
Member Author

Thovi98 commented Mar 10, 2021

Since this app won’t work without the fix (level 0 https://ci-apps.yunohost.org/ci/job/1673), I would merge it ASAP in testing and master branch.

I also was wondering, is it still relevant to check the upgrade of name=Upgrade to 0.19.1 and fix channels-redis bug in the check_process ?

@ericgaspar ericgaspar requested a review from Sporiff March 10, 2021 15:13
Sporiff
Sporiff requested changes Mar 10, 2021
View reviewed changes
Copy link
Collaborator

@Sporiff Sporiff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the base requirements, we should also replace line 52 with git+https://github.com/agateblue/requests-http-signature.git@signature-header-support to reflect the location change. In theory it should automatically resolve but it's better to be neat about it. As long as everything aligns with upstream this should be fine

Apart from that and my comment on the watchdog line this looks fine to me. I don't have time right now to test this (currently in the middle of moving country) but if somebody wants to give it a try that would be great 👍

sources/extra_files/app/api/requirements/base.txt Outdated Show resolved Hide resolved
@Thovi98
Copy link
Member Author

Thovi98 commented Mar 10, 2021

I’ve copy pasted the upstream file, and checked, now everything is fine I think.

I had tested it already, works great !

@ericgaspar
Copy link
Member

Is this PR ready to be merged? 👀

@Thovi98
Copy link
Member Author

Thovi98 commented Mar 11, 2021

From my side, it is, and @Sporiff approuved, so I think it’s okay

@ericgaspar ericgaspar merged commit 7c44eaa into YunoHost-Apps:testing Mar 11, 2021
@ericgaspar
Copy link
Member

Merging as the app is level 0. 👍🏻

ericgaspar pushed a commit that referenced this pull request Mar 12, 2021
@Thovi98
Testing (#130)
8172790 
* Uprade to 1.1 and fixes Twisted by retrograding it (#129)
yalh76 added a commit that referenced this pull request Apr 16, 2021
@yalh76 @Thovi98 @ericgaspar
Apply Example_ynh (#131)
33392f7 
* Testing (#130)

* Uprade to 1.1 and fixes Twisted by retrograding it (#129)

* Apply example_ynh

Fix #15

* Fix services

* Fix several merging

* Stick to official install process

* fix path_transversal

* Using option '--log_type systemd' with 'yunohost service add' is not relevant anymore

* Try to fix package_check

* Fix package_check test

* Update check_process

* Trying to fix package_check

* Update env.prod

* remove sleep

* Better service name

* missing datadir

* line 111: upgrade_type: unbound variable

* Implement --is_big

* Fix stopping service from previous version

* Fix upgrade

* Fix upgrade

* Apply example_ynh

* Apply example_ynh

* Fix rights

* Update api.src

* Update env.prod

* Update front.src

* Update manifest.json

* Update README.md

* Update README_fr.md

* Fix chmod

* Fix rights

Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>
Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
yalh76 added a commit that referenced this pull request Apr 24, 2021
@yalh76 @ericgaspar
@alexAubin @Sporiff @Thovi98 @lightnin
Upgrade to 1.1.1 (#138)
fa9587f 
* Update README.md

* Test bump to 1.0

* Bump to Yunohost 4 (for Debian upgrade)

* Test removal of nonexistent scripts

* Correct Typo

* Update README.md

* Fix linter warnings

* Fix linter

* Fix linter warnings

* Cleaning up

* Update README.md

* Update to 1.0.1 (#119)

* Update to 1.0.1

* Set new permissions

* Add French Readme

* Readme update

* Update README.md

* Update README.md

* Update README_fr.md

* Update README.md

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Update README_fr.md

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Update README.md

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Update README_fr.md

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Finding an available port

* Uprade to 1.1 and fixes Twisted by retrograding it (#129)

* Fix linter warning : no need to use $is_public

* Clarify custom paths needed to import collections of music files in Readme. (#134)

* Update readme to indicate custom import path 

Yunohost installations of Funkwhale use a different path for file imports than those indicated in the Funkwhale documentation.. (/var/www/Funkwhale/import). We should therefore indicate to the admin user what that path is, and steps necessary to use it.   Addresses #132.

* Fix bash highlighting.

* Update README.md

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Apply Example_ynh (#131)

* Testing (#130)

* Uprade to 1.1 and fixes Twisted by retrograding it (#129)

* Apply example_ynh

Fix #15

* Fix services

* Fix several merging

* Stick to official install process

* fix path_transversal

* Using option '--log_type systemd' with 'yunohost service add' is not relevant anymore

* Try to fix package_check

* Fix package_check test

* Update check_process

* Trying to fix package_check

* Update env.prod

* remove sleep

* Better service name

* missing datadir

* line 111: upgrade_type: unbound variable

* Implement --is_big

* Fix stopping service from previous version

* Fix upgrade

* Fix upgrade

* Apply example_ynh

* Apply example_ynh

* Fix rights

* Update api.src

* Update env.prod

* Update front.src

* Update manifest.json

* Update README.md

* Update README_fr.md

* Fix chmod

* Fix rights

Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>
Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Update conf/nginx.conf

Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>

* Update conf/nginx.conf

Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>

* fix

* Fix rights for datadir from previous version

* Update upgrade

* Fix recursive chmod

* Fix import link

* Update README_fr.md

Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
Co-authored-by: Ciarán Ainsworth <cda@rootkey.co.uk>
Co-authored-by: Ciarán Ainsworth <ciaranainsworth@posteo.net>
Co-authored-by: ericgaspar <junk.eg@free.fr>
Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>
Co-authored-by: Amos Blanton <lightnin@users.noreply.github.com>
yalh76 added a commit that referenced this pull request May 19, 2021
@yalh76 @ericgaspar
@alexAubin @Sporiff @Thovi98 @lightnin
Others var (#143)
0e4482a 
* Upgrade to 1.1.1 (#138)

* Update README.md

* Test bump to 1.0

* Bump to Yunohost 4 (for Debian upgrade)

* Test removal of nonexistent scripts

* Correct Typo

* Update README.md

* Fix linter warnings

* Fix linter

* Fix linter warnings

* Cleaning up

* Update README.md

* Update to 1.0.1 (#119)

* Update to 1.0.1

* Set new permissions

* Add French Readme

* Readme update

* Update README.md

* Update README.md

* Update README_fr.md

* Update README.md

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Update README_fr.md

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Update README.md

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Update README_fr.md

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Finding an available port

* Uprade to 1.1 and fixes Twisted by retrograding it (#129)

* Fix linter warning : no need to use $is_public

* Clarify custom paths needed to import collections of music files in Readme. (#134)

* Update readme to indicate custom import path 

Yunohost installations of Funkwhale use a different path for file imports than those indicated in the Funkwhale documentation.. (/var/www/Funkwhale/import). We should therefore indicate to the admin user what that path is, and steps necessary to use it.   Addresses #132.

* Fix bash highlighting.

* Update README.md

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Apply Example_ynh (#131)

* Testing (#130)

* Uprade to 1.1 and fixes Twisted by retrograding it (#129)

* Apply example_ynh

Fix #15

* Fix services

* Fix several merging

* Stick to official install process

* fix path_transversal

* Using option '--log_type systemd' with 'yunohost service add' is not relevant anymore

* Try to fix package_check

* Fix package_check test

* Update check_process

* Trying to fix package_check

* Update env.prod

* remove sleep

* Better service name

* missing datadir

* line 111: upgrade_type: unbound variable

* Implement --is_big

* Fix stopping service from previous version

* Fix upgrade

* Fix upgrade

* Apply example_ynh

* Apply example_ynh

* Fix rights

* Update api.src

* Update env.prod

* Update front.src

* Update manifest.json

* Update README.md

* Update README_fr.md

* Fix chmod

* Fix rights

Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>
Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Update conf/nginx.conf

Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>

* Update conf/nginx.conf

Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>

* fix

* Fix rights for datadir from previous version

* Update upgrade

* Fix recursive chmod

* Fix import link

* Update README_fr.md

Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
Co-authored-by: Ciarán Ainsworth <cda@rootkey.co.uk>
Co-authored-by: Ciarán Ainsworth <ciaranainsworth@posteo.net>
Co-authored-by: ericgaspar <junk.eg@free.fr>
Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>
Co-authored-by: Amos Blanton <lightnin@users.noreply.github.com>

* remove others_var

* no more needed

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
Co-authored-by: Ciarán Ainsworth <cda@rootkey.co.uk>
Co-authored-by: Ciarán Ainsworth <ciaranainsworth@posteo.net>
Co-authored-by: ericgaspar <junk.eg@free.fr>
Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>
Co-authored-by: Amos Blanton <lightnin@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sporiff Sporiff Sporiff approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Thovi98 @ericgaspar @yunohost-bot @Sporiff