From ff21eeef14cbdc96e50af65565638d67c2b9a181 Mon Sep 17 00:00:00 2001 From: drew2a Date: Wed, 30 Mar 2022 17:22:18 +0200 Subject: [PATCH 1/3] Update requirements.txt --- doc/development/development_on_osx.rst | 45 -------------------------- requirements-core.txt | 3 +- 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/doc/development/development_on_osx.rst b/doc/development/development_on_osx.rst index 9ce65effb33..271b335687e 100644 --- a/doc/development/development_on_osx.rst +++ b/doc/development/development_on_osx.rst @@ -18,51 +18,6 @@ If you wish to run the Tribler Graphical User Interface, PyQt5 should be availab qmake --version # test whether qt is installed correctly -Libtorrent -~~~~~~~~~~ - -You can install libtorrent with Brew using the following command: - -.. code-block:: bash - - brew install libtorrent-rasterbar - - -To verify a correct installation, you can execute: - -.. code-block:: bash - - python3 - >>> import libtorrent - - -**Symbol not found: _kSCCompAnyRegex** error - -If you see `Symbol not found: _kSCCompAnyRegex` error, then follow -https://github.com/Homebrew/homebrew-core/pull/43858 for the explanation. - -You can build libtorrent by yourself: http://libtorrent.org/python_binding.html -or by using this workaround from PR: - -1. Edit brew formula: - -.. code-block:: bash - - brew edit libtorrent-rasterbar - -2. Add on the top of the `install` function `ENV.append` string as described below: - -.. code-block:: bash - - def install - ENV.append "LDFLAGS", "-framework SystemConfiguration -framework CoreFoundation" - -3. Build `libtorrent-rasterbar` from source: - -.. code-block:: bash - - brew install libtorrent-rasterbar --build-from-source - Other Packages ~~~~~~~~~~~~~~ diff --git a/requirements-core.txt b/requirements-core.txt index ea35c5499d4..e36ad03276b 100644 --- a/requirements-core.txt +++ b/requirements-core.txt @@ -23,4 +23,5 @@ yappi==1.3.3 yarl==1.7.2 # keep this dependency higher than 1.6.3. See: https://github.com/aio-libs/yarl/issues/517 Faker==9.8.2 sentry-sdk==1.5.0 -pyipv8==2.8.0 \ No newline at end of file +pyipv8==2.8.0 +libtorrent==1.2.15; os_name=='posix' From bd4ade596663b371e1761b3e2c6ed1fb066f83cb Mon Sep 17 00:00:00 2001 From: drew2a Date: Thu, 31 Mar 2022 16:37:22 +0200 Subject: [PATCH 2/3] Remove libtorrent from extension-pkg-whitelist --- .pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pylintrc b/.pylintrc index d3f27775106..2cd38eef868 100644 --- a/.pylintrc +++ b/.pylintrc @@ -32,7 +32,7 @@ unsafe-load-any-extension=no # A comma-separated list of package or module names from where C extensions may # be loaded. Extensions are loading into the active Python interpreter and may # run arbitrary code -extension-pkg-whitelist=libtorrent,PyQt5 +extension-pkg-whitelist=PyQt5 # Allow optimization of some AST trees. This will activate a peephole AST # optimizer, which will apply various small optimizations. For instance, it can From a8a94f0790c129bc87fb857eec71de9b61213bcb Mon Sep 17 00:00:00 2001 From: drew2a Date: Fri, 1 Apr 2022 19:28:23 +0200 Subject: [PATCH 3/3] Add libtorrent dependency for all system --- requirements-core.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-core.txt b/requirements-core.txt index e36ad03276b..de8cd83d44a 100644 --- a/requirements-core.txt +++ b/requirements-core.txt @@ -24,4 +24,4 @@ yarl==1.7.2 # keep this dependency higher than 1.6.3. See: https://github.com/ai Faker==9.8.2 sentry-sdk==1.5.0 pyipv8==2.8.0 -libtorrent==1.2.15; os_name=='posix' +libtorrent==1.2.15