fix conflict

dagster-io · Sep 26, 2023 · 51620ff · 51620ff
1 parent 30236e2
commit 51620ff
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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",