Je suis en 7.1.011 [5.260] et j'essaye de mettre à jour vers la .012 mais GIT termine en erreur que ce soit en passant par la console ou par la GUI, en m'indiquant que je ne suis pas sur une branche (HEAD detached at stable7-7.1.011).
Le retour à un état fonctionnel ne se fait que par les commandes ci-dessous, même si j'en conviens ce n'est pas la bonne procédure.
git pull
git checkout stable7-7.1.011
git pull
Voilà les retours que j'ai.
Par la GUI :
Code : Tout sélectionner
Lance la mise à jour du plugin.
Si cette mise à jour se passe sans problème, un redémarrage du plugin sera nécessaire pour la prise en compte, sinon il faudra faire la mise à jour de façon manuelle.
Starting Zigbee for Domoticz plugin Upgrade process.
----------------------------------------------------
PWD=/home/ouapi/domoticz/plugins/Domoticz-Zigbee
HOME=/home/ouapi/domoticz/plugins/Domoticz-Zigbee
LANG=C.UTF-8
INVOCATION_ID=954b04b5f1d647bfb19aa9ce5b15fa4e
SHLVL=1
JOURNAL_STREAM=8:33864
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
_=/bin/env
uid=0(root) gid=0(root) groups=0(root)
root
PIP Options: --no-input install -r requirements.txt --ignore-requires-python --upgrade
Current version : {"branch": "stable7", "version": "7.1.011"}
fatal: detected dubious ownership in repository at '/home/ouapi/domoticz/plugins/Domoticz-Zigbee'
To add an exception for this directory, call:
git config --global --add safe.directory /home/ouapi/domoticz/plugins/Domoticz-Zigbee
latest git commit:
(1) git config --global --add safe.directory
(2) updating Zigbee for Domoticz plugin
Setup submodule.recurse
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
You are not currently on a branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull
ERROR while running command 'git pull --recurse-submodules'.
Git Status: HEAD detached at stable7-7.1.011
Changes to be committed:
(use "git restore --staged ..." to unstage)
new file: .gitconfig
new file: ReportsTransport-stats.json
Changes not staged for commit:
(use "git add/rm ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: .gitconfig
deleted: Reports/empty
modified: ReportsTransport-stats.jsonCode : Tout sélectionner
Wed Jun 05 08:24:46 root@DMZ:/home/ouapi/domoticz/plugins/Domoticz-Zigbee$ sudo python3 -m pip install -r requirements.txt --upgrade
Requirement already satisfied: zigpy==0.59.0 in /usr/local/lib/python3.9/dist-packages (from -r requirements.txt (line 1)) (0.59.0)
Collecting zigpy==0.59.0
Using cached zigpy-0.59.0-py3-none-any.whl (180 kB)
Requirement already satisfied: zigpy_znp==0.11.6 in /usr/local/lib/python3.9/dist-packages (from -r requirements.txt (line 2)) (0.11.6)
Collecting zigpy_znp==0.11.6
Using cached zigpy_znp-0.11.6-py3-none-any.whl (120 kB)
Requirement already satisfied: zigpy_deconz==0.21.1 in /usr/local/lib/python3.9/dist-packages (from -r requirements.txt (line 3)) (0.21.1)
Collecting zigpy_deconz==0.21.1
Using cached zigpy_deconz-0.21.1-py3-none-any.whl (31 kB)
Requirement already satisfied: bellows==0.36.8 in /usr/local/lib/python3.9/dist-packages (from -r requirements.txt (line 4)) (0.36.8)
Collecting bellows==0.36.8
Using cached bellows-0.36.8-py3-none-any.whl (234 kB)
Requirement already satisfied: zigpy-cli==1.0.4 in /usr/local/lib/python3.9/dist-packages (from -r requirements.txt (line 5)) (1.0.4)
Collecting zigpy-cli==1.0.4
Using cached zigpy_cli-1.0.4-py3-none-any.whl (27 kB)
Requirement already satisfied: dnspython==2.3.0 in /usr/local/lib/python3.9/dist-packages (from -r requirements.txt (line 6)) (2.3.0)
Collecting dnspython==2.3.0
Using cached dnspython-2.3.0-py3-none-any.whl (283 kB)
Requirement already satisfied: pyserial>=3.5 in /usr/local/lib/python3.9/dist-packages (from -r requirements.txt (line 7)) (3.5)
Collecting pyserial>=3.5
Using cached pyserial-3.5-py2.py3-none-any.whl (90 kB)
Requirement already satisfied: z4d-certified-devices in /usr/local/lib/python3.9/dist-packages (from -r requirements.txt (line 8)) (5.260)
Collecting z4d-certified-devices
Using cached z4d_certified_devices-5.260-py3-none-any.whl (394 kB)
Using cached z4d_certified_devices-4.259-py3-none-any.whl (394 kB)
Requirement already satisfied: charset-normalizer==2.0.11 in /usr/local/lib/python3.9/dist-packages (from -r requirements.txt (line 9)) (2.0.11)
Collecting charset-normalizer==2.0.11
Using cached charset_normalizer-2.0.11-py3-none-any.whl (39 kB)
Requirement already satisfied: distro in /usr/local/lib/python3.9/dist-packages (from -r requirements.txt (line 10)) (1.9.0)
Collecting distro
Using cached distro-1.9.0-py3-none-any.whl (20 kB)
Using cached distro-1.8.0-py3-none-any.whl (20 kB)
Requirement already satisfied: pure-pcapy3==1.0.1 in /usr/local/lib/python3.9/dist-packages (from bellows==0.36.8->-r requirements.txt (line 4)) (1.0.1)
Requirement already satisfied: voluptuous in /usr/local/lib/python3.9/dist-packages (from bellows==0.36.8->-r requirements.txt (line 4)) (0.13.1)
Requirement already satisfied: click in /usr/local/lib/python3.9/dist-packages (from bellows==0.36.8->-r requirements.txt (line 4)) (8.1.3)
Requirement already satisfied: click-log>=0.2.1 in /usr/local/lib/python3.9/dist-packages (from bellows==0.36.8->-r requirements.txt (line 4)) (0.4.0)
Requirement already satisfied: async-timeout in /usr/local/lib/python3.9/dist-packages (from bellows==0.36.8->-r requirements.txt (line 4)) (4.0.2)
Requirement already satisfied: crccheck in /usr/local/lib/python3.9/dist-packages (from zigpy==0.59.0->-r requirements.txt (line 1)) (1.3.0)
Requirement already satisfied: pyserial-asyncio in /usr/local/lib/python3.9/dist-packages (from zigpy==0.59.0->-r requirements.txt (line 1)) (0.6)
Requirement already satisfied: cryptography in /usr/lib/python3/dist-packages (from zigpy==0.59.0->-r requirements.txt (line 1)) (3.3.2)
Requirement already satisfied: attrs in /usr/lib/python3/dist-packages (from zigpy==0.59.0->-r requirements.txt (line 1)) (20.3.0)
Requirement already satisfied: typing-extensions in /usr/local/lib/python3.9/dist-packages (from zigpy==0.59.0->-r requirements.txt (line 1)) (4.5.0)
Requirement already satisfied: aiosqlite>=0.16.0 in /usr/local/lib/python3.9/dist-packages (from zigpy==0.59.0->-r requirements.txt (line 1)) (0.18.0)
Requirement already satisfied: aiohttp in /usr/local/lib/python3.9/dist-packages (from zigpy==0.59.0->-r requirements.txt (line 1)) (3.8.4)
Requirement already satisfied: scapy in /usr/local/lib/python3.9/dist-packages (from zigpy-cli==1.0.4->-r requirements.txt (line 5)) (2.5.0)
Requirement already satisfied: zigpy-zigate>=0.11.0 in /usr/local/lib/python3.9/dist-packages (from zigpy-cli==1.0.4->-r requirements.txt (line 5)) (0.11.0)
Requirement already satisfied: coloredlogs in /usr/local/lib/python3.9/dist-packages (from zigpy-cli==1.0.4->-r requirements.txt (line 5)) (15.0.1)
Requirement already satisfied: zigpy-xbee>=0.18.0 in /usr/local/lib/python3.9/dist-packages (from zigpy-cli==1.0.4->-r requirements.txt (line 5)) (0.18.1)
Requirement already satisfied: jsonschema in /usr/lib/python3/dist-packages (from zigpy_znp==0.11.6->-r requirements.txt (line 2)) (3.2.0)
Requirement already satisfied: setuptools in /usr/lib/python3/dist-packages (from pure-pcapy3==1.0.1->bellows==0.36.8->-r requirements.txt (line 4)) (52.0.0)
Requirement already satisfied: pyusb>=1.1.0 in /usr/local/lib/python3.9/dist-packages (from zigpy-zigate>=0.11.0->zigpy-cli==1.0.4->-r requirements.txt (line 5)) (1.2.1)
Requirement already satisfied: gpiozero in /usr/local/lib/python3.9/dist-packages (from zigpy-zigate>=0.11.0->zigpy-cli==1.0.4->-r requirements.txt (line 5)) (1.6.2)
Requirement already satisfied: aiosignal>=1.1.2 in /usr/local/lib/python3.9/dist-packages (from aiohttp->zigpy==0.59.0->-r requirements.txt (line 1)) (1.3.1)
Requirement already satisfied: yarl<2.0,>=1.0 in /usr/local/lib/python3.9/dist-packages (from aiohttp->zigpy==0.59.0->-r requirements.txt (line 1)) (1.8.2)
Requirement already satisfied: multidict<7.0,>=4.5 in /usr/local/lib/python3.9/dist-packages (from aiohttp->zigpy==0.59.0->-r requirements.txt (line 1)) (6.0.4)
Requirement already satisfied: frozenlist>=1.1.1 in /usr/local/lib/python3.9/dist-packages (from aiohttp->zigpy==0.59.0->-r requirements.txt (line 1)) (1.3.3)
Requirement already satisfied: idna>=2.0 in /usr/lib/python3/dist-packages (from yarl<2.0,>=1.0->aiohttp->zigpy==0.59.0->-r requirements.txt (line 1)) (2.10)
Requirement already satisfied: humanfriendly>=9.1 in /usr/local/lib/python3.9/dist-packages (from coloredlogs->zigpy-cli==1.0.4->-r requirements.txt (line 5)) (10.0)
Requirement already satisfied: colorzero in /usr/local/lib/python3.9/dist-packages (from gpiozero->zigpy-zigate>=0.11.0->zigpy-cli==1.0.4->-r requirements.txt (line 5)) (2.0)
Wed Jun 05 08:25:21 root@DMZ:/home/ouapi/domoticz/plugins/Domoticz-Zigbee$git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
You are not currently on a branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull <remote> <branch>
Vous avez une idée ?
Merci.
Ma config :
Machine virtuelle en Debian 11 ( Bullseye ) sur Freebox.
Conbee II avec firmware deCONZ - 0x26780700
Domoticz 2024.4
Python Version: 3.9.2 (default, Feb 28 2021, 17:03:44) [GCC 10.2.1 20210110]