Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-papermill for
openSUSE:Factory checked in at 2021-09-23 23:03:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-papermill (Old)
and /work/SRC/openSUSE:Factory/.python-papermill.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-papermill"
Thu Sep 23 23:03:53 2021 rev:6 rq:920902 version:2.3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-papermill/python-papermill.changes
2021-05-21 21:49:49.810279656 +0200
+++
/work/SRC/openSUSE:Factory/.python-papermill.new.1899/python-papermill.changes
2021-09-23 23:03:58.612319590 +0200
@@ -1,0 +2,5 @@
+Sun Sep 19 11:25:08 UTC 2021 - Ben Greiner <[email protected]>
+
+- Add papermill-pr624-gcsfs.patch -- gh#nteract/papermill#624
+
+-------------------------------------------------------------------
New:
----
papermill-pr624-gcsfs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-papermill.spec ++++++
--- /var/tmp/diff_new_pack.rIrDRc/_old 2021-09-23 23:04:00.048320660 +0200
+++ /var/tmp/diff_new_pack.rIrDRc/_new 2021-09-23 23:04:00.052320663 +0200
@@ -26,6 +26,8 @@
License: BSD-3-Clause
URL: https://github.com/nteract/papermill
Source:
https://files.pythonhosted.org/packages/source/p/papermill/papermill-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM papermill-pr624-gcsfs.patch -- gh#nteract/papermill#624
+Patch1:
https://github.com/nteract/papermill/pull/624.diff#/papermill-pr624-gcsfs.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -80,7 +82,7 @@
and analyzing Jupyter Notebooks.
%prep
-%setup -q -n papermill-%{version}
+%autosetup -p1 -n papermill-%{version}
%build
%python_build
++++++ papermill-pr624-gcsfs.patch ++++++
diff --git a/papermill/iorw.py b/papermill/iorw.py
index cfda1d0f..494f1d59 100644
--- a/papermill/iorw.py
+++ b/papermill/iorw.py
@@ -70,8 +70,11 @@ def fallback_gs_is_retriable(e):
try:
- # Default to gcsfs library's retry logic
- from gcsfs.utils import is_retriable as gs_is_retriable
+ try:
+ # Default to gcsfs library's retry logic
+ from gcsfs.retry import is_retriable as gs_is_retriable
+ except ImportError:
+ from gcsfs.utils import is_retriable as gs_is_retriable
except ImportError:
gs_is_retriable = fallback_gs_is_retriable
diff --git a/papermill/tests/test_gcs.py b/papermill/tests/test_gcs.py
index 1d9a9d58..bbee89c4 100644
--- a/papermill/tests/test_gcs.py
+++ b/papermill/tests/test_gcs.py
@@ -7,7 +7,10 @@
try:
try:
- from gcsfs.utils import HttpError as GCSHttpError
+ try:
+ from gcsfs.retry import HttpError as GCSHttpError
+ except ImportError:
+ from gcsfs.utils import HttpError as GCSHttpError
except ImportError:
from gcsfs.utils import HtmlError as GCSHttpError
except ImportError:
