From 524f32be64615444fa4762fc1f94ee07bb113cdb Mon Sep 17 00:00:00 2001
From: Adriane Boyd <adrianeboyd@gmail.com>
Date: Fri, 25 Nov 2022 13:00:57 +0100
Subject: [PATCH] Add smart_open requirement, update deprecated options
 (#11864)

* Switch from deprecated `ignore_ext` to `compression`
* Add upload/download test for local files
---
 requirements.txt        |  1 +
 setup.cfg               |  3 ++-
 spacy/cli/_util.py      |  2 +-
 spacy/tests/test_cli.py | 16 ++++++++++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 03ecbc9cc..3f7b0cefc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,6 +11,7 @@ srsly>=2.4.1,<3.0.0
 catalogue>=2.0.6,<2.1.0
 typer>=0.3.0,<0.5.0
 pathy>=0.3.5
+smart-open>=5.2.1,<7.0.0
 # Third party dependencies
 numpy>=1.15.0
 requests>=2.13.0,<3.0.0
diff --git a/setup.cfg b/setup.cfg
index dc31228e5..8517b77b2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -50,9 +50,10 @@ install_requires =
     wasabi>=0.8.1,<1.1.0
     srsly>=2.4.1,<3.0.0
     catalogue>=2.0.6,<2.1.0
+    # Third-party dependencies
     typer>=0.3.0,<0.5.0
     pathy>=0.3.5
-    # Third-party dependencies
+    smart-open>=5.2.1,<7.0.0
     tqdm>=4.38.0,<5.0.0
     numpy>=1.15.0
     requests>=2.13.0,<3.0.0
diff --git a/spacy/cli/_util.py b/spacy/cli/_util.py
index fb680d888..1b9740d0b 100644
--- a/spacy/cli/_util.py
+++ b/spacy/cli/_util.py
@@ -358,7 +358,7 @@ def download_file(src: Union[str, "Pathy"], dest: Path, *, force: bool = False)
     if dest.exists() and not force:
         return None
     src = str(src)
-    with smart_open.open(src, mode="rb", ignore_ext=True) as input_file:
+    with smart_open.open(src, mode="rb", compression="disable") as input_file:
         with dest.open(mode="wb") as output_file:
             output_file.write(input_file.read())
 
diff --git a/spacy/tests/test_cli.py b/spacy/tests/test_cli.py
index 72bbe04e5..894a41b73 100644
--- a/spacy/tests/test_cli.py
+++ b/spacy/tests/test_cli.py
@@ -11,6 +11,7 @@ from spacy.cli._util import validate_project_commands, parse_config_overrides
 from spacy.cli._util import load_project_config, substitute_project_variables
 from spacy.cli._util import is_subpath_of
 from spacy.cli._util import string_to_list
+from spacy.cli._util import upload_file, download_file
 from spacy import about
 from spacy.util import get_minor_version
 from spacy.cli.validate import get_model_pkgs
@@ -574,3 +575,18 @@ def test_get_third_party_dependencies():
 )
 def test_is_subpath_of(parent, child, expected):
     assert is_subpath_of(parent, child) == expected
+
+
+def test_upload_download_local_file():
+    with make_tempdir() as d1, make_tempdir() as d2:
+        filename = "f.txt"
+        content = "content"
+        local_file = d1 / filename
+        remote_file = d2 / filename
+        with local_file.open(mode="w") as file_:
+            file_.write(content)
+        upload_file(local_file, remote_file)
+        local_file.unlink()
+        download_file(remote_file, local_file)
+        with local_file.open(mode="r") as file_:
+            assert file_.read() == content