Merge branch 'master' into dependabot/pip/requests-2.28.0

evansims · web-flow · commit 42dc0761b61a · 2022-06-10T11:42:08.000-05:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   python: circleci/python@2.0.3
-  ship: auth0/ship@dev:989f2c5
+  ship: auth0/ship@dev:0f93342
 
 executors:
   python_3_10:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
-Changes
-=======
+# Change Log
+
+## [3.23.1](https://github.com/auth0/auth0-python/tree/3.23.1) (2022-06-10)
+[Full Changelog](https://github.com/auth0/auth0-python/compare/3.23.0...3.23.1)
+
+**Fixed**
+- Pass rest_options through Auth0 constructor [\#354](https://github.com/auth0/auth0-python/pull/354) ([adamjmcgrath](https://github.com/adamjmcgrath))
+
 
 3.23.0
 ------------------
diff --git a/auth0/__init__.py b/auth0/__init__.py
@@ -1 +1 @@
-__version__ = "3.23.0"
+__version__ = "3.23.1"
diff --git a/auth0/v3/management/auth0.py b/auth0/v3/management/auth0.py
@@ -80,7 +80,15 @@ def __init__(self, domain, token, rest_options=None):
 
             for name, cls in modules.items():
                 cls = asyncify(cls)
-                setattr(self, name, cls(domain=domain, token=token, rest_options=None))
+                setattr(
+                    self,
+                    name,
+                    cls(domain=domain, token=token, rest_options=rest_options),
+                )
         else:
             for name, cls in modules.items():
-                setattr(self, name, cls(domain=domain, token=token, rest_options=None))
+                setattr(
+                    self,
+                    name,
+                    cls(domain=domain, token=token, rest_options=rest_options),
+                )
diff --git a/auth0/v3/test/management/test_auth0.py b/auth0/v3/test/management/test_auth0.py
@@ -29,6 +29,7 @@
 from ...management.user_blocks import UserBlocks
 from ...management.users import Users
 from ...management.users_by_email import UsersByEmail
+from ...rest import RestClientOptions
 
 
 class TestAuth0(unittest.TestCase):
@@ -120,3 +121,8 @@ def test_users_by_email(self):
 
     def test_users(self):
         self.assertIsInstance(self.a0.users, Users)
+
+    def test_args(self):
+        rest_options = RestClientOptions(retries=99)
+        auth0 = Auth0(self.domain, self.token, rest_options=rest_options)
+        self.assertEqual(auth0.users.client.options.retries, 99)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "3.23.0"`
	`1`	`+__version__ = "3.23.1"`