Rename terra_notebook_utils/http_utils.py back to http.py

Restore the original name of terra_notebook_utils/http.py. The conflict previously reported due to a package and a module having the same name is no longer being reported.
DataBiosphere · Jan 19, 2023 · 11756a3 · 11756a3
1 parent 11fa51c
commit 11756a3
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/terra_notebook_utils/drs.py b/terra_notebook_utils/drs.py
@@ -11,7 +11,7 @@
     WORKSPACE_GOOGLE_PROJECT
 from terra_notebook_utils import workspace, gs, tar_gz, TERRA_DEPLOYMENT_ENV, _GS_SCHEMA
 from terra_notebook_utils.utils import is_notebook
-from terra_notebook_utils.http_utils import http
+from terra_notebook_utils.http import http
 from terra_notebook_utils.blobstore.gs import GSBlob
 from terra_notebook_utils.blobstore.local import LocalBlob
 from terra_notebook_utils.blobstore.url import URLBlob

diff --git a/terra_notebook_utils/gs.py b/terra_notebook_utils/gs.py
@@ -42,7 +42,7 @@ def get_access_token():
     return token
 
 def reset_bond_cache():
-    from terra_notebook_utils.http_utils import http
+    from terra_notebook_utils.http import http
     token = get_access_token()
     headers = {
         'authorization': f'Bearer {token}',

diff --git a/terra_notebook_utils/http_utils.py → terra_notebook_utils/http.py b/terra_notebook_utils/http_utils.py → terra_notebook_utils/http.py
diff --git a/terra_notebook_utils/table.py b/terra_notebook_utils/table.py
@@ -7,7 +7,7 @@
 
 import requests
 
-from terra_notebook_utils.http_utils import Retry, http_session
+from terra_notebook_utils.http import Retry, http_session
 from terra_notebook_utils.utils import _AsyncContextManager
 from terra_notebook_utils import WORKSPACE_NAME, WORKSPACE_NAMESPACE
 

diff --git a/tests/test_http.py b/tests/test_http.py
@@ -10,7 +10,7 @@
 
 from tests import config
 from tests.infra.server import ThreadedLocalServer, BaseHTTPRequestHandler
-from terra_notebook_utils.http_utils import HTTPAdapter, Retry, http_session
+from terra_notebook_utils.http import HTTPAdapter, Retry, http_session
 
 
 class TestHandler(BaseHTTPRequestHandler):