GNU bug report logs - #30982
[PATCH 0/8] Update python-pycairo and dependencies

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30982 in the body.
You can then email your comments to 30982 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: guix-patches <at> gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>, mbakke <at> fastmail.com
Subject: [PATCH 0/8] Update python-pycairo and dependencies
Date: Thu, 29 Mar 2018 12:52:51 +0530

Hi,

I have updated python-pycairo and several of its dependencies. In particular,
the latest version of python-pytest introduced several new circular
dependencies. I created bootstrap versions of several packages with tests
disabled to break up the circular dependencies.

The April 2 deadline for freezing the current core-updates cycle is close
by. Is it possible to accommodate these updates in the current core-updates
cycle?

Thanks!

Arun Isaac (8):
  gnu: python-attrs: Update to 17.4.0.
  gnu: python-pyasn1: Update to 0.4.2.
  gnu: python-pluggy: Update to 0.6.0.
  gnu: Add python-more-itertools.
  gnu: python-hypothesis: Update to 3.52.0.
  gnu: python-py: Update to 1.5.3.
  gnu: python-pytest: Update to 3.5.0.
  gnu: python-pycairo: Update to 1.16.3.

 gnu/local.mk                               |  1 -
 gnu/packages/check.scm                     | 44 +++++++++++++-----
 gnu/packages/gtk.scm                       | 53 +++++++--------------
 gnu/packages/patches/pycairo-wscript.patch | 31 -------------
 gnu/packages/python.scm                    | 74 ++++++++++++++++++++++++++----
 5 files changed, 112 insertions(+), 91 deletions(-)
 delete mode 100644 gnu/packages/patches/pycairo-wscript.patch

-- 
2.15.1

Message #8 received at 30982 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 30982 <at> debbugs.gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 7/8] gnu: python-pytest: Update to 3.5.0.
Date: Thu, 29 Mar 2018 12:58:15 +0530

* gnu/packages/python.scm (python-six): Replace system* with invoke.
(python-six-bootstrap, python2-six-bootstrap, python2-funcsigs-bootstrap): New
variables.
(python-more-itertools)[propagated-inputs]: Replace python-six with
python-six-bootstrap.
* gnu/packages/check.scm (python-pytest): Update to 3.5.0.
[propagated-inputs]: Add python-attrs-bootstrap,
python-more-itertools-bootstrap, python-pluggy and python-six-bootstrap.
[properties]: Add python2-variant.
(python2-pytest)[propagated-inputs]: Add python2-funcsigs.
(python-pytest-bootstrap)[properties]: Add python2-variant.
(python2-pytest-bootstrap)[propagated-inputs]: Add python2-funcsigs-bootstrap.
---
 gnu/packages/check.scm  | 33 +++++++++++++++++++++++++--------
 gnu/packages/python.scm | 21 ++++++++++++++++++++-
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index e99d44a56..c214f8bf8 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -597,14 +597,14 @@ standard library.")
 (define-public python-pytest
   (package
     (name "python-pytest")
-    (version "3.2.3")
+    (version "3.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pytest" version))
        (sha256
         (base32
-         "0g6w86ks73fnrnsyib9ii2rbyx830vn7aglsjqz9v1n2xwbndyi7"))))
+         "1q832zd07zak2lyxbycxjydh0jp7y3hvawjqzlvra6aghz8r3r7s"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -622,7 +622,11 @@ standard library.")
                                line)))
              #t)))))
     (propagated-inputs
-     `(("python-py" ,python-py)))
+     `(("python-attrs" ,python-attrs-bootstrap)
+       ("python-more-itertools" ,python-more-itertools)
+       ("python-pluggy" ,python-pluggy)
+       ("python-py" ,python-py)
+       ("python-six" ,python-six-bootstrap)))
     (native-inputs
      `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`.
        ("bash" ,bash)
@@ -636,20 +640,33 @@ standard library.")
      "Pytest is a testing tool that provides auto-discovery of test modules
 and functions, detailed info on failing assert statements, modular fixtures,
 and many external plugins.")
-    (license license:expat)))
+    (license license:expat)
+    (properties `((python2-variant . ,(delay python2-pytest))))))
 
 (define-public python2-pytest
-  (package-with-python2 python-pytest))
+  (let ((pytest (package-with-python2
+                 (strip-python2-variant python-pytest))))
+    (package
+      (inherit pytest)
+      (propagated-inputs
+       `(("python2-funcsigs" ,python2-funcsigs)
+         ,@(package-propagated-inputs pytest))))))
 
 (define-public python-pytest-bootstrap
   (package
-    (inherit python-pytest)
+    (inherit (strip-python2-variant python-pytest))
     (name "python-pytest-bootstrap")
     (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm)))
-    (arguments `(#:tests? #f))))
+    (arguments `(#:tests? #f))
+    (properties `((python2-variant . ,(delay python2-pytest-bootstrap))))))
 
 (define-public python2-pytest-bootstrap
-  (package-with-python2 python-pytest-bootstrap))
+  (let ((pytest (package-with-python2
+                 (strip-python2-variant python-pytest-bootstrap))))
+    (package (inherit pytest)
+             (propagated-inputs
+              `(("python2-funcsigs" ,python2-funcsigs-bootstrap)
+                ,@(package-propagated-inputs pytest))))))
 
 (define-public python-pytest-cov
   (package
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0548fe722..0078cc104 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1111,6 +1111,16 @@ Python file, so it can be easily copied into your project.")
 (define-public python2-six
   (package-with-python2 python-six))
 
+(define-public python-six-bootstrap
+  (package
+    (inherit python-six)
+    (name "python-six-bootstrap")
+    (native-inputs `())
+    (arguments `(#:tests? #f))))
+
+(define-public python2-six-bootstrap
+  (package-with-python2 python-six-bootstrap))
+
 (define-public python-schedule
   (package
     (name "python-schedule")
@@ -1667,6 +1677,15 @@ matching them against a list of media-ranges.")
      "Backport of @code{funcsigs} which was introduced in Python 3.3.")
     (license license:asl2.0)))
 
+(define-public python2-funcsigs-bootstrap
+  (package
+    (inherit python2-funcsigs)
+    (name "python2-funcsigs-bootstrap")
+    (native-inputs `())
+    (arguments
+     `(#:tests? #f
+       ,@(package-arguments python2-funcsigs)))))
+
 (define-public python-pafy
   (package
     (name "python-pafy")
@@ -13134,7 +13153,7 @@ file system events on Linux.")
          "0i3ch700g5fyjp692gprlnzbysl8w0sa2vijbp3s40drvk67xkn9"))))
     (build-system python-build-system)
     (propagated-inputs
-     `(("python-six" ,python-six)))
+     `(("python-six" ,python-six-bootstrap)))
     (home-page "https://github.com/erikrose/more-itertools")
     (synopsis "More routines for operating on iterables, beyond itertools")
     (description "Python's built-in @code{itertools} module implements a
-- 
2.15.1

Message #11 received at 30982 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 30982 <at> debbugs.gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 8/8] gnu: python-pycairo: Update to 1.16.3.
Date: Thu, 29 Mar 2018 12:58:16 +0530

* gnu/packages/gtk.scm (python-pycairo): Update to 1.16.3.
[source]: Remove patch.
[build-system]: Switch to python-build-system.
[native-inputs]: Remove python-waf.
[home-page]: Use HTTPS URI.
* gnu/packages/patches/pycairo-wscript.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
---
 gnu/local.mk                               |  1 -
 gnu/packages/gtk.scm                       | 53 +++++++++---------------------
 gnu/packages/patches/pycairo-wscript.patch | 31 -----------------
 3 files changed, 16 insertions(+), 69 deletions(-)
 delete mode 100644 gnu/packages/patches/pycairo-wscript.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 786e5a695..f0519ee89 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1006,7 +1006,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/pulseaudio-glibc-2.27.patch		\
   %D%/packages/patches/pulseaudio-fix-mult-test.patch		\
   %D%/packages/patches/pulseaudio-longer-test-timeout.patch	\
-  %D%/packages/patches/pycairo-wscript.patch			\
   %D%/packages/patches/pybugz-encode-error.patch		\
   %D%/packages/patches/pybugz-stty.patch			\
   %D%/packages/patches/pygpgme-disable-problematic-tests.patch  \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2fc667b80..191fa698d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1166,32 +1166,22 @@ printing and other features typical of a source code editor.")
 (define-public python-pycairo
   (package
     (name "python-pycairo")
-    (version "1.10.0")
+    (version "1.16.3")
     (source
      (origin
       (method url-fetch)
-      (uri (string-append "http://cairographics.org/releases/pycairo-"
-                          version ".tar.bz2"))
+      (uri (string-append "https://github.com/pygobject/pycairo/releases/download/v"
+                          version "/pycairo-" version ".tar.gz"))
       (sha256
        (base32
-        "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s"))
-      (patches (search-patches "pycairo-wscript.patch"))))
-    (build-system waf-build-system)
+        "1xq1bwhyi5imca5kvd28szh2rdzi8g0kaspwaqgsbczqskjj3csv"))))
+    (build-system python-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("python-waf" ,python-waf)))
+       ("python-pytest" ,python-pytest)))
     (propagated-inputs                  ;pycairo.pc references cairo
      `(("cairo" ,cairo)))
-    (arguments
-     `(#:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-before
-          'configure 'patch-waf
-          (lambda* (#:key inputs #:allow-other-keys)
-            ;; The bundled `waf' doesn't work with python-3.4.x.
-            (copy-file (assoc-ref %build-inputs "python-waf") "./waf"))))))
-    (home-page "http://cairographics.org/pycairo/")
+    (home-page "https://cairographics.org/pycairo/")
     (synopsis "Python bindings for cairo")
     (description
      "Pycairo is a set of Python bindings for the Cairo graphics library.")
@@ -1199,26 +1189,15 @@ printing and other features typical of a source code editor.")
     (properties `((python2-variant . ,(delay python2-pycairo))))))
 
 (define-public python2-pycairo
-  (package (inherit (strip-python2-variant python-pycairo))
-    (name "python2-pycairo")
-    (version "1.10.0")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "http://cairographics.org/releases/py2cairo-"
-                          version ".tar.bz2"))
-      (sha256
-       (base32
-        "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k"))))
-    (arguments
-     `(#:python ,python-2
-       ,@(substitute-keyword-arguments (package-arguments python-pycairo)
-           ((#:phases phases)
-            `(modify-phases ,phases (delete 'patch-waf)))
-           ((#:native-inputs native-inputs)
-            `(alist-delete "python-waf" ,native-inputs)))))
-    ;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1
-    (license (list license:lgpl2.1 license:mpl1.1))))
+  (let ((pycairo (package-with-python2
+                  (strip-python2-variant python-pycairo))))
+    (package
+      (inherit pycairo)
+      (propagated-inputs
+       `(("python2-funcsigs" ,python2-funcsigs)
+         ,@(package-propagated-inputs pycairo)))
+      ;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1
+      (license (list license:lgpl2.1 license:mpl1.1)))))
 
 (define-public python2-pygtk
   (package
diff --git a/gnu/packages/patches/pycairo-wscript.patch b/gnu/packages/patches/pycairo-wscript.patch
deleted file mode 100644
index c49f0afcb..000000000
--- a/gnu/packages/patches/pycairo-wscript.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Update the wscript to work with waf-1.8.8.  Based on:
-http://cgit.freedesktop.org/pycairo/commit/?id=c57cd129407c904f8c2f752a59d0183df7b01a5e
-
-
---- pycairo-1.10.0.orig/wscript	2011-04-18 15:42:29.000000000 +0800
-+++ pycairo-1.10.0/wscript	2015-04-20 13:01:45.383756898 +0800
-@@ -13,18 +13,18 @@
- 
- def options(ctx):
-   print('  %s/options()' %d)
--  ctx.tool_options('gnu_dirs')
--  ctx.tool_options('compiler_cc')
--  ctx.tool_options('python') # options for disabling pyc or pyo compilation
-+  ctx.load('gnu_dirs')
-+  ctx.load('compiler_c')
-+  ctx.load('python') # options for disabling pyc or pyo compilation
- 
- 
- def configure(ctx):
-   print('  %s/configure()' %d)
- 
-   env = ctx.env
--  ctx.check_tool('gnu_dirs')
--  ctx.check_tool('compiler_cc')
--  ctx.check_tool('python')
-+  ctx.load('gnu_dirs')
-+  ctx.load('compiler_c')
-+  ctx.load('python')
-   ctx.check_python_version((3,1,0))
-   ctx.check_python_headers()
-   ctx.check_cfg(package='cairo', atleast_version=cairo_version_required,
-- 
2.15.1

Message #14 received at 30982 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 30982 <at> debbugs.gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 2/8] gnu: python-pyasn1: Update to 0.4.2.
Date: Thu, 29 Mar 2018 12:58:10 +0530

* gnu/packages/python.scm (python-pyasn1): Update to 0.4.2.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2846f33a9..8ec1025c6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6156,14 +6156,14 @@ designed to efficiently cope with extremely large amounts of data.")
 (define-public python-pyasn1
   (package
     (name "python-pyasn1")
-    (version "0.2.3")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pyasn1" version))
        (sha256
         (base32
-         "1b86yx23c1x74clai05a5ma8c8nfmhlx3j1mxq0ff657i2ylx33k"))))
+         "05bxnr4wmrg62m4qr1pg1p3z7bhwrv74jll3k42pgxwl36kv0n6j"))))
     (build-system python-build-system)
     (home-page "http://pyasn1.sourceforge.net/")
     (synopsis "ASN.1 types and codecs")
-- 
2.15.1

Message #17 received at 30982 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 30982 <at> debbugs.gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 4/8] gnu: Add python-more-itertools.
Date: Thu, 29 Mar 2018 12:58:12 +0530

* gnu/packages/python.scm (python-more-itertools, python2-more-itertools): New
variables.
---
 gnu/packages/python.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 18811e8a7..ce89f21df 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -13110,3 +13110,28 @@ file system events on Linux.")
         (base32
          "0svc9nla3b9145d6b7fb9dizx412l3difzqw0ilh9lz52nsixw8j"))
        (file-name (string-append name "-" version ".tar.gz"))))))
+
+(define-public python-more-itertools
+  (package
+    (name "python-more-itertools")
+    (version "4.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "more-itertools" version))
+       (sha256
+        (base32
+         "0i3ch700g5fyjp692gprlnzbysl8w0sa2vijbp3s40drvk67xkn9"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-six" ,python-six)))
+    (home-page "https://github.com/erikrose/more-itertools")
+    (synopsis "More routines for operating on iterables, beyond itertools")
+    (description "Python's built-in @code{itertools} module implements a
+number of iterator building blocks inspired by constructs from APL, Haskell,
+and SML.  @code{more-itertools} includes additional building blocks for
+working with iterables.")
+    (license license:expat)))
+
+(define-public python2-more-itertools
+  (package-with-python2 python-more-itertools))
-- 
2.15.1

Message #20 received at 30982 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 30982 <at> debbugs.gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 3/8] gnu: python-pluggy: Update to 0.6.0.
Date: Thu, 29 Mar 2018 12:58:11 +0530

* gnu/packages/python.scm (python-pluggy): Update to 0.6.0.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8ec1025c6..18811e8a7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7523,14 +7523,14 @@ library as well as on the command line.")
 (define-public python-pluggy
   (package
    (name "python-pluggy")
-   (version "0.3.1")
+   (version "0.6.0")
    (source
     (origin
      (method url-fetch)
      (uri (pypi-uri "pluggy" version))
      (sha256
       (base32
-       "18qfzfm40bgx672lkg8q9x5hdh76n7vax99aank7vh2nw21wg70m"))))
+       "1zqckndfn85l1cd8pndw212zg1bq9fkg1nnj32kp2mppppsyg2kz"))))
    (build-system python-build-system)
    (synopsis "Plugin and hook calling mechanism for Python")
    (description "Pluggy is an extraction of the plugin manager as used by
-- 
2.15.1

Message #23 received at 30982 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 30982 <at> debbugs.gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 6/8] gnu: python-py: Update to 1.5.3.
Date: Thu, 29 Mar 2018 12:58:14 +0530

* gnu/packages/python.scm (python-py): Update to 1.5.3.
[home-page]: Update URI.
---
 gnu/packages/python.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4f622e469..0548fe722 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1694,14 +1694,14 @@ matching them against a list of media-ranges.")
 (define-public python-py
   (package
     (name "python-py")
-    (version "1.4.34")
+    (version "1.5.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "py" version))
        (sha256
         (base32
-         "1qyd5z0hv8ymxy84v5vig3vps2fvhcf4bdlksb3r03h549fmhb8g"))))
+         "10gq2lckvgwlk9w6yzijhzkarx44hsaknd0ypa08wlnpjnsgmj99"))))
     (build-system python-build-system)
     (arguments
      ;; FIXME: "ImportError: 'test' module incorrectly imported from
@@ -1709,7 +1709,7 @@ matching them against a list of media-ranges.")
      ;; Expected '/tmp/guix-build-python-py-1.4.31.drv-0/py-1.4.31/py'.
      ;; Is this module globally installed?"
      '(#:tests? #f))
-    (home-page "http://pylib.readthedocs.org/")
+    (home-page "http://pylib.readthedocs.io/")
     (synopsis "Python library for parsing, I/O, instrospection, and logging")
     (description
      "Py is a Python library for file name parsing, .ini file parsing, I/O,
-- 
2.15.1

Message #26 received at 30982 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 30982 <at> debbugs.gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 1/8] gnu: python-attrs: Update to 17.4.0.
Date: Thu, 29 Mar 2018 12:58:09 +0530

* gnu/packages/python.scm (python-attrs): Update to 17.4.0.
---
 gnu/packages/python.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a1af6967f..2846f33a9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -30,7 +30,7 @@
 ;;; Copyright © 2016, 2017 Stefan Reichör <stefan <at> xsteve.at>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech <at> sapientech <at> openmailbox.org>
 ;;; Copyright © 2016, 2017 Alex Vong <alexvong1995 <at> gmail.com>
-;;; Copyright © 2016, 2017 Arun Isaac <arunisaac <at> systemreboot.net>
+;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac <at> systemreboot.net>
 ;;; Copyright © 2016, 2017 Julien Lepiller <julien <at> lepiller.eu>
 ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2016, 2017 Thomas Danckaert <post <at> thomasdanckaert.be>
@@ -10714,13 +10714,13 @@ and bit flag values.")
 (define-public python-attrs
   (package
     (name "python-attrs")
-    (version "17.2.0")
+    (version "17.4.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "attrs" version))
               (sha256
                (base32
-                "04gx08ikpk26wnq22f7l42gapcvk8iz1512r927k6sadz6cinkax"))))
+                "1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-pytest" ,python-pytest)
-- 
2.15.1

Message #29 received at 30982 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 30982 <at> debbugs.gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 5/8] gnu: python-hypothesis: Update to 3.52.0.
Date: Thu, 29 Mar 2018 12:58:13 +0530

* gnu/packages/check.scm (python-hypothesis): Update to 3.52.0.
[propagated-inputs]: Add python-attrs and python-coverage.
[home-page]: Update URI.
* gnu/packages/python.scm (python-attrs-bootstrap, python2-attrs-bootstrap):
New variables.
---
 gnu/packages/check.scm  | 11 +++++++----
 gnu/packages/python.scm | 10 ++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 9d3d03672..e99d44a56 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -19,7 +19,7 @@
 ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2017 Julien Lepiller <julien <at> lepiller.eu>
 ;;; Copyright © 2017 Thomas Danckaert <post <at> thomasdanckaert.be>
-;;; Copyright © 2017 Arun Isaac <arunisaac <at> systemreboot.net>
+;;; Copyright © 2017, 2018 Arun Isaac <arunisaac <at> systemreboot.net>
 ;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis <at> gmail.com>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe <at> gmail.com>
 ;;; Copyright © 2017 Kei Kebreau <kkebreau <at> posteo.net>
@@ -1358,23 +1358,26 @@ normally the case.")
 (define-public python-hypothesis
   (package
     (name "python-hypothesis")
-    (version "3.1.0")
+    (version "3.52.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "hypothesis" version))
               (sha256
                (base32
-                "0qyqq9akm4vshhn8cngjc1qykcvsn7cz6dlm6njfsgpbraqrmbbw"))))
+                "0g54cypfi5qj6cgxfr7l1nb41r1cqhhngx4qxn4ga9h720rcsbr8"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-flake8" ,python-flake8)
        ("python-pytest" ,python-pytest-bootstrap)))
+    (propagated-inputs
+     `(("python-attrs" ,python-attrs-bootstrap)
+       ("python-coverage" ,python-coverage)))
     (synopsis "Library for property based testing")
     (description "Hypothesis is a library for testing your Python code against a
 much larger range of examples than you would ever want to write by hand.  It’s
 based on the Haskell library, Quickcheck, and is designed to integrate
 seamlessly into your existing Python unit testing work flow.")
-    (home-page "https://github.com/DRMacIver/hypothesis")
+    (home-page "https://github.com/HypothesisWorks/hypothesis-python")
     (license license:mpl2.0)
     (properties `((python2-variant . ,(delay python2-hypothesis))))))
 
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ce89f21df..4f622e469 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10737,6 +10737,16 @@ protocols.")
 (define-public python2-attrs
   (package-with-python2 python-attrs))
 
+(define-public python-attrs-bootstrap
+  (package
+    (inherit python-attrs)
+    (name "python-attrs-bootstrap")
+    (native-inputs `())
+    (arguments `(#:tests? #f))))
+
+(define-public python2-attrs-bootstrap
+  (package-with-python2 python-attrs-bootstrap))
+
 (define-public python2-cliapp
   (package
     (name "python2-cliapp")
-- 
2.15.1

Message #32 received at 30982 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Arun Isaac <arunisaac <at> systemreboot.net>
Cc: 30982 <at> debbugs.gnu.org
Subject: Re: [bug#30982] [PATCH 0/8] Update python-pycairo and dependencies
Date: Fri, 30 Mar 2018 10:45:12 +0200

Hi Arun,

Arun Isaac <arunisaac <at> systemreboot.net> skribis:

> I have updated python-pycairo and several of its dependencies. In particular,
> the latest version of python-pytest introduced several new circular
> dependencies. I created bootstrap versions of several packages with tests
> disabled to break up the circular dependencies.

Good!

> The April 2 deadline for freezing the current core-updates cycle is close
> by. Is it possible to accommodate these updates in the current core-updates
> cycle?
>
> Thanks!
>
> Arun Isaac (8):
>   gnu: python-attrs: Update to 17.4.0.
>   gnu: python-pyasn1: Update to 0.4.2.
>   gnu: python-pluggy: Update to 0.6.0.
>   gnu: Add python-more-itertools.
>   gnu: python-hypothesis: Update to 3.52.0.
>   gnu: python-py: Update to 1.5.3.
>   gnu: python-pytest: Update to 3.5.0.
>   gnu: python-pycairo: Update to 1.16.3.

I looked at the patches and they LGTM.

You’re welcome to test them (even on master, if that’s more convenient
for you), and then push to ‘core-updates’.

Thank you!

Ludo’.

Message #35 received at 30982 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 30982 <at> debbugs.gnu.org
Subject: Re: [bug#30982] [PATCH 0/8] Update python-pycairo and dependencies
Date: Sat, 31 Mar 2018 00:28:06 +0530

> I looked at the patches and they LGTM.
>
> You’re welcome to test them (even on master, if that’s more convenient
> for you), and then push to ‘core-updates’.

I've tested them both on master and on core-updates. They build
successfully. I will build them once more against the latest
core-updates, and push before the April 2 deadline.

Thank you for the review!

Message #40 received at 30982-done <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 30982-done <at> debbugs.gnu.org
Subject: Re: [bug#30982] [PATCH 0/8] Update python-pycairo and dependencies
Date: Sat, 31 Mar 2018 11:23:43 +0530

Pushed to core-updates!

Message #43 received at 30982-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Arun Isaac <arunisaac <at> systemreboot.net>, Ludovic Courtès <ludo <at> gnu.org>
Cc: 30982-done <at> debbugs.gnu.org
Subject: Re: bug#30982: [PATCH 0/8] Update python-pycairo and dependencies
Date: Sat, 31 Mar 2018 15:55:26 +0200

[Message part 1 (text/plain, inline)]

Arun Isaac <arunisaac <at> systemreboot.net> writes:

> Pushed to core-updates!

Thank you for this series!  One item removed from my TODO list :-)

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.