From c278d0a8e18c343f1310a37de672f7f2ee79ca2b Mon Sep 17 00:00:00 2001
From: JamieDeMaria <jamie@dagsterlabs.com>
Date: Fri, 22 Sep 2023 10:24:42 -0400
Subject: [PATCH] fix conflict

---
 python_modules/dagster/setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/python_modules/dagster/setup.py b/python_modules/dagster/setup.py
index 300febbe19675..1f1df15267ae8 100644
--- a/python_modules/dagster/setup.py
+++ b/python_modules/dagster/setup.py
@@ -28,9 +28,9 @@ def get_version() -> str:
 # grpcio 1.44.0 is the min version compatible with both protobuf 3 and 4
 GRPC_VERSION_FLOOR = "1.44.0"
 
-# ver = get_version()
-# # dont pin dev installs to avoid pip dep resolver issues
-# pin = "" if ver == "1!0+dev" else f"=={ver}"
+ver = get_version()
+# dont pin dev installs to avoid pip dep resolver issues
+pin = "" if ver == "1!0+dev" else f"=={ver}"
 
 setup(
     name="dagster",
@@ -107,7 +107,7 @@ def get_version() -> str:
         "universal_pathlib",
         # https://github.com/pydantic/pydantic/issues/5821
         "pydantic != 1.10.7,<2.0.0",
-        # f"dagster-ext-process{pin}",
+        f"dagster-ext-process{pin}",
     ],
     extras_require={
         "docker": ["docker"],