fix: Fix warnings from deprecated paths and update default log level (feast-dev#3757)

adchia · james-crabtree-sp · commit 25980418ba28 · 2023-09-14T11:32:46.000-05:00
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 = [
