Commit in python-nbdime/trunk (PKGBUILD)

[Chih-Hsuan Yen]

    Date: Friday, February 24, 2023 @ 17:52:08
  Author: yan12125
Revision: 1403835

python-nbdime: use a commit on master instead of my patched one

Modified:
  python-nbdime/trunk/PKGBUILD

----------+
 PKGBUILD |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-02-24 17:49:32 UTC (rev 1403834)
+++ PKGBUILD    2023-02-24 17:52:08 UTC (rev 1403835)
@@ -4,8 +4,8 @@
 # Contributor: Dominik Stańczak <stanczakdominik at gmail dot com>
 
 pkgname=python-nbdime
-pkgver=3.1.1+28+g510364e
-_commit=510364e08ca41dd474ede7ca349506a6e949e50d
+pkgver=3.1.1+27+g2da614b
+_commit=2da614b603b694e13fc8d597eef1cc09ff07cb10
 pkgrel=1
 pkgdesc='Diff and merge of Jupyter Notebooks'
 url='https://github.com/jupyter/nbdime'
@@ -41,6 +41,9 @@
 [init]
     defaultBranch = master
 EOF
+
+  # Replace mock with unittest.mock https://github.com/jupyter/nbdime/pull/651 
(unmerged)
+  git cherry-pick -n 510364e08ca41dd474ede7ca349506a6e949e50d
 }
 
 build() {