From 1169301f14c4bce01cd635c591d1237579084bc4 Mon Sep 17 00:00:00 2001 From: LecygneNoir Date: Tue, 7 Apr 2020 10:09:10 +0200 Subject: [PATCH] After test python-magic is required on Windows in addition to python-magic-bin, so remove the 'Linux only' marker --- poetry.lock | 1 - pyproject.toml | 2 +- requirements.txt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 1f72b3a..ccd9b43 100644 --- a/poetry.lock +++ b/poetry.lock @@ -208,7 +208,6 @@ pyasn1 = ">=0.4.6,<0.5.0" [[package]] category = "main" description = "File type identification using libmagic" -marker = "platform_system == \"Linux\"" name = "python-magic" optional = false python-versions = "*" diff --git a/pyproject.toml b/pyproject.toml index 893fdf1..5e25d4f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ google-auth-httplib2 = "^0.0.3" google-auth-oauthlib = "^0.2.0" httplib2 = "^0.12.1" oauthlib = "^2.1.0" -python-magic = { version = "^0.4.15", markers = "platform_system == 'Linux'" } +python-magic = "^0.4.15" python-magic-bin = { version = "^0.4.14", markers = "platform_system == 'Windows'" } requests = "^2.18.4" requests-oauthlib = "^0.8.0" diff --git a/requirements.txt b/requirements.txt index 9ebf51f..3768210 100644 --- a/requirements.txt +++ b/requirements.txt @@ -88,7 +88,7 @@ pyasn1-modules==0.2.8 \ --hash=sha256:426edb7a5e8879f1ec54a1864f16b882c2837bfd06eee62f2c982315ee2473ed \ --hash=sha256:cbac4bc38d117f2a49aeedec4407d23e8866ea4ac27ff2cf7fb3e5b570df19e0 \ --hash=sha256:c29a5e5cc7a3f05926aff34e097e84f8589cd790ce0ed41b67aed6857b26aafd -python-magic==0.4.15; platform_system == "Linux" \ +python-magic==0.4.15 \ --hash=sha256:f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5 \ --hash=sha256:f2674dcfad52ae6c49d4803fa027809540b130db1dec928cfbb9240316831375 python-magic-bin==0.4.14; platform_system == "Windows" \