Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace deprecated distutils #301

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pydev_ipython/inputhook.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ def enable_wx(self, app=None):
app = wx.App(redirect=False, clearSigInt=False)
"""
import wx
from distutils.version import LooseVersion as V
from packaging.version import Version as V

wx_version = V(wx.__version__).version # @UndefinedVariable
wx_version = V(wx.__version__) # @UndefinedVariable

if wx_version < [2, 8]:
if wx_version < V("2.8"):
raise ValueError("requires wxPython >= 2.8, but you have %s" % wx.__version__) # @UndefinedVariable

from pydev_ipython.inputhookwx import inputhook_wx
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
for release process.
"""

from setuptools import setup
from setuptools import Extension, setup
from setuptools.dist import Distribution
from distutils.extension import Extension
import os


Expand Down
2 changes: 1 addition & 1 deletion setup_pydevd_cython.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def build_extension(dir_name, extension_name, target_pydevd_name, force_cython,
stream.write(c_file_contents)

# Always compile the .c (and not the .pyx) file (which we should keep up-to-date by running build_tools/build.py).
from distutils.extension import Extension
from setuptools import Extension

extra_compile_args = []
extra_link_args = []
Expand Down
Loading