Merge pull request #235 from DataBiosphere/dev

PR for 0.4.6 release
DataBiosphere · Jan 26, 2022 · 9313ef5 · 9313ef5
2 parents a01408d + 512082a
commit 9313ef5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/dsub/_dsub_version.py b/dsub/_dsub_version.py
@@ -26,4 +26,4 @@
   0.1.3.dev0 -> 0.1.3 -> 0.1.4.dev0 -> ...
 """
 
-DSUB_VERSION = '0.4.5'
+DSUB_VERSION = '0.4.6'
diff --git a/dsub/providers/google_base.py b/dsub/providers/google_base.py
@@ -91,6 +91,9 @@
     'asia-south1-a',
     'asia-south1-b',
     'asia-south1-c',
+    'asia-south2-a',
+    'asia-south2-b',
+    'asia-south2-c',
     'asia-southeast1-a',
     'asia-southeast1-b',
     'asia-southeast1-c',
@@ -100,6 +103,12 @@
     'australia-southeast1-a',
     'australia-southeast1-b',
     'australia-southeast1-c',
+    'australia-southeast2-a',
+    'australia-southeast2-b',
+    'australia-southeast2-c',
+    'europe-central2-a',
+    'europe-central2-b',
+    'europe-central2-c',
     'europe-north1-a',
     'europe-north1-b',
     'europe-north1-c',
@@ -121,6 +130,9 @@
     'northamerica-northeast1-a',
     'northamerica-northeast1-b',
     'northamerica-northeast1-c',
+    'northamerica-northeast2-a',
+    'northamerica-northeast2-b',
+    'northamerica-northeast2-c',
     'southamerica-east1-a',
     'southamerica-east1-b',
     'southamerica-east1-c',

diff --git a/setup.py b/setup.py
@@ -14,26 +14,26 @@
     # dependencies for dsub, ddel, dstat
     # Pin to known working versions to prevent episodic breakage from library
     # version mismatches.
-    # This version list generated: 08/18/2021
+    # This version list generated: 01/20/2022
 
     # direct dependencies
-    'google-api-python-client<=2.17.0',
-    'google-auth<=1.35.0',
+    'google-api-python-client<=2.36.0',
+    'google-auth<=2.3.0',
     'python-dateutil<=2.8.2',
-    'pytz<=2021.1',
-    'pyyaml<=5.4.1',
+    'pytz<=2021.3',
+    'pyyaml<=6.0',
     'tenacity<=7.0.0',
     'tabulate<=0.8.9',
 
     # downstream dependencies
     'funcsigs<=1.0.2',
-    'google-api-core<=1.31.2',
+    'google-api-core<=2.4.0',
     'google-auth-httplib2<=0.1.0',
-    'httplib2<=0.19.1',
+    'httplib2<=0.20.2',
     'pyasn1<=0.4.8',
     'pyasn1-modules<=0.2.8',
-    'rsa<=4.7',
-    'uritemplate<=3.0.1',
+    'rsa<=4.8',
+    'uritemplate<=4.1.1',
 
     # dependencies for test code
     'parameterized<=0.8.1',