Skip to content

Replace distutils.version with packaging.version #107

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Replace distutils.version with packaging.version #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions reclass/storage/yaml_git/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@
from __future__ import unicode_literals

import collections
import distutils.version
import errno
import fcntl
import os
import time

try:
from distutils.version import LooseVersion as Version
except ModuleNotFoundError:
from packaging.version import Version

# Squelch warning on centos7 due to upgrading cffi
# see https://github.com/saltstack/salt/pull/39871
import warnings
Expand Down Expand Up @@ -146,7 +150,7 @@ def _init_repo(self, uri):
creds = pygit2.KeypairFromAgent(user)

pygit2_version = pygit2.__version__
if distutils.version.LooseVersion(pygit2_version) >= distutils.version.LooseVersion('0.23.2'):
if Version(pygit2_version) >= Version('0.23.2'):
self.remotecallbacks = pygit2.RemoteCallbacks(credentials=creds)
self.credentials = None
else:
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ pyyaml
six
enum34 ; python_version<'3.4'
ddt
packaging ; python_version>'3.12'
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
install_requires = ['pyparsing', 'pyyaml', 'six', 'ddt'], #FIXME pygit2 (require libffi-dev, libgit2-dev 0.26.x )
extras_require = {
":python_version<'3.4'": ['enum34'],
":python_version>'3.12'": ['packaging'],
},

classifiers=[
Expand Down