Merge pull request #3652 from plotly/black22

switch to black .22

Author: nicolaskruchten

.circleci/config.yml

@@ -87,7 +87,7 @@ jobs:
       - checkout
       - run:
           name: Install black
-          command: "sudo pip install black==19.10b0"
+          command: "sudo pip install black==22.3.0"
       - run:
           name: Check formatting with black
           command: "black --check ."
@@ -385,7 +385,6 @@ jobs:
           destination: doc/apidoc/_build/
 
 workflows:
-
   code_formatting:
     jobs:
       - check-code-formatting

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
--   repo: https://github.com/ambv/black
-    rev: 19.10b0
+  - repo: https://github.com/ambv/black
+    rev: 22.3.0
     hooks:
-    - id: black
-      language_version: python
+      - id: black
+        language_version: python

packages/python/chart-studio/chart_studio/grid_objs/grid_objs.py

@@ -269,7 +269,7 @@ def _to_plotly_grid_json(self):
         return grid_json
 
     def get_column(self, column_name):
-        """ Return the first column with name `column_name`.
+        """Return the first column with name `column_name`.
         If no column with `column_name` exists in this grid, return None.
         """
         for column in self._columns:

packages/python/chart-studio/chart_studio/plotly/chunked_requests/chunked_request.py

@@ -19,7 +19,7 @@ def __init__(
         ssl_enabled=False,
         ssl_verification_enabled=True,
     ):
-        """ Initialize a stream object and an HTTP or HTTPS connection
+        """Initialize a stream object and an HTTP or HTTPS connection
         with chunked Transfer-Encoding to server:port with optional headers.
         """
         self.maxtries = 5
@@ -35,7 +35,7 @@ def __init__(
         self._connect()
 
     def write(self, data, reconnect_on=("", 200, 502)):
-        """ Send `data` to the server in chunk-encoded form.
+        """Send `data` to the server in chunk-encoded form.
         Check the connection before writing and reconnect
         if disconnected and if the response status code is in `reconnect_on`.
 
@@ -140,7 +140,7 @@ def _get_ssl_context(self):
         return context
 
     def _connect(self):
-        """ Initialize an HTTP/HTTPS connection with chunked Transfer-Encoding
+        """Initialize an HTTP/HTTPS connection with chunked Transfer-Encoding
         to server:port with optional headers.
         """
         server = self._server
@@ -184,7 +184,7 @@ def _connect(self):
         time.sleep(0.5)
 
     def close(self):
-        """ Close the connection to server.
+        """Close the connection to server.
 
         If available, return a http_client.HTTPResponse object.
 
@@ -206,7 +206,7 @@ def close(self):
         return self._getresponse()
 
     def _getresponse(self):
-        """ Read from recv and return a HTTPResponse object if possible.
+        """Read from recv and return a HTTPResponse object if possible.
         Either
         1 - The client has succesfully closed the connection: Return ''
         2 - The server has already closed the connection: Return the response
@@ -244,7 +244,7 @@ def _getresponse(self):
         return response
 
     def _isconnected(self):
-        """ Return True if the socket is still connected
+        """Return True if the socket is still connected
         to the server, False otherwise.
 
         This check is done in 3 steps:
@@ -314,7 +314,7 @@ def _isconnected(self):
                 raise e
 
     def _reconnect(self):
-        """ Connect if disconnected.
+        """Connect if disconnected.
         Retry self.maxtries times with delays
         """
         if not self._isconnected():
@@ -340,8 +340,7 @@ def _reconnect(self):
         self._closed = False
 
     def _reset_retries(self):
-        """ Reset the connect counters and delays
-        """
+        """Reset the connect counters and delays"""
         self._tries = 0
         self._delay = 1
 

packages/python/chart-studio/chart_studio/session.py

@@ -142,7 +142,7 @@ def update_session_plot_options(**kwargs):
 
 
 def get_session_plot_options():
-    """ Returns a copy of the user supplied plot options.
+    """Returns a copy of the user supplied plot options.
     Use `update_plot_options()` to change.
     """
     return copy.deepcopy(_session["plot_options"])

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_image/test_image.py

@@ -54,7 +54,12 @@ def test_image_save_as_saves_valid_image(
     data = setup_image
     f, filename = tempfile.mkstemp(".{}".format(image_format))
     py.image.save_as(
-        data, filename, format=image_format, width=width, height=height, scale=scale,
+        data,
+        filename,
+        format=image_format,
+        width=width,
+        height=height,
+        scale=scale,
     )
     if image_format in ["png", "jpeg"]:
         assert imghdr.what(filename) == image_format

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_plotly/test_plot.py

@@ -319,7 +319,7 @@ def test(self):
 
 
 def generate_conflicting_plot_options_with_json_writes_of_config():
-    """ if the user wrote their own options in the config file,
+    """if the user wrote their own options in the config file,
     then we'll raise the error when the call plot or iplot through
     _plot_option_logic
     """
@@ -346,7 +346,7 @@ def test(self):
 
 
 def generate_private_sharing_and_public_world_readable_precedence():
-    """ Test that call signature arguments applied through _plot_option_logic
+    """Test that call signature arguments applied through _plot_option_logic
     overwrite options supplied through py.sign_in which overwrite options
     set through tls.set_config
     """

packages/python/chart-studio/chart_studio/tests/utils.py

@@ -25,7 +25,7 @@ def setUp(self):
         self.stash_files()
         defaults = dict(
             files.FILE_CONTENT[files.CREDENTIALS_FILE],
-            **files.FILE_CONTENT[files.CONFIG_FILE]
+            **files.FILE_CONTENT[files.CONFIG_FILE],
         )
         session.sign_in(**defaults)
 

packages/python/plotly/_plotly_utils/basevalidators.py

@@ -429,7 +429,7 @@ def __init__(
         values,
         array_ok=False,
         coerce_number=False,
-        **kwargs
+        **kwargs,
     ):
         super(EnumeratedValidator, self).__init__(
             plotly_name=plotly_name, parent_name=parent_name, **kwargs
@@ -967,7 +967,7 @@ def __init__(
         strict=False,
         array_ok=False,
         values=None,
-        **kwargs
+        **kwargs,
     ):
         super(StringValidator, self).__init__(
             plotly_name=plotly_name, parent_name=parent_name, **kwargs
@@ -1406,7 +1406,7 @@ def find_invalid_els(self, orig, validated, invalid_els=None):
         return invalid_els
 
     def vc_scalar(self, v):
-        """ Helper to validate/coerce a scalar color """
+        """Helper to validate/coerce a scalar color"""
         return ColorValidator.perform_validate_coerce(
             v, allow_number=self.numbers_allowed()
         )
@@ -1956,7 +1956,7 @@ def __init__(
         items,
         free_length=None,
         dimensions=None,
-        **kwargs
+        **kwargs,
     ):
         super(InfoArrayValidator, self).__init__(
             plotly_name=plotly_name, parent_name=parent_name, **kwargs
@@ -2711,7 +2711,7 @@ def __init__(self, plotly_name, parent_name, data_class_str, data_docs, **kwargs
             parent_name=parent_name,
             data_class_str=data_class_str,
             data_docs=data_docs,
-            **kwargs
+            **kwargs,
         )
 
     def description(self):

packages/python/plotly/_plotly_utils/png.py

@@ -375,7 +375,7 @@ def __init__(
         planes=None,
         colormap=None,
         maxval=None,
-        chunk_limit=2 ** 20,
+        chunk_limit=2**20,
         x_pixels_per_unit=None,
         y_pixels_per_unit=None,
         unit_is_meter=False,
@@ -544,7 +544,7 @@ def __init__(
         if width <= 0 or height <= 0:
             raise ProtocolError("width and height must be greater than zero")
         # http://www.w3.org/TR/PNG/#7Integers-and-byte-order
-        if width > 2 ** 31 - 1 or height > 2 ** 31 - 1:
+        if width > 2**31 - 1 or height > 2**31 - 1:
             raise ProtocolError("width and height cannot exceed 2**31-1")
 
         if alpha and transparent is not None:
@@ -918,7 +918,7 @@ def write_chunk(outfile, tag, data=b""):
     outfile.write(data)
     checksum = zlib.crc32(tag)
     checksum = zlib.crc32(data, checksum)
-    checksum &= 2 ** 32 - 1
+    checksum &= 2**32 - 1
     outfile.write(struct.pack("!I", checksum))
 
 
@@ -1548,7 +1548,7 @@ def _bytes_to_values(self, bs, width=None):
         # Samples per byte
         spb = 8 // self.bitdepth
         out = bytearray()
-        mask = 2 ** self.bitdepth - 1
+        mask = 2**self.bitdepth - 1
         shifts = [self.bitdepth * i for i in reversed(list(range(spb)))]
         for o in bs:
             out.extend([mask & (o >> i) for i in shifts])
@@ -1632,7 +1632,7 @@ def _chunk_len_type(self):
         if len(x) != 8:
             raise FormatError("End of file whilst reading chunk length and type.")
         length, type = struct.unpack("!I4s", x)
-        if length > 2 ** 31 - 1:
+        if length > 2**31 - 1:
             raise FormatError("Chunk %s is too large: %d." % (type, length))
         # Check that all bytes are in valid ASCII range.
         # https://www.w3.org/TR/2003/REC-PNG-20031110/#5Chunk-layout
@@ -1722,7 +1722,7 @@ def _process_PLTE(self, data):
         self.plte = data
         if len(data) % 3 != 0:
             raise FormatError("PLTE chunk's length should be a multiple of 3.")
-        if len(data) > (2 ** self.bitdepth) * 3:
+        if len(data) > (2**self.bitdepth) * 3:
             raise FormatError("PLTE chunk is too long.")
         if len(data) == 0:
             raise FormatError("Empty PLTE is not allowed.")
@@ -2014,7 +2014,7 @@ def _as_rescale(self, get, targetbitdepth):
 
         width, height, pixels, info = get()
         maxval = 2 ** info["bitdepth"] - 1
-        targetmaxval = 2 ** targetbitdepth - 1
+        targetmaxval = 2**targetbitdepth - 1
         factor = float(targetmaxval) / float(maxval)
         info["bitdepth"] = targetbitdepth