afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into enhancement/poetry-invoke

Browse source
This commit is contained in:
Blake Harnden 2020-07-11 15:04:43 -07:00
commit 28281c6bde
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/core/gui/coreclient.py
View file

@ -377,7 +377,8 @@ class CoreClient:
# organize canvas # organize canvas
self.app.canvas.organize() self.app.canvas.organize()
self.show_mobility_players() if self.is_runtime():
self.show_mobility_players()
# update ui to represent current state # update ui to represent current state
self.app.after(0, self.app.joined_session_update) self.app.after(0, self.app.joined_session_update)

4
docs/install.md
View file

@ -232,9 +232,11 @@ git clone https://github.com/coreemu/core.git
### Install grpcio-tools ### Install grpcio-tools
Python module grpcio-tools is currently needed to generate gRPC protobuf code. Python module grpcio-tools is currently needed to generate gRPC protobuf code.
Specifically leveraging 1.27.2 to avoid compatibility issues with older versions
of pip pulling down binary files.
```shell ```shell
sudo python3 -m pip install grpcio-tools python3 -m pip install --user grpcio==1.27.2 grpcio-tools==1.27.2
``` ```
### Build and Install ### Build and Install

4
install.sh
View file

@ -86,7 +86,7 @@ if [ -z "${reinstall}" ]; then
echo "installing core system dependencies" echo "installing core system dependencies"
sudo apt install -y automake pkg-config gcc libev-dev ebtables iproute2 \ sudo apt install -y automake pkg-config gcc libev-dev ebtables iproute2 \
python${ubuntu_py} python${ubuntu_py}-dev python3-pip python3-tk tk libtk-img ethtool autoconf python${ubuntu_py} python${ubuntu_py}-dev python3-pip python3-tk tk libtk-img ethtool autoconf
python3 -m pip install grpcio-tools python3 -m pip install --user grpcio==1.27.2 grpcio-tools==1.27.2
echo "installing ospf-mdr system dependencies" echo "installing ospf-mdr system dependencies"
sudo apt install -y libtool gawk libreadline-dev sudo apt install -y libtool gawk libreadline-dev
install_ospf_mdr install_ospf_mdr
@ -108,7 +108,7 @@ if [ -z "${reinstall}" ]; then
echo "installing core system dependencies" echo "installing core system dependencies"
sudo yum install -y automake pkgconf-pkg-config gcc gcc-c++ libev-devel iptables-ebtables iproute \ sudo yum install -y automake pkgconf-pkg-config gcc gcc-c++ libev-devel iptables-ebtables iproute \
python${centos_py} python${centos_py}-devel python3-pip python3-tkinter tk ethtool autoconf python${centos_py} python${centos_py}-devel python3-pip python3-tkinter tk ethtool autoconf
sudo python3 -m pip install grpcio-tools python3 -m pip install --user grpcio==1.27.2 grpcio-tools==1.27.2
echo "installing ospf-mdr system dependencies" echo "installing ospf-mdr system dependencies"
sudo yum install -y libtool gawk readline-devel sudo yum install -y libtool gawk readline-devel
install_ospf_mdr install_ospf_mdr