File tree Expand file tree Collapse file tree 5 files changed +18
-10
lines changed Expand file tree Collapse file tree 5 files changed +18
-10
lines changed Original file line number Diff line number Diff line change 44 */.buildout/eggs/*
55 bin/test
66 buildout-cache/eggs/*
7- parts/*
87 eggs/*
8+ parts/*
9+ src/crate/client/_pep440.py
910exclude_lines =
1011 # pragma: no cover
1112 raise NotImplemented
Original file line number Diff line number Diff line change @@ -395,6 +395,13 @@ def is_prerelease(self):
395395 def is_postrelease (self ):
396396 return bool (self ._version .post )
397397
398+ @property
399+ def version (self ) -> tuple :
400+ """
401+ PATCH: Return version tuple for backward-compatibility.
402+ """
403+ return self ._version .release
404+
398405
399406def _parse_letter_version (letter , number ):
400407 if letter :
Original file line number Diff line number Diff line change 2323from .exceptions import ProgrammingError , ConnectionError
2424from .http import Client
2525from .blob import BlobContainer
26- from distutils . version import StrictVersion
26+ from . _pep440 import Version
2727
2828
2929class Connection (object ):
@@ -192,12 +192,12 @@ def _lowest_server_version(self):
192192 for server in self .client .active_servers :
193193 try :
194194 _ , _ , version = self .client .server_infos (server )
195- version = StrictVersion (version )
195+ version = Version (version )
196196 except (ValueError , ConnectionError ):
197197 continue
198198 if not lowest or version < lowest :
199199 lowest = version
200- return lowest or StrictVersion ('0.0.0' )
200+ return lowest or Version ('0.0.0' )
201201
202202 def __repr__ (self ):
203203 return '<Connection {0}>' .format (repr (self .client ))
Original file line number Diff line number Diff line change 2020# software solely pursuant to the terms of the relevant commercial agreement.
2121
2222import sqlalchemy as sa
23- from distutils . version import StrictVersion as V
23+ from crate . client . _pep440 import Version
2424
25- SA_VERSION = V (sa .__version__ )
25+ SA_VERSION = Version (sa .__version__ )
2626
27- SA_1_4 = V ('1.4.0b1' )
28- SA_2_0 = V ('2.0.0' )
27+ SA_1_4 = Version ('1.4.0b1' )
28+ SA_2_0 = Version ('2.0.0' )
Original file line number Diff line number Diff line change 2222import os
2323import tempfile
2424import urllib
25- from distutils . version import LooseVersion
25+ from crate . client . _pep440 import Version
2626from unittest import TestCase , mock
2727from io import BytesIO
2828
@@ -75,7 +75,7 @@ def test_layer_from_uri(self):
7575 versions = json .loads (response .read ().decode ())
7676 version = versions ["crate_testing" ]
7777
78- self .assertGreaterEqual (LooseVersion (version ), LooseVersion ("4.5.0" ))
78+ self .assertGreaterEqual (Version (version ), Version ("4.5.0" ))
7979
8080 uri = "https://cdn.crate.io/downloads/releases/crate-{}.tar.gz" .format (version )
8181 layer = CrateLayer .from_uri (uri , name = "crate-by-uri" , http_port = 42203 )
You can’t perform that action at this time.
0 commit comments