Skip to content

Commit a65c563

Browse files
committed
Address deprecation warnings with the usage of distuilts for LooseVersion
1 parent 859fcae commit a65c563

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ def set_builtin(name, value):
9393
platforms='any',
9494
provides=['vispy'],
9595
python_requires='>=3.6',
96-
install_requires=['numpy', 'freetype-py', 'hsluv', 'kiwisolver'],
97-
setup_requires=['numpy', 'cython', 'setuptools_scm', 'setuptools_scm_git_archive'],
96+
install_requires=['numpy', 'freetype-py', 'hsluv', 'kiwisolver', 'packaging'],
97+
setup_requires=['numpy', 'cython', 'setuptools_scm', 'setuptools_scm_git_archive', 'packaging'],
9898
extras_require={
9999
'ipython-static': ['ipython'],
100100
'pyglet': ['pyglet>=1.2'],

vispy/app/backends/_pyglet.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from __future__ import division
88

9-
from distutils.version import LooseVersion
9+
from packaging.version import Version
1010
from time import sleep
1111

1212
from ..base import (BaseApplicationBackend, BaseCanvasBackend,
@@ -23,7 +23,7 @@
2323
try:
2424
import pyglet
2525
version = pyglet.version
26-
if LooseVersion(version) < LooseVersion('1.2'):
26+
if Version(version) < Version('1.2'):
2727
help_ = ('You can install the latest pyglet using:\n '
2828
'pip install http://pyglet.googlecode.com/archive/tip.zip')
2929
raise ImportError('Pyglet version too old (%s), need >= 1.2\n%s'

vispy/app/backends/_qt.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import sys
2727
import atexit
2828
import ctypes
29-
from distutils.version import LooseVersion
29+
from packaging.version import Version
3030

3131
from ...util import logger
3232
from ..base import (BaseApplicationBackend, BaseCanvasBackend,
@@ -90,7 +90,7 @@ def _get_event_xy(ev):
9090
_check_imports('PyQt5')
9191
if not USE_EGL:
9292
from PyQt5.QtCore import QT_VERSION_STR
93-
if LooseVersion(QT_VERSION_STR) >= '5.4.0':
93+
if Version(QT_VERSION_STR) >= Version('5.4.0'):
9494
from PyQt5.QtWidgets import QOpenGLWidget as QGLWidget
9595
from PyQt5.QtGui import QSurfaceFormat as QGLFormat
9696
QT5_NEW_API = True
@@ -102,7 +102,7 @@ def _get_event_xy(ev):
102102
_check_imports('PyQt6')
103103
if not USE_EGL:
104104
from PyQt6.QtCore import QT_VERSION_STR
105-
if LooseVersion(QT_VERSION_STR) >= '6.0.0':
105+
if Version(QT_VERSION_STR) >= Version('6.0.0'):
106106
from PyQt6.QtOpenGLWidgets import QOpenGLWidget as QGLWidget
107107
from PyQt6.QtGui import QSurfaceFormat as QGLFormat
108108
PYQT6_API = True
@@ -114,7 +114,7 @@ def _get_event_xy(ev):
114114
_check_imports('PySide6')
115115
if not USE_EGL:
116116
from PySide6.QtCore import __version__ as QT_VERSION_STR
117-
if LooseVersion(QT_VERSION_STR) >= '6.0.0':
117+
if Version(QT_VERSION_STR) >= Version('6.0.0'):
118118
from PySide6.QtOpenGLWidgets import QOpenGLWidget as QGLWidget
119119
from PySide6.QtGui import QSurfaceFormat as QGLFormat
120120
PYSIDE6_API = True
@@ -126,7 +126,7 @@ def _get_event_xy(ev):
126126
_check_imports('PySide2')
127127
if not USE_EGL:
128128
from PySide2.QtCore import __version__ as QT_VERSION_STR
129-
if LooseVersion(QT_VERSION_STR) >= '5.4.0':
129+
if Version(QT_VERSION_STR) >= Version('5.4.0'):
130130
from PySide2.QtWidgets import QOpenGLWidget as QGLWidget
131131
from PySide2.QtGui import QSurfaceFormat as QGLFormat
132132
QT5_NEW_API = True

vispy/gloo/glir.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
import re
363363
import json
364364
import weakref
365-
from distutils.version import LooseVersion
365+
from packaging.version import Version
366366

367367
import numpy as np
368368

@@ -850,7 +850,7 @@ def _gl_initialize(self):
850850
if not this_version:
851851
logger.warning("OpenGL version could not be determined, which "
852852
"might be a sign that OpenGL is not loaded correctly.")
853-
elif LooseVersion(this_version) < '2.1':
853+
elif Version(this_version) < Version('2.1'):
854854
if os.getenv('VISPY_IGNORE_OLD_VERSION', '').lower() != 'true':
855855
logger.warning('OpenGL version 2.1 or higher recommended, '
856856
'got %s. Some functionality may fail.'

vispy/testing/_testing.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import pytest
1515
import functools
1616

17-
from distutils.version import LooseVersion
17+
from packaging.version import Version
1818

1919
from ..util.check_environment import has_backend
2020

@@ -251,7 +251,7 @@ def has_ipython(version='3.0'):
251251
except Exception:
252252
return False, "IPython library not found"
253253
else:
254-
if LooseVersion(IPython.__version__) >= LooseVersion(version):
254+
if Version(IPython.__version__) >= Version(version):
255255
return True, "IPython present"
256256
else:
257257
message = (
@@ -284,8 +284,7 @@ def _has_scipy(min_version):
284284
try:
285285
assert isinstance(min_version, str)
286286
import scipy # noqa, analysis:ignore
287-
from distutils.version import LooseVersion
288-
this_version = LooseVersion(scipy.__version__)
287+
this_version = Version(scipy.__version__)
289288
if this_version < min_version:
290289
return False
291290
except Exception:

vispy/util/check_environment.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) Vispy Development Team. All Rights Reserved.
33
# Distributed under the (new) BSD License. See LICENSE.txt for more info.
44
import os
5-
from distutils.version import LooseVersion
5+
from packaging.version import Version
66

77
from vispy.util import use_log_level
88

@@ -14,7 +14,7 @@ def has_matplotlib(version='1.2'):
1414
except Exception:
1515
has_mpl = False
1616
else:
17-
if LooseVersion(matplotlib.__version__) >= LooseVersion(version):
17+
if Version(matplotlib.__version__) >= Version(version):
1818
has_mpl = True
1919
else:
2020
has_mpl = False
@@ -27,8 +27,8 @@ def has_skimage(version='0.11'):
2727
import skimage
2828
except ImportError:
2929
return False
30-
sk_version = LooseVersion(skimage.__version__)
31-
return sk_version >= LooseVersion(version)
30+
sk_version = Version(skimage.__version__)
31+
return sk_version >= Version(version)
3232

3333

3434
def has_backend(backend, has=(), capable=(), out=()):

0 commit comments

Comments
 (0)