Skip to content

Commit

Permalink
setup.py: Remove explicit psutil requirement
Browse files Browse the repository at this point in the history
psutil may not always be available and we check for this at import time
already

Closes #280
  • Loading branch information
chfoo committed Oct 1, 2015
1 parent 91e0a1d commit 1546fe5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Unreleased

* Fixed: ``--output-document`` file doesn't contain content.
* Fixed: OverflowError when URL contains invalid port number greater than 65535 or less than 0.
* Changed: The setup file no longer requires optional psutil.


1.2.1 (2015-05-15)
Expand Down
9 changes: 9 additions & 0 deletions doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Wpull requires the following:

The following are optional:

* `psutil` for monitoring disk space
* `Lunatic Python (bastibe version)
<https://github.com/bastibe/lunatic-python>`_ for Lua support
* `Manhole <https://pypi.python.org/pypi/manhole>`_ for a REPL debugging socket
Expand Down Expand Up @@ -72,6 +73,14 @@ Install Wpull from GitHub::
as the path will install Wpull's develop branch.


psutil
++++++

psutil is required for the disk and memory monitoring options but may not be available. To install::

pip3 install psutil


Pre-built Binaries
==================

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def get_version():

setup_kwargs['install_requires'] = [
'tornado', 'trollius', 'chardet', 'sqlalchemy',
'namedlist', 'html5lib', 'dnspython3', 'psutil'
'namedlist', 'html5lib', 'dnspython3',
]

setup_kwargs['scripts'] = ['scripts/wpull', 'scripts/wpull3']
Expand Down

0 comments on commit 1546fe5

Please sign in to comment.