Merge pull request #146 from zobayer1/fix_145

Fix for extracting version incorrectly from sdist filename containing dashes
mgedmin · Sep 22, 2021 · 4beeefb · 4beeefb
2 parents 7c4403a + b7b2228
commit 4beeefb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/check_manifest.py b/check_manifest.py
@@ -879,7 +879,7 @@ def extract_version_from_filename(filename):
     filename = os.path.splitext(os.path.basename(filename))[0]
     if filename.endswith('.tar'):
         filename = os.path.splitext(filename)[0]
-    return filename.partition('-')[2]
+    return filename.split('-')[-1]
 
 
 def should_use_pep_517():

diff --git a/tests.py b/tests.py
@@ -464,6 +464,7 @@ def test_extract_version_from_filename(self):
         from check_manifest import extract_version_from_filename as e
         self.assertEqual(e('dist/foo_bar-1.2.3.dev4+g12345.zip'), '1.2.3.dev4+g12345')
         self.assertEqual(e('dist/foo_bar-1.2.3.dev4+g12345.tar.gz'), '1.2.3.dev4+g12345')
+        self.assertEqual(e('dist/foo-bar-1.2.3.dev4+g12345.tar.gz'), '1.2.3.dev4+g12345')
 
     def test_get_ignore_from_manifest_lines(self):
         from check_manifest import IgnoreList, _get_ignore_from_manifest_lines