Merge pull request #8665 from uranusjr/svn-version-more-robust

Improve SVN version parser
pypa · Aug 1, 2020 · 9add5aa · 9add5aa
2 parents 930aa5c + ea47920
commit 9add5aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/news/8665.bugfix b/news/8665.bugfix
@@ -0,0 +1 @@
+Fix SVN version detection for alternative SVN distributions.
diff --git a/src/pip/_internal/vcs/subversion.py b/src/pip/_internal/vcs/subversion.py
@@ -213,14 +213,16 @@ def call_vcs_version(self):
         #      compiled Feb 25 2019, 14:20:39 on x86_64-apple-darwin17.0.0
         #   svn, version 1.7.14 (r1542130)
         #      compiled Mar 28 2018, 08:49:13 on x86_64-pc-linux-gnu
+        #   svn, version 1.12.0-SlikSvn (SlikSvn/1.12.0)
+        #      compiled May 28 2019, 13:44:56 on x86_64-microsoft-windows6.2
         version_prefix = 'svn, version '
         version = self.run_command(['--version'])
 
         if not version.startswith(version_prefix):
             return ()
 
         version = version[len(version_prefix):].split()[0]
-        version_list = version.split('.')
+        version_list = version.partition('-')[0].split('.')
         try:
             parsed_version = tuple(map(int, version_list))
         except ValueError:

diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py
@@ -443,6 +443,9 @@ def test_subversion__call_vcs_version():
     ('svn, version 1.10.3 (r1842928)\n'
      '   compiled Feb 25 2019, 14:20:39 on x86_64-apple-darwin17.0.0',
      (1, 10, 3)),
+    ('svn, version 1.12.0-SlikSvn (SlikSvn/1.12.0)\n'
+     '   compiled May 28 2019, 13:44:56 on x86_64-microsoft-windows6.2',
+     (1, 12, 0)),
     ('svn, version 1.9.7 (r1800392)', (1, 9, 7)),
     ('svn, version 1.9.7a1 (r1800392)', ()),
     ('svn, version 1.9 (r1800392)', (1, 9)),
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix SVN version detection for alternative SVN distributions.