From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dylan Jeffers Subject: Re: [PATCH] gnu: Add python-pypump Date: Sat, 13 Aug 2016 12:32:42 -0700 Message-ID: <20160813123242.6162b166@openmailbox.org> References: <20160812183129.0f76b28a@openmailbox.org> <20160813125700.GA12089@jasmine> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/YsyK9FwjzlGt3Z_khKKEwgl" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYegJ-000621-Lb for guix-devel@gnu.org; Sat, 13 Aug 2016 15:33:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bYegG-0008Fi-BK for guix-devel@gnu.org; Sat, 13 Aug 2016 15:33:19 -0400 Received: from mail2.openmailbox.org ([62.4.1.33]:32820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYegF-0008FA-Ui for guix-devel@gnu.org; Sat, 13 Aug 2016 15:33:16 -0400 In-Reply-To: <20160813125700.GA12089@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari Cc: guix-devel@gnu.org --MP_/YsyK9FwjzlGt3Z_khKKEwgl Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Sat, 13 Aug 2016 08:57:00 -0400 Leo Famulari 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 --MP_/YsyK9FwjzlGt3Z_khKKEwgl Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=pypump.patch =46rom 536a71345f1b96905c430850bdb78b83fd6b3c5c Mon Sep 17 00:00:00 2001 From: Dylan Jeffers 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 =C2=A9 2016 Sou Bunnbu ;;; Copyright =C2=A9 2016 Troy Sankey ;;; Copyright =C2=A9 2016 ng0 +;;; Copyright =C2=A9 2016 Dylan Jeffers ;;; ;;; 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)))))) + --=20 2.7.3 =46rom 5300fd89c45514077551eeceaede84139b127854 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers 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)))))) =20 +(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)))))) --=20 2.7.3 --MP_/YsyK9FwjzlGt3Z_khKKEwgl--