Upgrade black to version ~=22.0 (#3691)

* Upgrade black to version ~=22.0 * Last fixes
huggingface · Feb 8, 2022 · 36db39c · 36db39c · github-actions · Feb 8, 2022
1 parent b06bf4e
commit 36db39c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -188,7 +188,7 @@
         ]
     )
 
-QUALITY_REQUIRE = ["black==21.4b0", "flake8>=3.8.3", "isort>=5.0.0", "pyyaml>=5.3.1"]
+QUALITY_REQUIRE = ["black~=22.0", "flake8>=3.8.3", "isort>=5.0.0", "pyyaml>=5.3.1"]
 
 
 EXTRAS_REQUIRE = {

diff --git a/src/datasets/arrow_reader.py b/src/datasets/arrow_reader.py
@@ -43,7 +43,7 @@
 HF_GCP_BASE_URL = "https://storage.googleapis.com/huggingface-nlp/cache/datasets"
 
 _SUB_SPEC_RE = re.compile(
-    fr"""
+    rf"""
 ^
  (?P<split>{_split_re[1:-1]})
  (\[

diff --git a/src/datasets/utils/py_utils.py b/src/datasets/utils/py_utils.py
@@ -71,7 +71,7 @@ def size_str(size_in_bytes):
     if not size_in_bytes:
         return "Unknown size"
 
-    _NAME_LIST = [("PiB", 2 ** 50), ("TiB", 2 ** 40), ("GiB", 2 ** 30), ("MiB", 2 ** 20), ("KiB", 2 ** 10)]
+    _NAME_LIST = [("PiB", 2**50), ("TiB", 2**40), ("GiB", 2**30), ("MiB", 2**20), ("KiB", 2**10)]
 
     size_in_bytes = float(size_in_bytes)
     for (name, size_bytes) in _NAME_LIST:
@@ -634,6 +634,5 @@ def _save_regex(pickler, obj):
         dill._dill.log.info("# Re")
         return
 
-
 except ImportError:
     pass
diff --git a/tests/test_info_utils.py b/tests/test_info_utils.py
@@ -4,8 +4,8 @@
 from datasets.utils.info_utils import is_small_dataset
 
 
-@pytest.mark.parametrize("dataset_size", [None, 400 * 2 ** 20, 600 * 2 ** 20])
-@pytest.mark.parametrize("input_in_memory_max_size", ["default", 0, 100 * 2 ** 20, 900 * 2 ** 20])
+@pytest.mark.parametrize("dataset_size", [None, 400 * 2**20, 600 * 2**20])
+@pytest.mark.parametrize("input_in_memory_max_size", ["default", 0, 100 * 2**20, 900 * 2**20])
 def test_is_small_dataset(dataset_size, input_in_memory_max_size, monkeypatch):
     if input_in_memory_max_size != "default":
         monkeypatch.setattr(datasets.config, "IN_MEMORY_MAX_SIZE", input_in_memory_max_size)

diff --git a/tests/test_load.py b/tests/test_load.py
@@ -489,7 +489,7 @@ def test_load_dataset_local(dataset_loading_script_dir, data_dir, keep_in_memory
     with pytest.raises(FileNotFoundError) as exc_info:
         datasets.load_dataset(SAMPLE_DATASET_NAME_THAT_DOESNT_EXIST)
     m_combined_path = re.search(
-        fr"http\S*{re.escape(SAMPLE_DATASET_NAME_THAT_DOESNT_EXIST + '/' + SAMPLE_DATASET_NAME_THAT_DOESNT_EXIST + '.py')}\b",
+        rf"http\S*{re.escape(SAMPLE_DATASET_NAME_THAT_DOESNT_EXIST + '/' + SAMPLE_DATASET_NAME_THAT_DOESNT_EXIST + '.py')}\b",
         str(exc_info.value),
     )
     assert m_combined_path is not None and is_remote_url(m_combined_path.group())
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,7 +188,7 @@ @@
             ]
         )
-    QUALITY_REQUIRE = ["black==21.4b0", "flake8>=3.8.3", "isort>=5.0.0", "pyyaml>=5.3.1"]
+    QUALITY_REQUIRE = ["black~=22.0", "flake8>=3.8.3", "isort>=5.0.0", "pyyaml>=5.3.1"]
     EXTRAS_REQUIRE = {
@@ Expand Down @@