Skip to content

Commit

Permalink
progress 7
Browse files Browse the repository at this point in the history
  • Loading branch information
giampaolo committed Dec 20, 2024
1 parent 0d0e9d9 commit 8385082
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion psutil/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
AF_LINK = _psplatform.AF_LINK

__author__ = "Giampaolo Rodola'"
__version__ = "6.1.1"
__version__ = "7.0.0"
version_info = tuple([int(num) for num in __version__.split('.')])

_timer = getattr(time, 'monotonic', time.time)
Expand Down
28 changes: 15 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,13 @@
# found in the LICENSE file.

"""Cross-platform lib for process and system monitoring in Python.
NOTE: the syntax of this script MUST be kept compatible with Python
2.7.
"""

from __future__ import print_function # noqa: UP010

import sys
import textwrap


if sys.version_info[0] == 2: # noqa: UP036
sys.exit(textwrap.dedent("""\
As of version 7.0.0 psutil no longer supports Python 2.7.
Latest version supporting Python 2.7 is psutil 6.1.X.
Install it with:
pip2 install psutil==6.1.*\
"""))

import ast
import contextlib
import glob
Expand All @@ -34,11 +22,24 @@
import shutil
import struct
import subprocess
import sys
import sysconfig
import tempfile
import textwrap
import warnings


if sys.version_info[0] == 2: # noqa: UP036
sys.exit(textwrap.dedent("""\
As of version 7.0.0 psutil no longer supports Python 2.7, see:
https://github.com/giampaolo/psutil/issues/2480
Latest version supporting Python 2.7 is psutil 6.1.X.
Install it with:
python2 -m pip install psutil==6.1.*\
"""))


with warnings.catch_warnings():
warnings.simplefilter("ignore")
try:
Expand All @@ -52,6 +53,7 @@
from distutils.core import Extension
from distutils.core import setup


HERE = os.path.abspath(os.path.dirname(__file__))

# ...so we can import _common.py
Expand Down

0 comments on commit 8385082

Please sign in to comment.