diff options
| author | Grzegorz Bokota <g.bokota@cent.uw.edu.pl> | 2019-11-19 06:42:36 +0100 |
|---|---|---|
| committer | Alex Grönholm <alex.gronholm@nextday.fi> | 2019-11-19 07:42:36 +0200 |
| commit | 9b416dd6b0844f017a56876a5daef5b7ec062d72 (patch) | |
| tree | a8c5ecb5a8a840100fa383f4ad66d1565be2e6f5 | |
| parent | a7510b6510ab3f1768de7eb75d7a6d06303bee24 (diff) | |
| download | wheel-git-9b416dd6b0844f017a56876a5daef5b7ec062d72.tar.gz | |
Fixed typo 'dynlib' -> 'dylib' (#320)
| -rw-r--r-- | tests/test_macosx_libfile.py | 32 | ||||
| -rw-r--r-- | tests/testdata/macosx_minimal_system_version/test_lib_10_10.dylib (renamed from tests/testdata/macosx_minimal_system_version/test_lib_10_10.dynlib) | bin | 756 -> 756 bytes | |||
| -rw-r--r-- | tests/testdata/macosx_minimal_system_version/test_lib_10_10_386.dylib (renamed from tests/testdata/macosx_minimal_system_version/test_lib_10_10_386.dynlib) | bin | 668 -> 668 bytes | |||
| -rw-r--r-- | tests/testdata/macosx_minimal_system_version/test_lib_10_10_fat.dylib (renamed from tests/testdata/macosx_minimal_system_version/test_lib_10_10_fat.dynlib) | bin | 8948 -> 8948 bytes | |||
| -rw-r--r-- | tests/testdata/macosx_minimal_system_version/test_lib_10_14.dylib (renamed from tests/testdata/macosx_minimal_system_version/test_lib_10_14.dynlib) | bin | 764 -> 764 bytes | |||
| -rw-r--r-- | tests/testdata/macosx_minimal_system_version/test_lib_10_14_386.dylib (renamed from tests/testdata/macosx_minimal_system_version/test_lib_10_14_386.dynlib) | bin | 676 -> 676 bytes | |||
| -rw-r--r-- | tests/testdata/macosx_minimal_system_version/test_lib_10_14_fat.dylib (renamed from tests/testdata/macosx_minimal_system_version/test_lib_10_14_fat.dynlib) | bin | 8956 -> 8956 bytes | |||
| -rw-r--r-- | tests/testdata/macosx_minimal_system_version/test_lib_10_6.dylib (renamed from tests/testdata/macosx_minimal_system_version/test_lib_10_6.dynlib) | bin | 756 -> 756 bytes | |||
| -rw-r--r-- | tests/testdata/macosx_minimal_system_version/test_lib_10_6_386.dylib (renamed from tests/testdata/macosx_minimal_system_version/test_lib_10_6_386.dynlib) | bin | 668 -> 668 bytes | |||
| -rw-r--r-- | tests/testdata/macosx_minimal_system_version/test_lib_10_6_fat.dylib (renamed from tests/testdata/macosx_minimal_system_version/test_lib_10_6_fat.dynlib) | bin | 8948 -> 8948 bytes | |||
| -rw-r--r-- | tests/testdata/macosx_minimal_system_version/test_lib_multiple_fat.dylib (renamed from tests/testdata/macosx_minimal_system_version/test_lib_multiple_fat.dynlib) | bin | 8956 -> 8956 bytes | |||
| -rw-r--r-- | wheel/pep425tags.py | 2 |
12 files changed, 17 insertions, 17 deletions
diff --git a/tests/test_macosx_libfile.py b/tests/test_macosx_libfile.py index 79b5549..9c96b82 100644 --- a/tests/test_macosx_libfile.py +++ b/tests/test_macosx_libfile.py @@ -11,16 +11,16 @@ def test_read_from_dynlib(): dylib_dir = os.path.join(dirname, "testdata", "macosx_minimal_system_version") versions = [ - ("test_lib_10_6_fat.dynlib", "10.6"), - ("test_lib_10_10_fat.dynlib", "10.10"), - ("test_lib_10_14_fat.dynlib", "10.14"), - ("test_lib_10_6.dynlib", "10.6"), - ("test_lib_10_10.dynlib", "10.10"), - ("test_lib_10_14.dynlib", "10.14"), - ("test_lib_10_6_386.dynlib", "10.6"), - ("test_lib_10_10_386.dynlib", "10.10"), - ("test_lib_10_14_386.dynlib", "10.14"), - ("test_lib_multiple_fat.dynlib", "10.14") + ("test_lib_10_6_fat.dylib", "10.6"), + ("test_lib_10_10_fat.dylib", "10.10"), + ("test_lib_10_14_fat.dylib", "10.14"), + ("test_lib_10_6.dylib", "10.6"), + ("test_lib_10_10.dylib", "10.10"), + ("test_lib_10_14.dylib", "10.14"), + ("test_lib_10_6_386.dylib", "10.6"), + ("test_lib_10_10_386.dylib", "10.10"), + ("test_lib_10_14_386.dylib", "10.14"), + ("test_lib_multiple_fat.dylib", "10.14") ] for file_name, ver in versions: extracted = extract_macosx_min_system_version( @@ -60,13 +60,13 @@ class TestGetPlatformMacosx: dylib_dir = os.path.join(dirname, "testdata", "macosx_minimal_system_version") monkeypatch.setattr(distutils.util, "get_platform", return_factory("macosx-10.9-x86_64")) monkeypatch.setattr(os, "walk", return_factory( - [(dylib_dir, [], ["test_lib_10_6.dynlib", "test_lib_10_10_fat.dynlib"])] + [(dylib_dir, [], ["test_lib_10_6.dylib", "test_lib_10_10_fat.dylib"])] )) assert get_platform(dylib_dir) == "macosx_10_10_x86_64" captured = capsys.readouterr() assert "[WARNING] This wheel needs higher macosx version than" in captured.err assert "your python is compiled against." in captured.err - assert "test_lib_10_10_fat.dynlib" in captured.err + assert "test_lib_10_10_fat.dylib" in captured.err def test_information_about_problematic_files_env_variable(self, monkeypatch, capsys): dirname = os.path.dirname(__file__) @@ -74,20 +74,20 @@ class TestGetPlatformMacosx: monkeypatch.setattr(distutils.util, "get_platform", return_factory("macosx-10.9-x86_64")) monkeypatch.setenv("MACOSX_DEPLOYMENT_TARGET", "10.8") monkeypatch.setattr(os, "walk", return_factory( - [(dylib_dir, [], ["test_lib_10_6.dynlib", "test_lib_10_10_fat.dynlib"])] + [(dylib_dir, [], ["test_lib_10_6.dylib", "test_lib_10_10_fat.dylib"])] )) assert get_platform(dylib_dir) == "macosx_10_10_x86_64" captured = capsys.readouterr() assert "[WARNING] This wheel needs higher macosx version than" in captured.err assert "is set in MACOSX_DEPLOYMENT_TARGET variable." in captured.err - assert "test_lib_10_10_fat.dynlib" in captured.err + assert "test_lib_10_10_fat.dylib" in captured.err def test_bump_platform_tag_by_env_variable(self, monkeypatch, capsys): dirname = os.path.dirname(__file__) dylib_dir = os.path.join(dirname, "testdata", "macosx_minimal_system_version") monkeypatch.setattr(distutils.util, "get_platform", return_factory("macosx-10.9-x86_64")) monkeypatch.setattr(os, "walk", return_factory( - [(dylib_dir, [], ["test_lib_10_6.dynlib", "test_lib_10_6_fat.dynlib"])] + [(dylib_dir, [], ["test_lib_10_6.dylib", "test_lib_10_6_fat.dylib"])] )) assert get_platform(dylib_dir) == "macosx_10_9_x86_64" monkeypatch.setenv("MACOSX_DEPLOYMENT_TARGET", "10.10") @@ -101,7 +101,7 @@ class TestGetPlatformMacosx: monkeypatch.setattr(distutils.util, "get_platform", return_factory("macosx-10.9-x86_64")) monkeypatch.setenv("MACOSX_DEPLOYMENT_TARGET", "10.8") monkeypatch.setattr(os, "walk", return_factory( - [(dylib_dir, [], ["test_lib_10_6.dynlib", "test_lib_10_6_fat.dynlib"])] + [(dylib_dir, [], ["test_lib_10_6.dylib", "test_lib_10_6_fat.dylib"])] )) assert get_platform(dylib_dir) == "macosx_10_9_x86_64" captured = capsys.readouterr() diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_10_10.dynlib b/tests/testdata/macosx_minimal_system_version/test_lib_10_10.dylib Binary files differindex eaf1a94..eaf1a94 100644 --- a/tests/testdata/macosx_minimal_system_version/test_lib_10_10.dynlib +++ b/tests/testdata/macosx_minimal_system_version/test_lib_10_10.dylib diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_10_10_386.dynlib b/tests/testdata/macosx_minimal_system_version/test_lib_10_10_386.dylib Binary files differindex 8f54387..8f54387 100644 --- a/tests/testdata/macosx_minimal_system_version/test_lib_10_10_386.dynlib +++ b/tests/testdata/macosx_minimal_system_version/test_lib_10_10_386.dylib diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_10_10_fat.dynlib b/tests/testdata/macosx_minimal_system_version/test_lib_10_10_fat.dylib Binary files differindex 6c09512..6c09512 100644 --- a/tests/testdata/macosx_minimal_system_version/test_lib_10_10_fat.dynlib +++ b/tests/testdata/macosx_minimal_system_version/test_lib_10_10_fat.dylib diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_10_14.dynlib b/tests/testdata/macosx_minimal_system_version/test_lib_10_14.dylib Binary files differindex c9024cc..c9024cc 100644 --- a/tests/testdata/macosx_minimal_system_version/test_lib_10_14.dynlib +++ b/tests/testdata/macosx_minimal_system_version/test_lib_10_14.dylib diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_10_14_386.dynlib b/tests/testdata/macosx_minimal_system_version/test_lib_10_14_386.dylib Binary files differindex c85b716..c85b716 100644 --- a/tests/testdata/macosx_minimal_system_version/test_lib_10_14_386.dynlib +++ b/tests/testdata/macosx_minimal_system_version/test_lib_10_14_386.dylib diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_10_14_fat.dynlib b/tests/testdata/macosx_minimal_system_version/test_lib_10_14_fat.dylib Binary files differindex 4bb0940..4bb0940 100644 --- a/tests/testdata/macosx_minimal_system_version/test_lib_10_14_fat.dynlib +++ b/tests/testdata/macosx_minimal_system_version/test_lib_10_14_fat.dylib diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_10_6.dynlib b/tests/testdata/macosx_minimal_system_version/test_lib_10_6.dylib Binary files differindex 80401ee..80401ee 100644 --- a/tests/testdata/macosx_minimal_system_version/test_lib_10_6.dynlib +++ b/tests/testdata/macosx_minimal_system_version/test_lib_10_6.dylib diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_10_6_386.dynlib b/tests/testdata/macosx_minimal_system_version/test_lib_10_6_386.dylib Binary files differindex 1e48cd8..1e48cd8 100644 --- a/tests/testdata/macosx_minimal_system_version/test_lib_10_6_386.dynlib +++ b/tests/testdata/macosx_minimal_system_version/test_lib_10_6_386.dylib diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_10_6_fat.dynlib b/tests/testdata/macosx_minimal_system_version/test_lib_10_6_fat.dylib Binary files differindex f4ffaee..f4ffaee 100644 --- a/tests/testdata/macosx_minimal_system_version/test_lib_10_6_fat.dynlib +++ b/tests/testdata/macosx_minimal_system_version/test_lib_10_6_fat.dylib diff --git a/tests/testdata/macosx_minimal_system_version/test_lib_multiple_fat.dynlib b/tests/testdata/macosx_minimal_system_version/test_lib_multiple_fat.dylib Binary files differindex 5f7fd50..5f7fd50 100644 --- a/tests/testdata/macosx_minimal_system_version/test_lib_multiple_fat.dynlib +++ b/tests/testdata/macosx_minimal_system_version/test_lib_multiple_fat.dylib diff --git a/wheel/pep425tags.py b/wheel/pep425tags.py index 6b1abd1..100d0b4 100644 --- a/wheel/pep425tags.py +++ b/wheel/pep425tags.py @@ -137,7 +137,7 @@ def calculate_macosx_platform_tag(archive_root, platform_tag): versions_dict = {} for (dirpath, dirnames, filenames) in os.walk(archive_root): for filename in filenames: - if filename.endswith('.dynlib') or filename.endswith('.so'): + if filename.endswith('.dylib') or filename.endswith('.so'): lib_path = os.path.join(dirpath, filename) versions_dict[lib_path] = extract_macosx_min_system_version(lib_path) |
