[cli,core,exec,lib] remove max version pinning from most dependencies

flex-daegeun · Nov 23, 2020 · d03da60 · d03da60
1 parent a8aa14f
commit d03da60
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/cli/setup.py b/cli/setup.py
@@ -151,21 +151,18 @@ def get_long_description(package_dir):
 }
 META_FILE = read(META_PATH)
 INSTALL_REQUIRES = [
+    "klio-core>=0.2.0",
     "click",
     "dateparser",
     "docker",
     "emoji",
     "jinja2",
     "glom",
-    "google-api-core>1.18.0,<1.21.0",
-    "google-api-python-client>=1.10.0",
-    "google-cloud-monitoring<2.0.0",
-    # API breaking change w google-api-core
-    "google-cloud-pubsub<=1.4.0",
-    "google-cloud-storage<1.30.0",
-    # API breaking change w google-cloud-monitoring
-    "googleapis-common-protos<1.50.0",
-    "klio-core>=0.2.0",
+    "google-api-core",
+    "google-api-python-client",
+    "google-cloud-monitoring",
+    "google-cloud-pubsub",
+    "google-cloud-storage",
     "protobuf",
     "pyyaml",
     "setuptools",

diff --git a/core/setup.py b/core/setup.py
@@ -153,9 +153,9 @@ def get_long_description(package_dir):
 INSTALL_REQUIRES = [
     "click",
     "glom",
-    "google-api-python-client>=1.10.0,<1.12",
-    "google-api-core>1.18.0,<1.21.0",  # TODO: try and remove
-    "google-cloud-pubsub<=1.4.0",  # TODO: try and remove
+    "google-api-python-client",
+    "google-api-core",  # TODO: try and remove
+    "google-cloud-pubsub",  # TODO: try and remove
     "protobuf",
     "pyyaml",
     "six",

diff --git a/exec/tox.ini b/exec/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py36,py37,py38}-beam{22,23,24},docs,manifest,check-formatting,lint
+envlist = {py36,py37,py38}-beam{23,24,25},docs,manifest,check-formatting,lint
 
 [testenv]
 setenv =
@@ -12,9 +12,9 @@ deps =
     {toxinidir}/../lib
     ; apache-beam is already installed from above, but there's no way to
     ; dynamically edit setup.py in a decent way to update version dep
-    beam22: apache-beam[gcp]>=2.22.0,<2.23.0
     beam23: apache-beam[gcp]>=2.23.0,<2.24.0
     beam24: apache-beam[gcp]>=2.24.0,<2.25.0
+    beam25: apache-beam[gcp]>=2.25.0,<2.26.0
     ; we'll leave old SDKs as a tox env available to invoke manually, but
     ; remove from `envlist` so they're not ran by default
 commands =

diff --git a/lib/setup.py b/lib/setup.py
@@ -152,7 +152,7 @@ def get_long_description(package_dir):
 META_FILE = read(META_PATH)
 INSTALL_REQUIRES = [
     # 2.22 added DirectRunner support for `DoFn.setup`
-    "apache-beam[gcp]>2.21.0,<2.25.0",
+    "apache-beam[gcp]>2.21.0",
     "google-api-python-client",
     "klio-core>=0.2.0",
     "protobuf",

diff --git a/lib/tests/unit/transforms/test_core.py b/lib/tests/unit/transforms/test_core.py
@@ -168,6 +168,8 @@ def test_job_property(thread_local_ret, mocker, monkeypatch):
         mock_func.assert_not_called()
         assert klio_ns._thread_local.klio_job == ret_value
 
+    klio_ns._thread_local.klio_job = None
+
 
 @pytest.mark.parametrize("thread_local_ret", (True, False))
 def test_metrics_property(thread_local_ret, mocker, monkeypatch):

diff --git a/lib/tox.ini b/lib/tox.ini
@@ -1,14 +1,14 @@
 [tox]
-envlist = {py36,py37,py38}-beam{22,23,24},docs,manifest,check-formatting,lint
+envlist = {py36,py37,py38}-beam{23,24,25},docs,manifest,check-formatting,lint
 
 [testenv]
 install_command = python -m pip install {opts} {packages}
 extras = tests
 deps =
     {toxinidir}/../core
-    beam22: apache-beam[gcp]>=2.22.0,<2.23.0
     beam23: apache-beam[gcp]>=2.23.0,<2.24.0
     beam24: apache-beam[gcp]>=2.24.0,<2.25.0
+    beam25: apache-beam[gcp]>=2.25.0,<2.26.0
     ; we'll leave old SDKs as a tox env available to invoke manually, but
     ; remove from `envlist` so they're not ran by default
 commands =