fix: Fix warnings from deprecated paths and update default log level (f…

…east-dev#3757)
sailpoint · Sep 14, 2023 · 2598041 · 2598041
1 parent f897569
commit 2598041
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -79,12 +79,8 @@
     "bowler",  # Needed for automatic repo upgrades
     # FastAPI does not correctly pull starlette dependency on httpx see thread(https://github.com/tiangolo/fastapi/issues/5656).
     "httpx>=0.23.3",
-<<<<<<< HEAD
     "importlib-resources>=6.0.0,<7",
     "importlib_metadata>=6.8.0,<7"
-=======
-    "pyOpenSSL"
->>>>>>> ca442adf (SAASMLOPS-734 bytewax in-cluster config, custom labels, fix worker image deps)
 ]
 
 GCP_REQUIRED = [