Merge lp:~jelmer/brz/avoid-deprecated into lp:brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7642
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/avoid-deprecated
Merge into: lp:brz
Diff against target: 39 lines (+7/-4)
2 files modified
setup.cfg (+1/-1)
setup.py (+6/-3)
To merge this branch: bzr merge lp:~jelmer/brz/avoid-deprecated
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+430255@code.launchpad.net

Commit message

Avoid deprecated distutils.version.

Description of the change

Avoid deprecated distutils.version.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.cfg'
2--- setup.cfg 2022-07-16 12:26:21 +0000
3+++ setup.cfg 2022-09-22 00:05:31 +0000
4@@ -1,7 +1,7 @@
5 [metadata]
6 name = breezy
7 maintainer = Breezy Developers
8-maintainer-email = team@breezy-vcs.org
9+maintainer_email = team@breezy-vcs.org
10 description = Friendly distributed version control system
11 long_description = file:README.rst
12 version = attr:breezy.__version__
13
14=== modified file 'setup.py'
15--- setup.py 2022-09-08 03:26:13 +0000
16+++ setup.py 2022-09-22 00:05:31 +0000
17@@ -37,7 +37,10 @@
18
19
20 from setuptools import setup
21-from distutils.version import LooseVersion
22+try:
23+ from packaging.version import Version
24+except ImportError:
25+ from distutils.version import LooseVersion as Version
26 from distutils.command.install import install
27 from distutils.command.install_data import install_data
28 from distutils.command.install_scripts import install_scripts
29@@ -122,8 +125,8 @@
30 from distutils.command.build_ext import build_ext
31 else:
32 minimum_cython_version = '0.29'
33- cython_version_info = LooseVersion(cython_version)
34- if cython_version_info < LooseVersion(minimum_cython_version):
35+ cython_version_info = Version(cython_version)
36+ if cython_version_info < Version(minimum_cython_version):
37 print("Version of Cython is too old. "
38 "Current is %s, need at least %s."
39 % (cython_version, minimum_cython_version))

Subscribers

People subscribed via source and target branches