From 32d5e385e60cc1f3ba1d0fdcb1a265bb4de56114 Mon Sep 17 00:00:00 2001 From: xloem <0xloem@gmail.com> Date: Sun, 5 Feb 2023 21:50:07 -0500 Subject: [PATCH 1/2] Use python-magic-bin on windows --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 735b582..0f4f58c 100644 --- a/setup.py +++ b/setup.py @@ -33,8 +33,9 @@ setup(name='Mastodon.py', install_requires=[ 'requests>=2.4.2', 'python-dateutil', - 'six', - 'python-magic', + 'six', + 'python-magic-bin ; platform_system=="Windows"', + 'python-magic ; platform_system!="Windows"', 'decorator>=4.0.0', ] + blurhash_deps, tests_require=test_deps, From 9ba8781a1e57dfcec86c3dcbe5010cca43e99ba7 Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 6 Feb 2023 08:23:34 -0500 Subject: [PATCH 2/2] exclude windows deps from coverage, which is not calculated on windows. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0f4f58c..cd30258 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup(name='Mastodon.py', 'requests>=2.4.2', 'python-dateutil', 'six', - 'python-magic-bin ; platform_system=="Windows"', + 'python-magic-bin ; platform_system=="Windows"', # pragma: no cover 'python-magic ; platform_system!="Windows"', 'decorator>=4.0.0', ] + blurhash_deps,