Skip to content

Commit

Permalink
Merge branch 'master' of github.com:giampaolo/psutil
Browse files Browse the repository at this point in the history
  • Loading branch information
giampaolo committed Feb 17, 2020
2 parents 3ed4097 + 6c07622 commit 9069e25
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@
if POSIX:
sources.append('psutil/_psutil_posix.c')

tests_require = []
if sys.version_info[:2] <= (2, 6):
tests_require.append('unittest2')
if sys.version_info[:2] <= (2, 7):
tests_require.append('mock')
if sys.version_info[:2] <= (3, 2):
tests_require.append('ipaddress')

extras_require = {}
if sys.version_info[:2] <= (3, 3):
Expand Down Expand Up @@ -393,8 +386,6 @@ def main():
if setuptools is not None:
kwargs.update(
python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
test_suite="psutil.tests.get_suite",
tests_require=tests_require,
extras_require=extras_require,
zip_safe=False,
)
Expand Down

0 comments on commit 9069e25

Please sign in to comment.