Skip to content

Commit

Permalink
Merge pull request #4463 from devos50/typing_dep
Browse files Browse the repository at this point in the history
Added python-typing dependency to docs
  • Loading branch information
devos50 authored Apr 16, 2019
2 parents 04d5a28 + 52817d1 commit d3b9e50
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Depends: ${misc:Depends},
python-pyqt5,
python-pyqt5.qtsvg,
python-twisted,
python-typing,
vlc (>= 1.1.0),
Recommends: python-faulthandler,
python-tk,
Expand Down
4 changes: 2 additions & 2 deletions doc/development/development_on_linux.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ First, install the required dependencies by executing the following command in y

.. code-block:: none
sudo apt install ffmpeg libssl-dev libx11-6 vlc libgmp-dev python2.7 python-minimal python-pip python-cherrypy3 python-libtorrent python-meliae python-pyqt5 python-pyqt5.qtsvg python-scipy
sudo apt install ffmpeg libssl-dev libx11-6 vlc libgmp-dev python2.7 python-minimal python-pip python-cherrypy3 python-libtorrent python-meliae python-pyqt5 python-pyqt5.qtsvg python-scipy python-typing
Secondly, install python packages

Expand Down Expand Up @@ -35,4 +35,4 @@ Execute the following command in your terminal:

.. code-block:: none
pacman -S libsodium libtorrent-rasterbar python2-pyqt5 qt5-svg phonon-qt5-vlc python2-cherrypy python2-cryptography python2-decorator python2-chardet python2-netifaces python2-twisted python2-configobj python2-matplotlib python2-networkx python2-psutil python2-scipy python2-libnacl python2-lz4 python2-pony python2-pyopenssl
pacman -S libsodium libtorrent-rasterbar python2-pyqt5 qt5-svg phonon-qt5-vlc python2-cherrypy python2-cryptography python2-decorator python2-chardet python2-netifaces python2-twisted python2-configobj python2-matplotlib python2-networkx python2-psutil python2-scipy python2-libnacl python2-lz4 python2-pony python2-pyopenssl python2-typing
4 changes: 2 additions & 2 deletions doc/development/development_on_osx.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ There are a bunch of other packages that can easily be installed using pip and b
brew install homebrew/python/pillow gmp mpfr libmpc libsodium
sudo easy_install pip
pip install --user cython # Needs to be installed first for meliae
pip install --user cherrypy cffi chardet configobj cryptography decorator gmpy2 idna meliae netifaces numpy pillow \
psutil pyasn1 pycparser scipy lz4 pyopenssl Twisted==16.4.1 networkx service_identity libnacl bitcoinlib
pip install --user bitcoinlib cherrypy cffi chardet configobj cryptography decorator gmpy2 idna libnacl lz4 \
meliae netifaces numpy pillow psutil pyasn1 pycparser scipy pyopenssl Twisted==16.4.1 networkx service_identity typing
If you encounter any error during the installation of Pillow, make sure that libjpeg and zlib are installed. They can be installed using:

Expand Down
2 changes: 1 addition & 1 deletion doc/development/development_on_windows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ There are some additional packages which should be installed. They can easily be
.. code-block:: none
pip install cython # Needs to be installed first for meliae
pip install bitcoinlib cherrypy chardet configobj cryptography decorator meliae netifaces networkx pillow psutil twisted libnacl
pip install bitcoinlib cherrypy chardet configobj cryptography decorator libnacl meliae netifaces networkx pillow psutil typing twisted
Running Tribler
---------------
Expand Down

0 comments on commit d3b9e50

Please sign in to comment.