Merge utils 7.10.0 from master.

CHANGELOG.rst

@@ -42,6 +42,14 @@ Change Log
   * New arguments ``portal_env=`` and ``portal_vapp`` to ``get_schema``
     for function ``get_schema`` and ``get_schemas``.
 
+* In ``s3_utils``:
+
+  * Fix a failing test (caused by an environmental change, no functional change).
+
+* In ``license_utils``:
+
+  * Allow C4 infrastructure to use the ``chardet`` library.
+
 
 7.9.0
 =====

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "7.10.0.1b6"  # to become "7.11.0"
+version = "7.10.0.1b7"  # to become "7.11.0"
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"

test/test_s3_utils.py

@@ -402,14 +402,17 @@ def test_s3utils_get_higlass_key(portal_env):
     #     assert key[dict_key]
 
 
+_GOOGLE_FOURFRONT_PROJECT_ID = "fourfront-396315"
+
+
 @pytest.mark.integrated
 @using_fresh_ff_state_for_testing()
 def test_s3utils_get_google_key():
     s3u = s3Utils(env='staging')
     keys = s3u.get_google_key()
     assert isinstance(keys, dict)
     assert keys['type'] == 'service_account'
-    assert keys["project_id"] == "fourfront-396315"  # yes, this is a magic constant
+    assert keys["project_id"] == _GOOGLE_FOURFRONT_PROJECT_ID
     for dict_key in ['private_key_id', 'private_key', 'client_email', 'client_id', 'auth_uri', 'client_x509_cert_url']:
         assert keys[dict_key]