[PATCH 0/9] Add more qtmodules

[PATCH 0/9] Add more qtmodules

[Efraim Flashner]

I figured we could use some more Qt modules, so I packaged up a couple. Qt3d
bundles assimp and I'm still working on unbundling that, and even so I'm not
happy about how it references another graphics library, so that one is going
to need some more time. I also haven't looked at qtwebengine, since it bundles
chromium. Of the remaining, qtwebview depends on qtwebengine, qtactiveqt is
windows only, and I didn't look at qt{android,mac,windows}.

While I was working on them, I realized that the test suite wasn't really
being run. I patched qtsvg to run the test suite (and therefor propagate to
all the other qt modules), but everything started breaking, due to network
tests, javascript dependencies, etc., so I've moved that to a separate branch
locally to work on more later. However, I do think it would be be better to
enable the tests in qtsvg and then disable them on most of the modules, so
that way they're ready to be fixed and enabled without waiting for me to
get around to it. Thoughts?

Efraim Flashner (9):
  gnu: Add qtdeclarative-render2d.
  gnu: Add qtserialbus.
  gnu: Add qtgamepad.
  gnu: Add qtscxml.
  gnu: Add qtpurchasing.
  gnu: Add qtcanvas3d.
  gnu: Add qtcharts.
  gnu: Add qtdatavis3d.
  gnu: Add qt3d.

 gnu/packages/qt.scm | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 188 insertions(+), 1 deletion(-)

-- 
2.11.0

[PATCH] gnu: Add python-pypump.

[Efraim Flashner]

* gnu/packages/pumpio.scm (python-pypump): New variable.
---
 gnu/packages/pumpio.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm
index a74d474..f834884 100644
--- a/gnu/packages/pumpio.scm
+++ b/gnu/packages/pumpio.scm
@@ -23,7 +23,9 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages aspell)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages web))
 
@@ -66,3 +68,40 @@
     (description "Pumpa is a simple pump.io client written in C++ and Qt.")
     (home-page "https://pumpa.branchable.com/")
     (license gpl3+)))
+
+(define-public python-pypump
+  (package
+    (name "python-pypump")
+    (version "0.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "PyPump" version))
+        (sha256
+         (base32
+          "0100b8r76hwh4lbiwb2dji6jccpi4hgi2ns7qdgb3lwfidnya3ha"))))
+    (build-system python-build-system)
+    (arguments `(#:tests? #f)) ; FIXME: can't find test directory.
+    (inputs
+     `(("python-dateutil-2" ,python-dateutil-2)
+       ("python-requests" ,python-requests)
+       ("python-requests-oauthlib" ,python-requests-oauthlib)))
+    (home-page "https://github.com/xray7224/PyPump")
+    (synopsis "Python Pump.io library")
+    (description "Python Pump.io library")
+    (license gpl3+)
+    (properties `((python2-variant . ,(delay python2-pypump))))))
+
+(define-public python2-pypump
+  (let ((pypump (package-with-python2
+                  (strip-python2-variant python-pypump))))
+    (package (inherit pypump)
+      (inputs
+       `(("python2-ndg-httpsclient" ,python2-ndg-httpsclient)
+         ("python2-pyasn1" ,python2-pyasn1)
+         ("python2-pyopenssl" ,python2-pyopenssl)
+         ,@(package-inputs pypump)))
+      (native-inputs
+       `(("python2-mock" ,python2-mock)
+         ("python2-setuptools" ,python2-setuptools)
+         ,@(package-native-inputs pypump))))))
-- 
2.10.0

Re: [PATCH] gnu: Add python-pypump.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 533 bytes --]

On Mon, Jan 09, 2017 at 12:03:39PM +0200, Efraim Flashner wrote:
> * gnu/packages/pumpio.scm (python-pypump): New variable.
> ---
>  gnu/packages/pumpio.scm | 39 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
> 

Ignore this one, I included it by accident, and I've never tested it.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH 1/9] gnu: Add qtdeclarative-render2d.

[Efraim Flashner]

* gnu/packages/qt.scm (qtdeclarative-render2d): New variable.
---
 gnu/packages/qt.scm | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 15beb8037..bb3635a25 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
@@ -910,6 +910,27 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtdeclarative-render2d
+  (package (inherit qtsvg)
+    (name "qtdeclarative-render2d")
+    (version "5.7.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3"))
+             (modules '((guix build utils)))
+             (snippet
+              '(delete-file-recursively "tools/opengldummy/3rdparty"))))
+    (native-inputs `())
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 2/9] gnu: Add qtserialbus.

[Efraim Flashner]

* gnu/packages/qt.scm (qtserialbus): New variable.
---
 gnu/packages/qt.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bb3635a25..5f21be66c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -781,6 +781,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("eudev" ,eudev)))))
 
+(define-public qtserialbus
+  (package (inherit qtsvg)
+    (name "qtserialbus")
+    (version "5.7.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0mxi43l2inpbar8rmg21qjg33bv3f1ycxjgvzjf12ncnybhdnzkj"))))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtserialport" ,qtserialport)))))
+
 (define-public qtwebchannel
   (package (inherit qtsvg)
     (name "qtwebchannel")
-- 
2.11.0

[PATCH 3/9] gnu: Add qtgamepad.

[Efraim Flashner]

* gnu/packages/qt.scm (qtgamepad): New variable.
---
 gnu/packages/qt.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5f21be66c..23872c1ef 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -55,6 +55,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages ruby)
+  #:use-module (gnu packages sdl)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
@@ -948,6 +949,30 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtgamepad
+  (package (inherit qtsvg)
+    (name "qtgamepad")
+    (version "5.7.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "10lijbsg9xx5ddbbjymdgl41nxz99yn1qgiww2kkggxwwdjj2axv"))))
+    (native-inputs
+     `(("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("libxrender" ,libxrender)
+       ("sdl2" ,sdl2)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 4/9] gnu: Add qtscxml.

[Efraim Flashner]

* gnu/packages/qt.scm (qtscxml): New variable.
---
 gnu/packages/qt.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 23872c1ef..821fea1c3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -973,6 +973,26 @@ developers using C++ or QML, a CSS & JavaScript like language.")
        ("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtscxml
+  (package (inherit qtsvg)
+    (name "qtscxml")
+    (version "5.7.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "135kknqdmib2cjryfmvfgv7a2qx9pyba3m7i7nkbc5d742r4mbcx"))
+             (modules '((guix build utils)))
+             (snippet
+              '(delete-file-recursively "tests/3rdparty"))))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 5/9] gnu: Add qtpurchasing.

[Efraim Flashner]

* gnu/packages/qt.scm (qtpurchasing): New variable.
---
 gnu/packages/qt.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 821fea1c3..d8acfe3a6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -993,6 +993,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtpurchasing
+  (package (inherit qtsvg)
+    (name "qtpurchasing")
+    (version "5.7.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0hkvrgafz1hx9q4yc3nskv3pd3fszghvvd5a7mj33ynf55wpb57n"))))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 6/9] gnu: Add qtcanvas3d.

[Efraim Flashner]

* gnu/packages/qt.scm (qtcanvas3d): New variable.
---
 gnu/packages/qt.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d8acfe3a6..04da5ee94 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1010,6 +1010,27 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtcanvas3d
+  (package (inherit qtsvg)
+    (name "qtcanvas3d")
+    (version "5.7.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "1d5xpq3mhjg4ipxzap7s2vnlfcd02d3yq720npv10xxp2ww0i1x8"))
+             (modules '((guix build utils)))
+             (snippet
+              '(delete-file-recursively "examples/canvas3d/3rdparty"))))
+    (native-inputs `())
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 7/9] gnu: Add qtcharts.

[Efraim Flashner]

* gnu/packages/qt.scm (qtcharts): New variable.
---
 gnu/packages/qt.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 04da5ee94..c1164b20f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1031,6 +1031,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtcharts
+  (package (inherit qtsvg)
+    (name "qtcharts")
+    (version "5.7.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "1qrzcddwff2hxsbxrraff16j4abah2zkra2756s1mvydj9lyxzl5"))))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 8/9] gnu: Add qtdatavis3d.

[Efraim Flashner]

* gnu/packages/qt.scm (qtdatavis3d): New variable.
---
 gnu/packages/qt.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c1164b20f..eb00fe769 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1048,6 +1048,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtdatavis3d
+  (package (inherit qtsvg)
+    (name "qtdatavis3d")
+    (version "5.7.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "1y00p0wyj5cw9c2925y537vpmmg9q3kpf7qr1s7sv67dvvf8bzqv"))))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

Re: [PATCH 0/9] Add more qtmodules

[Leo Famulari]

On Mon, Jan 09, 2017 at 12:03:38PM +0200, Efraim Flashner wrote:
> While I was working on them, I realized that the test suite wasn't really
> being run. I patched qtsvg to run the test suite (and therefor propagate to
> all the other qt modules), but everything started breaking, due to network
> tests, javascript dependencies, etc., so I've moved that to a separate branch
> locally to work on more later. However, I do think it would be be better to
> enable the tests in qtsvg and then disable them on most of the modules, so
> that way they're ready to be fixed and enabled without waiting for me to
> get around to it. Thoughts?

Sounds like a good plan.

> Efraim Flashner (9):
>   gnu: Add qtdeclarative-render2d.
>   gnu: Add qtserialbus.
>   gnu: Add qtgamepad.
>   gnu: Add qtscxml.
>   gnu: Add qtpurchasing.
>   gnu: Add qtcanvas3d.
>   gnu: Add qtcharts.
>   gnu: Add qtdatavis3d.

These LGTM overall.

>   gnu: Add qt3d.

This one doesn't seem to have been sent.

Re: [PATCH 0/9] Add more qtmodules

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1446 bytes --]

On Mon, Jan 09, 2017 at 06:11:20PM -0500, Leo Famulari wrote:
> On Mon, Jan 09, 2017 at 12:03:38PM +0200, Efraim Flashner wrote:
> > While I was working on them, I realized that the test suite wasn't really
> > being run. I patched qtsvg to run the test suite (and therefor propagate to
> > all the other qt modules), but everything started breaking, due to network
> > tests, javascript dependencies, etc., so I've moved that to a separate branch
> > locally to work on more later. However, I do think it would be be better to
> > enable the tests in qtsvg and then disable them on most of the modules, so
> > that way they're ready to be fixed and enabled without waiting for me to
> > get around to it. Thoughts?
> 
> Sounds like a good plan.
> 
> > Efraim Flashner (9):
> >   gnu: Add qtdeclarative-render2d.
> >   gnu: Add qtserialbus.
> >   gnu: Add qtgamepad.
> >   gnu: Add qtscxml.
> >   gnu: Add qtpurchasing.
> >   gnu: Add qtcanvas3d.
> >   gnu: Add qtcharts.
> >   gnu: Add qtdatavis3d.
> 
> These LGTM overall.
> 
> >   gnu: Add qt3d.
> 
> This one doesn't seem to have been sent.

I moved it to the end of my patch set and didn't upload it, I'm still
working on getting assimp unbundled

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH] gnu: Add python-pypump

[Dylan Jeffers]

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

When submitting patches that require other patches I've submitted,
should I put them together in a single patch, or keep them separate
like this?

Dylan

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: python-pypump.patch --]
[-- Type: text/x-patch, Size: 2073 bytes --]

From 05af66570794e80b4e8ce2447152eba251d67759 Mon Sep 17 00:00:00 2001
From: Dylan Jeffers <sapientech@openmailbox.org>
Date: Fri, 12 Aug 2016 18:26:18 -0700
Subject: [PATCH] gnu: Add python-pypump

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6ff1c5c..2f67ab7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -24,6 +24,7 @@
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -9852,3 +9853,34 @@ etc.")
     (package
       (inherit base)
       (name "ptpython2"))))
+
+(define-public python-pypump
+  (package
+    (name "python-pypump")
+    (version "0.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/xray7224/PyPump")
+             (commit  "6b612a7ed3c5a9b0a0190f3999fcddb851d1900f")))
+       (file-name (string-append name "-" version))
+       (sha256
+        (base32
+         "0xy9kw54a2dasc5jig1rmllwv6y3pngbw8pvi0yx2qfpswgr5qbg"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("python-requests" ,python-requests)
+       ("python-oauthlib" ,python-oauthlib)
+       ("python-requests-oauthlib" ,python-requests-oauthlib)
+       ("python-dateutil-2" ,python-dateutil-2)))
+    (home-page "https://github.com/xray7224/PyPump")
+    (synopsis "Python Pump.io library")
+    (description "PyPump is a simple but powerful and pythonic
+way of interfacing with the pump.io API.")
+    (license gpl3+)))
+
+(define-public python2-pypump
+  (package-with-python2 python-pypump))
-- 
2.7.3

Re: [PATCH] gnu: Add python-pypump

[Leo Famulari]

On Fri, Aug 12, 2016 at 06:31:29PM -0700, Dylan Jeffers wrote:
> When submitting patches that require other patches I've submitted,
> should I put them together in a single patch, or keep them separate
> like this?

For patches that depend on each other, sending them as a "patch series"
will communicate the dependencies and ensure that they apply properly.
If you've made your patches on a branch besides master, you can do:

$ git format-patch -n master

... and attach those patches to an email.

You can also use `git send-email`, which uses `git format-patch` but
will also send the patch series if you set up SMTP and configure Git to
use it.

Can you resubmit these two patches using that method? Normally I
wouldn't ask you to do that but, in this case, this patch does not apply
cleanly after having applied the patch for python-requests-oauthlib;
they both have the same leading context:

> @@ -9852,3 +9853,34 @@ etc.")
>      (package
>        (inherit base)
>        (name "ptpython2"))))

Thanks!

Re: [PATCH] gnu: Add python-pypump

[Dylan Jeffers]

[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]

On Sat, 13 Aug 2016 08:57:00 -0400
Leo Famulari <leo@famulari.name> wrote:

> On Fri, Aug 12, 2016 at 06:31:29PM -0700, Dylan Jeffers wrote:
> > When submitting patches that require other patches I've submitted,
> > should I put them together in a single patch, or keep them separate
> > like this?  
> 
> For patches that depend on each other, sending them as a "patch
> series" will communicate the dependencies and ensure that they apply
> properly. If you've made your patches on a branch besides master, you
> can do:
> 
> $ git format-patch -n master
> 
> ... and attach those patches to an email.
> 
> You can also use `git send-email`, which uses `git format-patch` but
> will also send the patch series if you set up SMTP and configure Git
> to use it.
> 
> Can you resubmit these two patches using that method? Normally I
> wouldn't ask you to do that but, in this case, this patch does not
> apply cleanly after having applied the patch for
> python-requests-oauthlib; they both have the same leading context:
> 
> > @@ -9852,3 +9853,34 @@ etc.")
> >      (package
> >        (inherit base)
> >        (name "ptpython2"))))  
> 
> Thanks!

Thanks for getting back. Here is the series!

Dylan

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: pypump.patch --]
[-- Type: text/x-patch, Size: 4847 bytes --]

From 536a71345f1b96905c430850bdb78b83fd6b3c5c Mon Sep 17 00:00:00 2001
From: Dylan Jeffers <sapientech@openmailbox.org>
Date: Sat, 13 Aug 2016 12:23:31 -0700
Subject: [PATCH 1/2] gnu: Add python-requests-oauthlib

* gnu/packages/python.scm (python-requests-oauthlib,
* python2-requests-oauthlib): New variables.
---
 gnu/packages/python.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6ff1c5c..a7e5d42 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -24,6 +24,7 @@
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -9852,3 +9853,45 @@ etc.")
     (package
       (inherit base)
       (name "ptpython2"))))
+
+(define-public python-requests-oauthlib
+  (package
+    (name "python-requests-oauthlib")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "requests-oauthlib" version))
+       (sha256
+        (base32
+         "0ykff67sjcl227c23g0rxzfx34rr5bf21kwv0z3zmgk0lfmch7hn"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; removes tests that require network access
+         (add-before 'check 'pre-check
+           (lambda _ (delete-file "tests/test_core.py")
+                   #t)))))
+    (native-inputs
+     `(("python-requests-mock" ,python-requests-mock)
+       ("python-mock" ,python-mock)))
+    (inputs
+     `(("python-oauthlib" ,python-oauthlib)
+       ("python-requests" ,python-requests)))
+    (home-page
+     "https://github.com/requests/requests-oauthlib")
+    (synopsis
+     "OAuthlib authentication support for Requests")
+    (description
+     "This package provides first-class OAuth library
+support for python-requests.")
+    (license isc)))
+
+(define-public python2-requests-oauthlib
+  (let ((base (package-with-python2 (strip-python2-variant python-requests-oauthlib))))
+    (package
+      (inherit base)
+      (native-inputs `(("python2-setuptools" ,python2-setuptools)
+                       ,@(package-native-inputs base))))))
+
-- 
2.7.3


From 5300fd89c45514077551eeceaede84139b127854 Mon Sep 17 00:00:00 2001
From: Dylan Jeffers <sapientech@openmailbox.org>
Date: Sat, 13 Aug 2016 12:29:13 -0700
Subject: [PATCH 2/2] gnu: Add python-pypump.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a7e5d42..465ee2b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9895,3 +9895,42 @@ support for python-requests.")
       (native-inputs `(("python2-setuptools" ,python2-setuptools)
                        ,@(package-native-inputs base))))))
 
+(define-public python-pypump
+  (package
+    (name "python-pypump")
+    (version "0.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/xray7224/PyPump")
+             (commit  "6b612a7ed3c5a9b0a0190f3999fcddb851d1900f")))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32
+         "0xy9kw54a2dasc5jig1rmllwv6y3pngbw8pvi0yx2qfpswgr5qbg"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("python-requests" ,python-requests)
+       ("python-oauthlib" ,python-oauthlib)
+       ("python-requests-oauthlib" ,python-requests-oauthlib)
+       ("python-dateutil-2" ,python-dateutil-2)))
+    (home-page "https://github.com/xray7224/PyPump")
+    (synopsis "Python Pump.io library")
+    (description "PyPump is a simple but powerful and pythonic
+way of interfacing with the pump.io API.")
+    (license gpl3+)))
+
+(define-public python2-pypump
+  (let ((base (package-with-python2 (strip-python2-variant python-pypump))))
+    (package
+      (inherit base)
+      (inputs `(("python2-requests" ,python2-requests)
+                ("python2-oauthlib" ,python2-oauthlib)
+                ("python2-requests-oauthlib" ,python2-requests-oauthlib)
+                ("python2-pyasn1" ,python2-pyasn1)
+                ("python2-pyopenssl" ,python2-pyopenssl)
+                ("python2-ndg-httpsclient" ,python2-ndg-httpsclient)
+                ("python2-dateutil-2" ,python2-dateutil-2))))))
-- 
2.7.3

Re: [PATCH] gnu: Add python-pypump

[Leo Famulari]

On Sat, Aug 13, 2016 at 12:32:42PM -0700, Dylan Jeffers wrote:
> Thanks for getting back. Here is the series!

Cool, you showed me something new. I didn't know you could put the whole
series in a single attachment, apply it with `git am`, and have the
patch ordering handled automatically. Very nice :)

> Subject: [PATCH 1/2] gnu: Add python-requests-oauthlib
> 
> * gnu/packages/python.scm (python-requests-oauthlib,
> * python2-requests-oauthlib): New variables.

Somewhere in the re-creation of the patch series, this line was
forgotten:

+  #:use-module (gnu packages openstack)

I put it back in on my local branch.

> * gnu/packages/python.scm (python-pypump, python2-pypump): New
> * variables.

How about putting this in gnu/packages/pumpio.scm? Seems appropriate to
me :)

> +(define-public python-pypump
> +  (package
> +    (name "python-pypump")
> +    (version "0.6")

The latest upstream version 0.7. Is there a reason not to use the latest
version in this case?

https://pypi.python.org/pypi/PyPump/

Re: [PATCH] gnu: Add python-pypump

[Dylan Jeffers]

Hi Leo,

Yeah, following your advice, i used git format-patch -n master, but
then added --stdout > filename.patch to get a single file.

> How about putting this in gnu/packages/pumpio.scm? Seems appropriate
> to me :)

Was not aware of pumpio.scm, seems quite appropriate!

> The latest upstream version 0.7. Is there a reason not to use the
> latest version in this case?

For my immediate purposes, I need pypump 0.6, since thats the version
used in my projects. Since the versions are quite different, maybe we
include both of them?

Re: [PATCH] gnu: Add python-pypump

[Leo Famulari]

On Sun, Aug 14, 2016 at 04:07:11PM -0700, Dylan Jeffers wrote:
> > The latest upstream version 0.7. Is there a reason not to use the
> > latest version in this case?
> 
> For my immediate purposes, I need pypump 0.6, since thats the version
> used in my projects. Since the versions are quite different, maybe we
> include both of them?

I think we should package the latest version, at least.

Maybe we could also package 0.6 with a package 'python-pypump-0.6' that
inherits from python-pypump. Or, you could keep that inherited
python-pypump-0.6 in a private package repo, and use GUIX_PACKAGE_PATH.

I'd prefer the latter option. I don't think we have a precedent of
adding old releases, although we do sometimes keep them around for
compatibility. But I could be mistaken.

What do people think we should do?

Re: [PATCH] gnu: Add python-pypump

[Dylan Jeffers]

On Mon, 15 Aug 2016 14:41:28 -0400
Leo Famulari <leo@famulari.name> wrote:

> On Sun, Aug 14, 2016 at 04:07:11PM -0700, Dylan Jeffers wrote:
> > > The latest upstream version 0.7. Is there a reason not to use the
> > > latest version in this case?  
> > 
> > For my immediate purposes, I need pypump 0.6, since thats the
> > version used in my projects. Since the versions are quite
> > different, maybe we include both of them?  
> 
> I think we should package the latest version, at least.
> 
> Maybe we could also package 0.6 with a package 'python-pypump-0.6'
> that inherits from python-pypump. Or, you could keep that inherited
> python-pypump-0.6 in a private package repo, and use
> GUIX_PACKAGE_PATH.
> 
> I'd prefer the latter option. I don't think we have a precedent of
> adding old releases, although we do sometimes keep them around for
> compatibility. But I could be mistaken.
> 
> What do people think we should do?

Yes I agree with the second alternative as well.

Dylan

Re: [PATCH] gnu: Add python-pypump

[Leo Famulari]

On Mon, Aug 15, 2016 at 03:17:57PM -0700, Dylan Jeffers wrote:
> On Mon, 15 Aug 2016 14:41:28 -0400
> Leo Famulari <leo@famulari.name> wrote:
> 
> > On Sun, Aug 14, 2016 at 04:07:11PM -0700, Dylan Jeffers wrote:
> > > > The latest upstream version 0.7. Is there a reason not to use the
> > > > latest version in this case?  
> > > 
> > > For my immediate purposes, I need pypump 0.6, since thats the
> > > version used in my projects. Since the versions are quite
> > > different, maybe we include both of them?  
> > 
> > I think we should package the latest version, at least.
> > 
> > Maybe we could also package 0.6 with a package 'python-pypump-0.6'
> > that inherits from python-pypump. Or, you could keep that inherited
> > python-pypump-0.6 in a private package repo, and use
> > GUIX_PACKAGE_PATH.
> > 
> > I'd prefer the latter option. I don't think we have a precedent of
> > adding old releases, although we do sometimes keep them around for
> > compatibility. But I could be mistaken.
> > 
> > What do people think we should do?
> 
> Yes I agree with the second alternative as well.

Okay, will you send a patch for it?

Re: [PATCH] gnu: Add python-pypump

[Efraim Flashner]

[-- Attachment #1.1: Type: text/plain, Size: 1691 bytes --]

On Fri, Aug 19, 2016 at 06:17:47PM -0400, Leo Famulari wrote:
> On Mon, Aug 15, 2016 at 03:17:57PM -0700, Dylan Jeffers wrote:
> > On Mon, 15 Aug 2016 14:41:28 -0400
> > Leo Famulari <leo@famulari.name> wrote:
> > 
> > > On Sun, Aug 14, 2016 at 04:07:11PM -0700, Dylan Jeffers wrote:
> > > > > The latest upstream version 0.7. Is there a reason not to use the
> > > > > latest version in this case?  
> > > > 
> > > > For my immediate purposes, I need pypump 0.6, since thats the
> > > > version used in my projects. Since the versions are quite
> > > > different, maybe we include both of them?  
> > > 
> > > I think we should package the latest version, at least.
> > > 
> > > Maybe we could also package 0.6 with a package 'python-pypump-0.6'
> > > that inherits from python-pypump. Or, you could keep that inherited
> > > python-pypump-0.6 in a private package repo, and use
> > > GUIX_PACKAGE_PATH.
> > > 
> > > I'd prefer the latter option. I don't think we have a precedent of
> > > adding old releases, although we do sometimes keep them around for
> > > compatibility. But I could be mistaken.
> > > 
> > > What do people think we should do?
> > 
> > Yes I agree with the second alternative as well.
> 
> Okay, will you send a patch for it?
> 

I tried to apply the original patch but it failed. Can you send an
updated patch set? I've also included the pypump-0.7 patch that I wrote.
I have no real way to test it, but maybe you do.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #1.2: 0002-gnu-Add-python-pypump.patch --]
[-- Type: text/plain, Size: 2428 bytes --]

From 584228d422f8b3ddfda6f04486e1360d7b4820aa Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 24 Jul 2016 18:00:25 +0300
Subject: [PATCH 2/2] gnu: Add python-pypump.

* gnu/packages/pumpio.scm (python-pypump): New variable.
---
 gnu/packages/pumpio.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm
index a74d474..f834884 100644
--- a/gnu/packages/pumpio.scm
+++ b/gnu/packages/pumpio.scm
@@ -23,7 +23,9 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages aspell)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages web))
 
@@ -66,3 +68,40 @@
     (description "Pumpa is a simple pump.io client written in C++ and Qt.")
     (home-page "https://pumpa.branchable.com/")
     (license gpl3+)))
+
+(define-public python-pypump
+  (package
+    (name "python-pypump")
+    (version "0.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "PyPump" version))
+        (sha256
+         (base32
+          "0100b8r76hwh4lbiwb2dji6jccpi4hgi2ns7qdgb3lwfidnya3ha"))))
+    (build-system python-build-system)
+    (arguments `(#:tests? #f)) ; FIXME: can't find test directory.
+    (inputs
+     `(("python-dateutil-2" ,python-dateutil-2)
+       ("python-requests" ,python-requests)
+       ("python-requests-oauthlib" ,python-requests-oauthlib)))
+    (home-page "https://github.com/xray7224/PyPump")
+    (synopsis "Python Pump.io library")
+    (description "Python Pump.io library")
+    (license gpl3+)
+    (properties `((python2-variant . ,(delay python2-pypump))))))
+
+(define-public python2-pypump
+  (let ((pypump (package-with-python2
+                  (strip-python2-variant python-pypump))))
+    (package (inherit pypump)
+      (inputs
+       `(("python2-ndg-httpsclient" ,python2-ndg-httpsclient)
+         ("python2-pyasn1" ,python2-pyasn1)
+         ("python2-pyopenssl" ,python2-pyopenssl)
+         ,@(package-inputs pypump)))
+      (native-inputs
+       `(("python2-mock" ,python2-mock)
+         ("python2-setuptools" ,python2-setuptools)
+         ,@(package-native-inputs pypump))))))
-- 
2.10.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] gnu: Add python-pypump

[Danny Milosavljevic]

> I think we should package the latest version, at least.
> 
> Maybe we could also package 0.6 with a package 'python-pypump-0.6' that
> inherits from python-pypump. Or, you could keep that inherited
> python-pypump-0.6 in a private package repo, and use GUIX_PACKAGE_PATH.

It depends on whether pypump-0.6 is a major API-incompatible version that is still required by other Free Software packages in the wild on the internet. If so, it makes sense to carry it too. Otherwise not.

Re: [PATCH] gnu: Add python-pypump

[Leo Famulari]

On Tue, Aug 16, 2016 at 12:29:27AM +0200, Danny Milosavljevic wrote:
> > I think we should package the latest version, at least.
> > 
> > Maybe we could also package 0.6 with a package 'python-pypump-0.6' that
> > inherits from python-pypump. Or, you could keep that inherited
> > python-pypump-0.6 in a private package repo, and use GUIX_PACKAGE_PATH.
> 
> It depends on whether pypump-0.6 is a major API-incompatible version
> that is still required by other Free Software packages in the wild on
> the internet. If so, it makes sense to carry it too. Otherwise not.

That's a good point. But I don't see any pending packages on the list
that require pypump-0.6 ;)

Re: [PATCH] gnu: Add python-pypump

[Leo Famulari]

On Tue, Aug 16, 2016 at 12:29:27AM +0200, Danny Milosavljevic wrote:
> > I think we should package the latest version, at least.
> > 
> > Maybe we could also package 0.6 with a package 'python-pypump-0.6' that
> > inherits from python-pypump. Or, you could keep that inherited
> > python-pypump-0.6 in a private package repo, and use GUIX_PACKAGE_PATH.
> 
> It depends on whether pypump-0.6 is a major API-incompatible version
> that is still required by other Free Software packages in the wild on
> the internet. If so, it makes sense to carry it too. Otherwise not.

That would be a good reason to keep it. But so far, I haven't seen any
patches that would use it :)