From ce63be0bdaa1117cd386c046a74384a09e70e328 Mon Sep 17 00:00:00 2001 From: Natalia Ogoreltseva Date: Mon, 1 Mar 2021 11:52:31 +0300 Subject: [PATCH 1/2] Fixes #1640 Add git package to instructions + remove argparse because it is a part of python now --- doc/dev_guide/building_from_source.rst | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/dev_guide/building_from_source.rst b/doc/dev_guide/building_from_source.rst index 4b7a9acb9c..d2cd701ea8 100644 --- a/doc/dev_guide/building_from_source.rst +++ b/doc/dev_guide/building_from_source.rst @@ -38,11 +38,11 @@ the preferences can differ. But strategically the steps are always the same. option in step 5. For all platforms, this is ``python`` version 2.7+ (but not 3.x). You need the following Python modules: - * `pyyaml `_ version 3.10 - * `argparse `_ version 1.1 - * `msgpack-python `_ version 0.4.6 - * `gevent `_ version 1.1.2 - * `six `_ version 1.8.0 + * `pyyaml `_ version 3.10 + * `argparse `_ version 1.1 + * `msgpack-python `_ version 0.4.6 + * `gevent `_ version 1.1.2 + * `six `_ version 1.8.0 To install all required dependencies, follow the instructions for your OS: @@ -50,23 +50,23 @@ the preferences can differ. But strategically the steps are always the same. .. code-block:: console - $ apt install -y build-essential cmake make coreutils sed \ + $ apt install -y build-essential git cmake make coreutils sed \ autoconf automake libtool zlib1g-dev \ libreadline-dev libncurses5-dev libssl-dev \ libunwind-dev libicu-dev \ python python-pip python-setuptools python-dev \ - python-msgpack python-yaml python-argparse python-six python-gevent + python-msgpack python-yaml python-six python-gevent * For RHEL/CentOS (versions under 8)/Fedora, say: .. code-block:: console - $ yum install -y gcc gcc-c++ cmake make coreutils sed \ + $ yum install -y gcc gcc-c++ git cmake make coreutils sed \ autoconf automake libtool zlib-devel \ readline-devel ncurses-devel openssl-devel \ libunwind-devel libicu-devel \ python python-pip python-setuptools python-devel \ - python-msgpack python-yaml python-argparse python-six python-gevent + python-msgpack python-yaml python-six python-gevent * For CentOS 8, say: @@ -74,7 +74,7 @@ the preferences can differ. But strategically the steps are always the same. $ yum install epel-release $ curl -s https://packagecloud.io/install/repositories/packpack/backports/script.rpm.sh | sudo bash - $ yum install -y gcc gcc-c++ cmake make coreutils sed \ + $ yum install -y gcc gcc-c++ git cmake make coreutils sed \ autoconf automake libtool zlib-devel \ readline-devel ncurses-devel openssl-devel \ libunwind-devel libicu-devel \ @@ -87,11 +87,11 @@ the preferences can differ. But strategically the steps are always the same. .. code-block:: console - $ brew install cmake make autoconf binutils zlib \ + $ brew install cmake make git autoconf binutils zlib \ autoconf automake libtool \ readline ncurses openssl libunwind-headers icu4c \ && pip install python-daemon \ - msgpack-python pyyaml configargparse six gevent + msgpack-python pyyaml six gevent .. NOTE:: @@ -112,7 +112,7 @@ the preferences can differ. But strategically the steps are always the same. autoconf automake libtool \ readline ncurses openssl libunwind icu \ python27 py27-pip py27-setuptools py27-daemon \ - py27-msgpack py27-yaml py27-argparse py27-six py27-gevent + py27-msgpack py27-yaml py27-six py27-gevent If some Python modules are not available in a repository, it is best to set up the modules by getting a tarball and From 441ac4c28355942e12311f0f7ec95132e92e2972 Mon Sep 17 00:00:00 2001 From: Natalia Ogoreltseva Date: Mon, 1 Mar 2021 13:39:43 +0300 Subject: [PATCH 2/2] Fixes #1702 Remove coreutils package from Centos 8 instructions --- doc/dev_guide/building_from_source.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/dev_guide/building_from_source.rst b/doc/dev_guide/building_from_source.rst index d2cd701ea8..604b9b2cf2 100644 --- a/doc/dev_guide/building_from_source.rst +++ b/doc/dev_guide/building_from_source.rst @@ -74,7 +74,7 @@ the preferences can differ. But strategically the steps are always the same. $ yum install epel-release $ curl -s https://packagecloud.io/install/repositories/packpack/backports/script.rpm.sh | sudo bash - $ yum install -y gcc gcc-c++ git cmake make coreutils sed \ + $ yum install -y gcc gcc-c++ git cmake make sed \ autoconf automake libtool zlib-devel \ readline-devel ncurses-devel openssl-devel \ libunwind-devel libicu-devel \