CZID-8317 Update httpx to 0.23.0 (#1668)

* Update httpx to 0.23.0

* Update boto3 and botocore.

* Add pytz-deprecation-shim

* follow_redirects for failed tests

* gisaid test sample.location as None instead of empty string

---------

Co-authored-by: phoenixAja <plogan@chanzuckerberg>

src/backend/aspen/api/views/tests/test_auth.py

@@ -258,7 +258,7 @@ async def test_callback_syncs_auth0_user_roles(
 
     res = await http_client.get(
         "/v2/auth/callback",
-        allow_redirects=False,
+        follow_redirects=False,
     )
     assert res.status_code == 307
     assert auth0_apiclient.get_user_orgs.call_count == 1  # type: ignore
@@ -285,7 +285,7 @@ async def test_callback_doesnt_sync_localdev_roles(
 
     res = await http_client.get(
         "/v2/auth/callback",
-        allow_redirects=False,
+        follow_redirects=False,
     )
     assert res.status_code == 307
     assert auth0_apiclient.get_user_orgs.call_count == 0  # type: ignore
@@ -315,7 +315,7 @@ async def test_callback_ff_doesnt_sync_auth0_user_roles(
 
     res = await http_client.get(
         "/v2/auth/callback",
-        allow_redirects=False,
+        follow_redirects=False,
     )
     assert res.status_code == 307
     assert auth0_apiclient.get_user_orgs.call_count == 0  # type: ignore
@@ -340,7 +340,7 @@ async def test_callback_error_redirects(
 ):
     res = await http_client.get(
         "/v2/auth/callback",
-        allow_redirects=False,
+        follow_redirects=False,
         params={"error_description": "invitation not found or already used"},
     )
     assert res.status_code == 307
@@ -349,7 +349,7 @@ async def test_callback_error_redirects(
 
     res = await http_client.get(
         "/v2/auth/callback",
-        allow_redirects=False,
+        follow_redirects=False,
         params={"error_description": "expired"},
     )
     assert res.status_code == 307
@@ -387,7 +387,7 @@ async def test_redirect_to_samples_if_exists(
 
     res = await http_client.get(
         "/v2/auth/callback",
-        allow_redirects=False,
+        follow_redirects=False,
     )
     assert res.status_code == 307
     assert auth0_apiclient.get_user_orgs.call_count == 0  # type: ignore
@@ -422,7 +422,7 @@ async def test_redirect_to_group_welcome_if_new(
 
     res = await http_client.get(
         "/v2/auth/callback",
-        allow_redirects=False,
+        follow_redirects=False,
     )
     assert res.status_code == 307
     assert res.is_redirect

src/backend/aspen/api/views/tests/test_health.py

@@ -5,6 +5,6 @@
 
 
 async def test_healthcheck(http_client: AsyncClient) -> None:
-    response = await http_client.get("/v2/health")
+    response = await http_client.get("/v2/health", follow_redirects=True)
     assert response.status_code == 200
     assert response.json() == {"healthy": True}

src/backend/aspen/api/views/tests/test_invitation_flows.py

@@ -102,7 +102,7 @@ async def make_login_request(
         "/v2/auth/login",
         params=login_params,
         headers=auth_headers,
-        allow_redirects=False,
+        follow_redirects=False,
     )
     return res
 
@@ -264,7 +264,7 @@ async def test_callback_redirect(
     res = await http_client.get(
         "/v2/auth/callback",
         headers=auth_headers,
-        allow_redirects=False,
+        follow_redirects=False,
     )
     assert "process_invitation" in res.headers["Location"]
     _, _, path, _, query, _ = urlparse(res.headers["Location"])
@@ -306,7 +306,7 @@ async def test_process_invitation_success(
         "/v2/auth/process_invitation",
         params=login_params,
         headers=auth_headers,
-        allow_redirects=False,
+        follow_redirects=False,
     )
     auth0_org = {"id": group.auth0_org_id, "display_name": "", "name": ""}
     auth0_apiclient.add_org_member.assert_called_once_with(  # type: ignore
@@ -353,7 +353,7 @@ async def test_process_invitation_failures(
         "/v2/auth/process_invitation",
         params=login_params,
         headers=auth_headers,
-        allow_redirects=False,
+        follow_redirects=False,
     )
     assert res.status_code == 400
 
@@ -368,7 +368,7 @@ async def test_process_invitation_failures(
         "/v2/auth/process_invitation",
         params=login_params,
         headers=auth_headers,
-        allow_redirects=False,
+        follow_redirects=False,
     )
     assert res.headers["Location"] == "/v2/auth/callback"
     redirect_kwargs = auth0_oauth.authorize_redirect.call_args.kwargs
@@ -386,6 +386,6 @@ async def test_process_invitation_failures(
         "/v2/auth/process_invitation",
         params=login_params,
         headers=auth_headers,
-        allow_redirects=False,
+        follow_redirects=False,
     )
     assert res.status_code == 401

src/backend/aspen/api/views/tests/test_samples.py

@@ -1113,6 +1113,7 @@ async def test_update_samples_success(
         f"/v2/orgs/{group_id}/pathogens/{pathogen_slug}/samples",
         json=request_data,
         headers=auth_headers,
+        follow_redirects=True,
     )
     api_response = {row["id"]: row for row in res.json()["samples"]}
 
@@ -1205,6 +1206,7 @@ async def test_update_samples_access_denied(
         f"/v2/orgs/{group.id}/pathogens/{pathogen.slug}/samples",
         json=data,
         headers=auth_headers,
+        follow_redirects=True,
     )
     assert res.status_code == 404
 
@@ -1309,6 +1311,7 @@ async def test_update_samples_request_failures(
             f"/v2/orgs/{group.id}/pathogens/{pathogen.slug}/samples",
             json=data,
             headers=auth_headers,
+            follow_redirects=True,
         )
         assert res.status_code == response_code
 

src/backend/pipeline_tests/test_gisaid_pipeline.py

@@ -31,7 +31,7 @@ def test_public_repo_db_objects_were_created(session):
     assert sample.region == "North America"
     assert sample.country == "USA"
     assert sample.division == "Texas"
-    assert sample.location == ""
+    assert sample.location == None  # noqa: E711
     # TODO - I have no idea how this ISL is fetched by ncov-ingest
     assert sample.isl == "EPI_ISL_4630413"