Merge pull request #36 from Othoz/cleanup-tests

Remove runtime dependency on NumPy

.travis.yml

@@ -2,7 +2,8 @@ sudo: false
 language: python
 
 python:
-  - "3.5"
+  - 3.5
+  - 3.8
 
 install:
   - pip install pipenv

CHANGELOG.rst

@@ -20,6 +20,15 @@ Possible types of changes are:
 Unreleased
 ----------
 
+
+1.4.1 - 06.07.2020
+------------------
+
+Fixed
+'''''
+- Fixed a bug in ``GCSFile.readinto`` that surfaced for Python >=3.8 when reading data via e.g. ``numpy.load``.
+
+
 1.4.0 - 12.06.2020
 ------------------
 

Pipfile

@@ -4,6 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [dev-packages]
+numpy = "*"  # one test verifies that GCSFS is compatible with numpy.load()/save() and thus requires numpy as a dep
 flake8 = "*"
 pytest = "*"
 pytest-cov = "*"

fs_gcsfs/tests/test_gcsfs.py

@@ -37,35 +37,6 @@ def make_fs(self):
         return GCSFS(bucket_name=TEST_BUCKET, root_path=self.root_path, client=self.client, create=True)
 
 
-class TestReadinto(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.client = Client()
-        cls.bucket = cls.client.get_bucket(TEST_BUCKET)
-        super().setUpClass()
-
-    def setUp(self):
-        self.root_path = "gcsfs/" + str(uuid.uuid4())
-        super().setUp()
-
-    def tearDown(self):
-        for blob in self.bucket.list_blobs(prefix=self.root_path):
-            blob.delete()
-
-    def make_fs(self):
-        return GCSFS(bucket_name=TEST_BUCKET, root_path=self.root_path, client=self.client, create=True)
-
-    def test_readinto(self):
-        fs = self.make_fs()
-        a = np.random.choice([Decimal("1.0"), Decimal("2.22"), Decimal("3.1")], size=(100, 10))
-        with fs.open("foo.npy", "wb") as f:
-            np.save(f, a)
-
-        with fs.open("foo.npy", "rb") as f:
-            np.load(f, allow_pickle=True)
-
-
 @pytest.fixture(scope="module")
 def client_mock():
     class ClientMock:
@@ -178,6 +149,17 @@ def test_instantiation_with_create_false_fails_for_non_existing_root_path():
         GCSFS(bucket_name=TEST_BUCKET, root_path=str(uuid.uuid4()), create=False)
 
 
+def test_gcsfile_readinto_works_correctly_with_numpy_load(gcsfs):
+    # Note: this is a regression test that previously failed with GCSFS <=1.4.0 due to a bug in
+    # GCSFile.readinto() that caused an exception to be raised. The test thus does not require explicit
+    # asserts, it purely verifies that the exception doesn't get raised anymore.
+    a = np.random.choice([Decimal("1.0"), Decimal("2.22"), Decimal("3.1")], size=(100, 10))
+    with gcsfs.open("foo.npy", "wb") as f:
+        np.save(f, a)
+    with gcsfs.open("foo.npy", "rb") as f:
+        np.load(f, allow_pickle=True)
+
+
 @pytest.mark.parametrize("query_param, strict", [
     ("", True),
     ("nonExisting=True", True),

setup.py

@@ -27,8 +27,7 @@
         setup_requires=['setuptools_scm'],
         install_requires=[
             "fs~=2.0",
-            "google-cloud-storage~=1.0",
-            "numpy~=1.18"
+            "google-cloud-storage~=1.0"
         ],
         entry_points={
             "fs.opener": [