earthengine-api 1.6.11__py3-none-any.whl → 1.6.12__py3-none-any.whl

ee/ee_string.py

@@ -37,19 +37,19 @@ class String(computedobject.ComputedObject):
     if isinstance(string, str):
       super().__init__(None, None)
       self._string = string
-
     elif isinstance(string, computedobject.ComputedObject):
       if self.is_func_returning_same(string):
         # If it's a call that's already returning a String, just cast.
         super().__init__(string.func, string.args, string.varName)
       else:
+        # Wrap some other ComputedObject.
         super().__init__(
             apifunction.ApiFunction(self.name()), {'input': string}
         )
       self._string = None
     else:
       raise ee_exception.EEException(
-          'Invalid argument specified for ee.String(): %s' % string)
+          f'Invalid argument specified for ee.String(): {string}')
 
   @classmethod
   def initialize(cls) -> None:
@@ -91,8 +91,7 @@ class String(computedobject.ComputedObject):
     Returns:
       Returns the result of joining self and string2.
     """
-
-    return apifunction.ApiFunction.call_(self.name() + '.cat', self, string2)
+    return apifunction.ApiFunction.call_(f'{self.name()}.cat', self, string2)
 
   def compareTo(self, string2: _arg_types.String) -> ee_number.Number:
     """Compares two strings lexicographically.
@@ -107,15 +106,15 @@ class String(computedobject.ComputedObject):
     """
 
     return apifunction.ApiFunction.call_(
-        self.name() + '.compareTo', self, string2
+        f'{self.name()}.compareTo', self, string2
     )
 
   def decodeJSON(self) -> computedobject.ComputedObject:
     """Decodes self as a JSON string."""
-
-    return apifunction.ApiFunction.call_(self.name() + '.decodeJSON', self)
+    return apifunction.ApiFunction.call_(f'{self.name()}.decodeJSON', self)
 
   @staticmethod
+  # pylint: disable=redefined-builtin
   def encodeJSON(object: _arg_types.Any) -> String:
     """Returns an ee.String with an object encoded as JSON.
 
@@ -124,7 +123,7 @@ class String(computedobject.ComputedObject):
     Args:
       object: The object to encode.
     """
-
+    # object is probably not an ee.String, so use "String." instead of object.
     return apifunction.ApiFunction.call_('String.encodeJSON', object)
 
   def equals(self, target: _arg_types.String) -> computedobject.ComputedObject:
@@ -137,8 +136,7 @@ class String(computedobject.ComputedObject):
       True if the target is a string and is lexicographically equal to the
       reference, or false otherwise.
     """
-
-    return apifunction.ApiFunction.call_(self.name() + '.equals', self, target)
+    return apifunction.ApiFunction.call_(f'{self.name()}.equals', self, target)
 
   def index(self, pattern: _arg_types.String) -> ee_number.Number:
     """Searches a string for the first occurrence of a substring.
@@ -149,13 +147,11 @@ class String(computedobject.ComputedObject):
     Returns:
       The index of the first match, or -1.
     """
-
-    return apifunction.ApiFunction.call_(self.name() + '.index', self, pattern)
+    return apifunction.ApiFunction.call_(f'{self.name()}.index', self, pattern)
 
   def length(self) -> ee_number.Number:
     """Returns the length of a string."""
-
-    return apifunction.ApiFunction.call_(self.name() + '.length', self)
+    return apifunction.ApiFunction.call_(f'{self.name()}.length', self)
 
   def match(
       self, regex: _arg_types.String, flags: _arg_types.String | None = None
@@ -172,7 +168,7 @@ class String(computedobject.ComputedObject):
     """
 
     return apifunction.ApiFunction.call_(
-        self.name() + '.match', self, regex, flags
+        f'{self.name()}.match', self, regex, flags
     )
 
   def replace(
@@ -194,7 +190,7 @@ class String(computedobject.ComputedObject):
     """
 
     return apifunction.ApiFunction.call_(
-        self.name() + '.replace', self, regex, replacement, flags
+        f'{self.name()}.replace', self, regex, replacement, flags
     )
 
   def rindex(self, pattern: _arg_types.String) -> ee_number.Number:
@@ -206,8 +202,7 @@ class String(computedobject.ComputedObject):
     Returns:
       The index of the first match or -1 if no match.
     """
-
-    return apifunction.ApiFunction.call_(self.name() + '.rindex', self, pattern)
+    return apifunction.ApiFunction.call_(f'{self.name()}.rindex', self, pattern)
 
   def slice(
       self, start: _arg_types.Integer, end: _arg_types.Integer | None = None
@@ -228,7 +223,7 @@ class String(computedobject.ComputedObject):
     """
 
     return apifunction.ApiFunction.call_(
-        self.name() + '.slice', self, start, end
+        f'{self.name()}.slice', self, start, end
     )
 
   def split(
@@ -246,20 +241,17 @@ class String(computedobject.ComputedObject):
     """
 
     return apifunction.ApiFunction.call_(
-        self.name() + '.split', self, regex, flags
+        f'{self.name()}.split', self, regex, flags
     )
 
   def toLowerCase(self) -> String:
     """Converts all of the characters in a string to lower case."""
-
-    return apifunction.ApiFunction.call_(self.name() + '.toLowerCase', self)
+    return apifunction.ApiFunction.call_(f'{self.name()}.toLowerCase', self)
 
   def toUpperCase(self) -> String:
     """Converts all of the characters in a string to upper case."""
-
-    return apifunction.ApiFunction.call_(self.name() + '.toUpperCase', self)
+    return apifunction.ApiFunction.call_(f'{self.name()}.toUpperCase', self)
 
   def trim(self) -> String:
     """Returns a string with any leading and trailing whitespace removed."""
-
-    return apifunction.ApiFunction.call_(self.name() + '.trim', self)
+    return apifunction.ApiFunction.call_(f'{self.name()}.trim', self)

ee/ee_types.py

@@ -9,7 +9,7 @@ from typing import Any
 from ee import computedobject
 
 
-# A dictionary of the classes in the ee module.  Set by registerClasses.
+# A dictionary of the classes in the ee module. Set by registerClasses.
 _registered_classes = {}
 
 
@@ -48,7 +48,7 @@ def classToName(a_class: type[Any]) -> str:
 
 # TODO(user): Any -> Optional[type[Any]].
 def nameToClass(name: str) -> Any:
-  """Converts a class name to a class.  Returns None if not an ee class.
+  """Converts a class name to a class. Returns None if not an ee class.
 
   Args:
     name: The class name.

ee/element.py

@@ -187,7 +187,7 @@ class Element(computedobject.ComputedObject):
     """Returns properties from a feature as a dictionary.
 
     Args:
-      properties: The list of properties to extract.  Defaults to all non-system
+      properties: The list of properties to extract. Defaults to all non-system
         properties
     """
 

ee/featurecollection.py

@@ -22,7 +22,7 @@ from ee import geometry
 from ee import image
 
 
-class FeatureCollection(collection.Collection):
+class FeatureCollection(collection.Collection[feature.Feature]):
   """A representation of a FeatureCollection."""
 
   _initialized = False
@@ -47,10 +47,13 @@ class FeatureCollection(collection.Collection):
     """Constructs a collection features.
 
     Args:
-      args: constructor argument.  One of: 1) A string - assumed to be the name
-        of a collection. 2) A geometry. 3) A feature. 4) An array of features.
-        5) A GeoJSON FeatureCollection. 6) A computed object - reinterpreted as
-        a collection.
+      args: constructor argument. One of:
+        1) A string - assumed to be the name of a collection.
+        2) A geometry.
+        3) A feature.
+        4) An array of features.
+        5) A GeoJSON FeatureCollection.
+        6) A computed object - reinterpreted as a collection.
       column: The name of the geometry column to use. Only useful with the
         string constructor.
 
@@ -187,9 +190,9 @@ class FeatureCollection(collection.Collection):
       propertySelectors: An array of names or regexes specifying the properties
           to select.
       newProperties: An array of strings specifying the new names for the
-          selected properties.  If supplied, the length must match the number
+          selected properties. If supplied, the length must match the number
           of properties selected.
-      retainGeometry: A boolean.  When false, the result will have no geometry.
+      retainGeometry: A boolean. When false, the result will have no geometry.
       *args: Selector elements as varargs.
 
     Returns:

ee/filter.py

@@ -108,7 +108,7 @@ class Filter(computedobject.ComputedObject):
     These are implicitly ANDed.
 
     Args:
-      new_filter: The filter to append to this one.  Possible types are:
+      new_filter: The filter to append to this one. Possible types are:
           1) another fully constructed Filter,
           2) a JSON representation of a filter,
           3) an array of 1 or 2.
@@ -141,7 +141,7 @@ class Filter(computedobject.ComputedObject):
     Returns:
       The new filter.
 
-    Deprecated.  Use ee.Filter.eq(), ee.Filter.gte(), etc.'
+    Deprecated. Use ee.Filter.eq(), ee.Filter.gte(), etc.'
     """
     operator = operator.lower()
 

ee/geometry.py

@@ -2,8 +2,7 @@
 
 from __future__ import annotations
 
-import collections.abc
-from collections.abc import Sequence
+from collections.abc import Iterable, Sequence
 import json
 import math
 from typing import Any
@@ -79,7 +78,7 @@ class Geometry(computedobject.ComputedObject):
       if options:
         raise ee_exception.EEException(
             'Setting the CRS or geodesic on a computed Geometry is not '
-            'supported.  Use Geometry.transform().')
+            'supported. Use Geometry.transform().')
       else:
         super().__init__(geo_json.func, geo_json.args, geo_json.varName)
         return
@@ -157,7 +156,7 @@ class Geometry(computedobject.ComputedObject):
         if isinstance(name, str):
           return name
     raise ee_exception.EEException(
-        'Invalid CRS declaration in GeoJSON: ' + json.dumps(crs)
+        f'Invalid CRS declaration in GeoJSON: {json.dumps(crs)}'
     )
 
   @classmethod
@@ -342,12 +341,12 @@ class Geometry(computedobject.ComputedObject):
     # negated, we also reject NaN.
     if not south <= 90:
       raise ee_exception.EEException(
-          'Geometry.BBox: south must be at most +90°, but was {}°'.format(
-              south))
+          f'Geometry.BBox: south must be at most +90°, but was {south}°'
+      )
     if not north >= -90:
       raise ee_exception.EEException(
-          'Geometry.BBox: north must be at least -90°, but was {}°'.format(
-              north))
+          f'Geometry.BBox: north must be at least -90°, but was {north}°'
+      )
     # On the other hand, allow a box whose extent lies past the pole, but
     # canonicalize it to being exactly the pole.
     south = max(south, -90)
@@ -402,7 +401,7 @@ class Geometry(computedobject.ComputedObject):
     """Constructs an ee.Geometry describing a LineString.
 
     Args:
-      coords: A list of at least two points.  May be a list of coordinates in
+      coords: A list of at least two points. May be a list of coordinates in
           the GeoJSON 'LineString' format, a list of at least two ee.Geometry
           objects describing a point, or a list of at least four numbers
           defining the [x,y] coordinates of at least two points.
@@ -477,7 +476,7 @@ class Geometry(computedobject.ComputedObject):
     """Constructs an ee.Geometry describing a MultiLineString.
 
     Create a GeoJSON MultiLineString from either a list of points, or an array
-    of lines (each an array of Points).  If a list of points is specified,
+    of lines (each an array of Points). If a list of points is specified,
     only a single line is created.
 
     Args:
@@ -647,12 +646,12 @@ class Geometry(computedobject.ComputedObject):
       )
     return json.dumps(self.toGeoJSON())
 
-  def serialize(self, for_cloud_api=True):
+  def serialize(self, for_cloud_api: bool = True) -> str:
     """Returns the serialized representation of this object."""
     return serializer.toJSON(self, for_cloud_api=for_cloud_api)
 
   def __str__(self) -> str:
-    return 'ee.Geometry(%s)' % serializer.toReadableJSON(self)
+    return f'ee.Geometry({serializer.toReadableJSON(self)})'
 
   def __repr__(self) -> str:
     return self.__str__()
@@ -702,10 +701,10 @@ class Geometry(computedobject.ComputedObject):
     Returns:
       The number of nested arrays or -1 on error.
     """
-    if not isinstance(shape, collections.abc.Iterable):
+    if not isinstance(shape, Iterable):
       return -1
 
-    if (shape and isinstance(shape[0], collections.abc.Iterable) and
+    if (shape and isinstance(shape[0], Iterable) and
         not isinstance(shape[0], str)):
       count = Geometry._isValidCoordinates(shape[0])
       # If more than 1 ring or polygon, they should have the same nesting.
@@ -730,7 +729,7 @@ class Geometry(computedobject.ComputedObject):
     """Create a line from a list of points.
 
     Args:
-      coordinates: The points to convert.  Must be list of numbers of
+      coordinates: The points to convert. Must be list of numbers of
           even length, in the format [x1, y1, x2, y2, ...]
 
     Returns:
@@ -742,13 +741,13 @@ class Geometry(computedobject.ComputedObject):
       return coordinates
     if len(coordinates) % 2 != 0:
       raise ee_exception.EEException(
-          'Invalid number of coordinates: %s' % len(coordinates))
+          f'Invalid number of coordinates: {len(coordinates)}'
+      )
 
-    line = []
-    for i in range(0, len(coordinates), 2):
-      pt = [coordinates[i], coordinates[i + 1]]
-      line.append(pt)
-    return line
+    return [
+        [coordinates[i], coordinates[i + 1]]
+        for i in range(0, len(coordinates), 2)
+    ]
 
   @staticmethod
   def _parseArgs(ctor_name: str, depth: int, args: Any) -> dict[str, Any]:

ee/image.py

@@ -430,8 +430,7 @@ class Image(element.Element):
       # pylint: enable=protected-access
       return band_image
 
-    if params['format'] == 'ZIPPED_GEO_TIFF_PER_BAND' and params.get(
-        'bands') and len(params.get('bands')):
+    if params['format'] == 'ZIPPED_GEO_TIFF_PER_BAND' and params.get('bands'):
       # Build a new image based on the constituent band images.
       image = Image.combine_(
           [_build_image_per_band(band) for band in params['bands']])
@@ -3579,7 +3578,6 @@ class Image(element.Element):
       # pylint: enable=invalid-name
       **kwargs,
   ) -> Image:
-    # pylint: disable=g-doc-args
     """Returns an image with the values of a band remapped.
 
     Maps from input values to output values, represented by two parallel lists.
@@ -3589,24 +3587,21 @@ class Image(element.Element):
     floating point precision errors.
 
     Args:
-      from: The source values (numbers or ee.Array). All values in this list
+      from_: The source values (numbers or ee.Array). All values in this list
         will be mapped to the corresponding value in 'to'.
       to: The destination values (numbers or ee.Array). These are used to
         replace the corresponding values in 'from'. Must have the same number of
-        values as 'from'.
+        values as 'from_'.
       defaultValue: The default value to replace values that weren't matched by
-        a value in 'from'. If not specified, unmatched values are masked out.
+        a value in 'from_'. If not specified, unmatched values are masked out.
       bandName: The name of the band to remap. If not specified, the first band
         in the image is used.
     """
-    # pylint: enable=g-doc-args
 
+    if 'from' in kwargs:
+      from_ = kwargs.pop('from')
     if kwargs:
-      if kwargs.keys() != {'from'}:
-        raise TypeError(
-            f'Unexpected arguments: {list(kwargs.keys())}. Expected: from.'
-        )
-      from_ = kwargs['from']
+      raise TypeError(f'remap() got unexpected keyword arguments: {list(kwargs)}')
 
     if not from_:
       raise TypeError('from is required.')

ee/imagecollection.py

@@ -20,7 +20,7 @@ from ee import image
 REDUCE_PREFIX = 'reduce'
 
 
-class ImageCollection(collection.Collection):
+class ImageCollection(collection.Collection[image.Image]):
   """Representation for an Earth Engine ImageCollection."""
 
   _initialized = False
@@ -114,7 +114,7 @@ class ImageCollection(collection.Collection):
       selectors: An array of names, regexes or numeric indices specifying the
         bands to select.
       names: An array of strings specifying the new names for the selected
-        bands.  If supplied, the length must match the number of bands selected.
+        bands. If supplied, the length must match the number of bands selected.
       *args: Selector elements as varargs.
 
     Returns:
@@ -194,7 +194,7 @@ class ImageCollection(collection.Collection):
     """Get the URL for an animated video thumbnail of the given collection.
 
     Note: Videos can only be created when the image visualization
-    creates an RGB or RGBA image.  This can be done by mapping a visualization
+    creates an RGB or RGBA image. This can be done by mapping a visualization
     onto the collection or specifying three bands in the params.
 
     Args:

ee/mapclient.py

@@ -8,7 +8,7 @@ This currently has several spots that are hard-coded for 256x256 tiles, even
 though MapOverlay tries to track this.
 
 Supports mouse-based pan and zoom as well as tile upsampling while waiting
-for new tiles to load.  The map to display is specified by a MapOverlay, and
+for new tiles to load. The map to display is specified by a MapOverlay, and
 added to the GUI on creation or manually using addOverlay()
   gui = MapClient(MakeOverlay(mapid))
 
@@ -35,7 +35,7 @@ import urllib.request
 from PIL import Image
 from PIL import ImageTk
 
-# The default URL to fetch tiles from.  We could pull this from the EE library,
+# The default URL to fetch tiles from. We could pull this from the EE library,
 # however this doesn't have any other dependencies on that yet, so let's not.
 BASE_URL = 'https://earthengine.googleapis.com'
 
@@ -52,7 +52,7 @@ class MapClient(threading.Thread):
     """Initialize the MapClient UI.
 
     Args:
-      opt_overlay: A mapoverlay to display.  If not specified, the default
+      opt_overlay: A mapoverlay to display. If not specified, the default
          Google Maps basemap is used.
       opt_width: The default width of the frame to construct.
       opt_height: The default height of the frame to construct.
@@ -178,7 +178,7 @@ class MapClient(threading.Thread):
       image: The image tile to display.
       key: A tuple containing the key of the image (level, x, y)
       overlay: The overlay this tile belongs to.
-      layer: The layer number this overlay corresponds to.  Only used
+      layer: The layer number this overlay corresponds to. Only used
           for caching purposes.
     """
     # TODO(user): This function is called from multiple threads, and
@@ -205,7 +205,7 @@ class MapClient(threading.Thread):
 
     Args:
       event: The event that caused this zoom request.
-      direction: The direction to zoom.  +1 for higher zoom, -1 for lower.
+      direction: The direction to zoom. +1 for higher zoom, -1 for lower.
     """
     if self.level + direction >= 0:
       # Discard everything cached in the MapClient, and flush the fetch queues.
@@ -319,13 +319,13 @@ class MapOverlay:
     """Get the requested tile.
 
     If the requested tile is already cached, it's returned (sent to the
-    callback) directly.  If it's not cached, a check is made to see if
+    callback) directly. If it's not cached, a check is made to see if
     a lower-res version is cached, and if so that's interpolated up, before
     a request for the actual tile is made.
 
     Args:
       key: The key of the tile to fetch.
-      callback: The callback to call when the tile is available.  The callback
+      callback: The callback to call when the tile is available. The callback
           may be called more than once if a low-res version is available.
     """
     result = self.GetCachedTile(key)
@@ -456,12 +456,12 @@ def addToMap(eeobject, vis_params=None, *args):
 
   Args:
       eeobject: the object to add to the map.
-      vis_params: a dictionary of visualization parameters.  See
+      vis_params: a dictionary of visualization parameters. See
           ee.data.getMapId().
       *args: unused arguments, left for compatibility with the JS API.
 
   This call exists to be an equivalent to the playground addToMap() call.
-  It uses a global MapInstance to hang on to "the map".  If the MapInstance
+  It uses a global MapInstance to hang on to "the map". If the MapInstance
   isn't initialized, this creates a new one.
   """
   del args  # Unused.

ee/oauth.py

@@ -185,7 +185,7 @@ def request_token(
         urllib.parse.urlencode(request_args).encode()).read().decode()
   except urllib.error.HTTPError as e:
     # pylint:disable=broad-exception-raised,raise-missing-from
-    raise Exception('Problem requesting tokens. Please try again.  %s %s' %
+    raise Exception('Problem requesting tokens. Please try again. %s %s' %
                     (e, e.read()))
     # pylint:enable=broad-exception-raised,raise-missing-from
 
@@ -352,7 +352,7 @@ def _nonce_table(*nonce_keys: str) -> dict[str, str]:
     table[key] = _base64param(os.urandom(32))
     if key.endswith('_verifier'):
       # Generate a challenge that the server will use to ensure that requests
-      # only work with our verifiers.  https://tools.ietf.org/html/rfc7636
+      # only work with our verifiers. https://tools.ietf.org/html/rfc7636
       pkce_challenge = _base64param(hashlib.sha256(table[key]).digest())
       table[key.replace('_verifier', '_challenge')] = pkce_challenge
   return {k: v.decode() for k, v in table.items()}
@@ -445,7 +445,7 @@ def _start_server(port: int):
       self.end_headers()
       self.wfile.write(
           b'\n\nGoogle Earth Engine authorization successful!\n\n\n'
-          b'Credentials have been retrieved.  Please close this window.\n\n'
+          b'Credentials have been retrieved. Please close this window.\n\n'
           b'  \xf0\x9f\x8c\x8d  \xe2\x9a\x99\xef\xb8\x8f  \xf0\x9f\x8c\x8f'
           b'  \xe2\x9a\x99\xef\xb8\x8f  \xf0\x9f\x8c\x8e ')  # Earth emoji
 
@@ -479,14 +479,14 @@ def authenticate(
   """Prompts the user to authorize access to Earth Engine via OAuth2.
 
   Args:
-    cli_authorization_code: An optional authorization code.  Supports CLI mode,
+    cli_authorization_code: An optional authorization code. Supports CLI mode,
       where the code is passed as an argument to `earthengine authenticate`.
     quiet: If true, do not require interactive prompts and force --no-browser
       mode for gcloud-legacy. If false, never supply --no-browser. Default is
       None, which autodetects the --no-browser setting.
-    cli_code_verifier: PKCE verifier to prevent auth code stealing.  Must be
+    cli_code_verifier: PKCE verifier to prevent auth code stealing. Must be
       provided if cli_authorization_code is given.
-    auth_mode: The authorization mode.  One of:
+    auth_mode: The authorization mode. One of:
         "colab" - use the Colab authentication flow.
         "notebook" - send user to notebook authenticator page. Intended for
           web users who do not run code locally. Credentials expire in 7 days.
@@ -514,6 +514,13 @@ def authenticate(
      Exception: on invalid arguments.
   """
 
+  if auth_mode == 'colab' and scopes is not None and set(scopes) != set(SCOPES):
+    raise ee_exception.EEException(
+        'Scopes cannot be customized when auth_mode is "colab". Please see'
+        ' https://developers.google.com/earth-engine/guides/auth#quick_reference_guide_and_table'
+        ' for more information.'
+    )
+
   if cli_authorization_code:
     _obtain_and_write_token(cli_authorization_code, cli_code_verifier, scopes)
     return

ee/tests/_cloud_api_utils_test.py

@@ -550,6 +550,22 @@ class CloudApiUtilsTest(unittest.TestCase):
         expected,
         _cloud_api_utils.convert_sources_to_one_platform_sources(old_sources))
 
+  def test_convert_to_operation_state(self):
+    def convert(state):
+      return _cloud_api_utils.convert_to_operation_state(state)
+
+    self.assertEqual('CANCELLED', convert('CANCELLED'))
+    self.assertEqual('CANCELLING', convert('CANCEL_REQUESTED'))
+    self.assertEqual('CANCELLING', convert('CANCELLING'))
+    self.assertEqual('FAILED', convert('FAILED'))
+    self.assertEqual('PENDING', convert('PENDING'))
+    self.assertEqual('PENDING', convert('READY'))
+    self.assertEqual('RUNNING', convert('RUNNING'))
+    self.assertEqual('SUCCEEDED', convert('COMPLETED'))
+    self.assertEqual('SUCCEEDED', convert('SUCCEEDED'))
+    self.assertEqual('UNKNOWN', convert('random_string'))
+    self.assertEqual('UNKNOWN', convert('UNKNOWN'))
+
 
 if __name__ == '__main__':
   unittest.main()

ee/tests/_helpers_test.py

@@ -23,19 +23,19 @@ from ee import oauth
 
 class ServiceAccountCredentialsTest(unittest.TestCase):
 
-  def testNoArgs(self):
+  def test_no_args(self):
     with self.assertRaisesRegex(ValueError, 'At least one of'):
       ee.ServiceAccountCredentials()
 
   @mock.patch('google.oauth2.service_account.Credentials')
-  def testJsonFile(self, mock_credentials):
+  def test_json_file(self, mock_credentials):
     ee.ServiceAccountCredentials(key_file='foo.json')
     mock_credentials.from_service_account_file.assert_called_with(
         'foo.json', scopes=oauth.SCOPES
     )
 
   @mock.patch('google.oauth2.service_account.Credentials')
-  def testJsonKeyData(self, mock_credentials):
+  def test_json_key_data(self, mock_credentials):
     key_data = {'client_email': 'foo@bar.com'}
     ee.ServiceAccountCredentials(key_data=json.dumps(key_data))
     mock_credentials.from_service_account_info.assert_called_with(
@@ -44,7 +44,7 @@ class ServiceAccountCredentialsTest(unittest.TestCase):
 
   @mock.patch('google.auth.crypt.RSASigner')
   @mock.patch('google.oauth2.service_account.Credentials')
-  def testPemKeyData(self, mock_credentials, mock_signer):
+  def test_pem_key_data(self, mock_credentials, mock_signer):
     ee.ServiceAccountCredentials(email='foo@bar.com', key_data='pem_key_data')
     mock_signer.from_string.assert_called_with('pem_key_data')
     self.assertEqual(
@@ -53,7 +53,7 @@ class ServiceAccountCredentialsTest(unittest.TestCase):
 
   @mock.patch('google.auth.crypt.RSASigner')
   @mock.patch('google.oauth2.service_account.Credentials')
-  def testPemFile(self, mock_credentials, mock_signer):
+  def test_pem_file(self, mock_credentials, mock_signer):
     with mock.patch.object(
         _helpers, 'open', mock.mock_open(read_data='pem_key_data')
     ):
@@ -63,7 +63,7 @@ class ServiceAccountCredentialsTest(unittest.TestCase):
         mock_credentials.call_args[0][1], 'foo@bar.com'
     )
 
-  def testBadJsonKeyData(self):
+  def test_bad_json_key_data(self):
     # This causes a different failure based on where the test is run.
     message = r'Could not deserialize key data|No key could be detected'
     with self.assertRaisesRegex(ValueError, message):
@@ -80,21 +80,21 @@ class ProfilingTest(apitestcase.ApiTestCase):
     ) and value.func == apifunction.ApiFunction.lookup('Profile.getProfiles')
     return f'hooked={hooked} getProfiles={is_get_profiles}'
 
-  def testProfilePrinting(self):
+  def test_profile_printing(self):
     ee.data.computeValue = self.MockValue
     out = io.StringIO()
     with ee.profilePrinting(destination=out):
       self.assertEqual('hooked=True getProfiles=False', ee.Number(1).getInfo())
     self.assertEqual('hooked=False getProfiles=True', out.getvalue())
 
-  def testProfilePrintingDefaultSmoke(self):
+  def test_profile_printing_default_smoke(self):
     # This will print to sys.stderr, so we can't make any assertions about the
     # output. But we can check that it doesn't fail.
     ee.data.computeValue = self.MockValue
     with ee.profilePrinting():
       self.assertEqual('hooked=True getProfiles=False', ee.Number(1).getInfo())
 
-  def testProfilePrintingErrorGettingProfiles(self):
+  def test_profile_printing_error_getting_profiles(self):
     ee.data.computeValue = self.MockValue
     mock = unittest.mock.Mock()
     mock.call.side_effect = ee_exception.EEException('test')