68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From 86f799434151f4fdddd8f194f86cff603ee083c4 Mon Sep 17 00:00:00 2001
|
|
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
|
|
Date: Fri, 22 Jul 2022 13:02:23 -0400
|
|
Subject: [PATCH] =?UTF-8?q?refactor:=20Replace=20=E2=80=9Cretry=E2=80=9D?=
|
|
=?UTF-8?q?=20dependency=20with=20=E2=80=9Creretry=E2=80=9D?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The “reretry” package is a maintained fork of “retry” with a compatible
|
|
API. Fixes #1776.
|
|
---
|
|
setup.py | 2 +-
|
|
snakemake/remote/__init__.py | 2 +-
|
|
snakemake/sourcecache.py | 2 +-
|
|
test-environment.yml | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 0b6db919c..3874d78df 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -74,7 +74,7 @@
|
|
"tabulate",
|
|
"yte >=1.0,<2.0",
|
|
"jinja2 >=3.0,<4.0",
|
|
- "retry",
|
|
+ "reretry",
|
|
],
|
|
extras_require={
|
|
"reports": ["jinja2", "pygments"],
|
|
diff --git a/snakemake/remote/__init__.py b/snakemake/remote/__init__.py
|
|
index 19a4bf7f5..f4e6221a3 100644
|
|
--- a/snakemake/remote/__init__.py
|
|
+++ b/snakemake/remote/__init__.py
|
|
@@ -13,7 +13,7 @@
|
|
import shutil
|
|
|
|
from wrapt import ObjectProxy
|
|
-from retry import retry
|
|
+from reretry import retry
|
|
|
|
try:
|
|
from connection_pool import ConnectionPool
|
|
diff --git a/snakemake/sourcecache.py b/snakemake/sourcecache.py
|
|
index 2efcd9d96..41e3f1c1e 100644
|
|
--- a/snakemake/sourcecache.py
|
|
+++ b/snakemake/sourcecache.py
|
|
@@ -397,7 +397,7 @@ def _do_cache(self, source_file, cache_entry):
|
|
os.utime(cache_entry, times=(mtime, mtime))
|
|
|
|
def _open_local_or_remote(self, source_file, mode):
|
|
- from retry.api import retry_call
|
|
+ from reretry.api import retry_call
|
|
|
|
if source_file.is_local:
|
|
return self._open(source_file, mode)
|
|
diff --git a/test-environment.yml b/test-environment.yml
|
|
index 49794fdfe..0964dc4d4 100644
|
|
--- a/test-environment.yml
|
|
+++ b/test-environment.yml
|
|
@@ -61,5 +61,5 @@ dependencies:
|
|
- smart_open
|
|
- filelock
|
|
- tabulate
|
|
- - retry
|
|
+ - reretry
|
|
- graphviz
|