merge conflicts

austind · austind · commit 8e8ef5055e1a · 2025-04-30T10:17:04.000-05:00
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,12 +1,16 @@
 # Changelog
 
+## v1.3.3
+
+* Bugfix: Pass error types to wait strategy in retry decorator ([#25](https://github.com/austind/retryhttp/pull/25))
+
 ## v1.3.2
 
-* Bugfix: Don't pass `stop`, `wait`, and `retry` keyword arguments from [`retryhttp.retry`][] on to `tenacity.retry()` ([#23](https://github.com/austind/retryhttp/issues/23))
+* Bugfix: Don't pass `stop`, `wait`, and `retry` keyword arguments from [`retryhttp.retry`][] on to `tenacity.retry()` ([#23](https://github.com/austind/retryhttp/pull/23))
 
 ## v1.3.1
 
-* Fixed all outstanding mypy errors. ([#20](https://github.com/austind/retryhttp/issues/20)
+* Fixed all outstanding mypy errors. ([#20](https://github.com/austind/retryhttp/issues/20))
 
 ## v1.3.0
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 
 [project]
 name = "retryhttp"
-version = "1.3.2"
+version = "1.3.3"
 description = "Retry potentially transient HTTP errors in Python."
 license = {file = "LICENSE"}
 readme = "README.md"
diff --git a/retryhttp/_retry.py b/retryhttp/_retry.py
@@ -154,6 +154,9 @@ def retry(
         wait_network_errors=wait_network_errors,
         wait_timeouts=wait_timeouts,
         wait_rate_limited=wait_rate_limited,
+        server_error_codes=server_error_codes,
+        network_errors=network_errors,
+        timeouts=timeouts,
     )
 
     stop = kwargs.pop("stop", None) or stop_after_attempt(max_attempt_number)

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,9 @@ def retry(`
`154`	`154`	`wait_network_errors=wait_network_errors,`
`155`	`155`	`wait_timeouts=wait_timeouts,`
`156`	`156`	`wait_rate_limited=wait_rate_limited,`
	`157`	`+ server_error_codes=server_error_codes,`
	`158`	`+ network_errors=network_errors,`
	`159`	`+ timeouts=timeouts,`
`157`	`160`	`)`
`158`	`161`
`159`	`162`	`stop = kwargs.pop("stop", None) or stop_after_attempt(max_attempt_number)`