Sync master and develop after 2.0 release #979
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hotfix: Make RFID reader service working again
hotfix: installer shall use master
Use mopidy 2.2 also on master
Pin mopidy-iris to last version working with python 2
* Make master py3 compatible * Use py3 * Make py3 compatible * Make py3 compatible * Make py3 compatible * Make py3 compatible * Make py3 compatible * Make py3 compatible * Make py3 compatible * Make py3 compatible * Make py3 compatible
* use always python 3 for RegisterDevice.py
Make master py3 compatible
File name on ˋmasterˋ is still with underscores
Hotfix: installation of py packages now for python 3
delay shutdown if apt update/upgrade is running
# Conflicts: # .github/workflows/pythonpackage.yml # misc/sampleconfigs/phoniebox-rotary-encoder.service.stretch-default.sample # scripts/MFRC522.py # scripts/Reader.py.experimental # scripts/Reader.py.kkmoonRFIDreader # scripts/daemon_rfid_reader.py # scripts/installscripts/buster-install-default.sh # scripts/installscripts/stretch-install-default.sh # scripts/installscripts/stretch-install-spotify.sh # scripts/playout_controls.sh # scripts/python-phoniebox/PhonieboxConfigChanger.py
s-martin
changed the title
Merged
MiczFlor
approved these changes
May 27, 2020
|
Hi @s-martin
But I am not sure if that is necessary at the moment. With this merge you synced master issues back into develop? |
|
master is in sync with develop, i.e. develop contains all changes from develop and master. We can continue working on develop and when the next release is ready we can merge again develop to master. As long as we don't apply any hotfixes to master we don't need to merge master to develop. I don't think we need to delete and rename the branches. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.