[PATCH 0/4] Add more dependencies of OpenStack.

[PATCH 0/4] Add more dependencies of OpenStack.

[Cyril Roelandt]

These packages would be really useful to have for a demo of guix-tox :)

--
Cyril Roelandt (4):
  gnu: Add python-oslo.serialization.
  gnu: Add python-oslo.context.
  gnu: Add python-webob.
  gnu: Add python-requests-mock.

 gnu/packages/openstack.scm | 101 +++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    |  27 ++++++++++++
 2 files changed, 128 insertions(+)

-- 
2.1.4

[PATCH 1/4] gnu: Add python-oslo.serialization.

[Cyril Roelandt]

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

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index a9db3f2..04ddbb3 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -290,6 +290,45 @@ in an application or library.")
 (define-public python2-oslo.i18n
   (package-with-python2 python-oslo.i18n))
 
+(define-public python-oslo.serialization
+  (package
+    (name "python-oslo.serialization")
+    (version "1.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslo.serialization/"
+             "oslo.serialization-" version ".tar.gz"))
+       (sha256
+         (base32
+          "00qaxg155s61ylh4fqc7m5fh0gijf33khhai9xvcsc9k106i3c9c"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-iso8601" ,python-iso8601)
+        ("python-netaddr" ,python-netaddr)
+        ("python-oslo.utils" ,python-oslo.utils)
+        ("python-simplejson" ,python-simplejson)
+        ("python-six" ,python-six)
+        ("python-pytz" ,python-pytz)))
+    (inputs
+      `(("python-babel" ,python-babel)
+        ("python-pbr" ,python-pbr)
+        ("python-setuptools" ,python-setuptools)
+        ;; Tests.
+        ("python-mock" ,python-mock)
+        ("python-oslo.i18n" ,python-oslo.i18n)
+        ("python-oslotest" ,python-oslotest)))
+    (home-page "http://launchpad.net/oslo")
+    (synopsis "Oslo serialization library")
+    (description
+      "The oslo.serialization library provides support for representing objects
+in transmittable and storable formats, such as JSON and MessagePack.")
+    (license asl2.0)))
+
+(define-public python2-oslo.serialization
+  (package-with-python2 python-oslo.serialization))
+
 (define-public python-oslotest
   (package
     (name "python-oslotest")
-- 
2.1.4

[PATCH 2/4] gnu: Add python-oslo.context.

[Cyril Roelandt]

* gnu/packages/openstack.scm (python-oslo.context,
  python2-oslo.context): New variables.
---
 gnu/packages/openstack.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 04ddbb3..1a2af79 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -253,6 +253,37 @@ extensions.")
 (define-public python2-oslo.config
   (package-with-python2 python-oslo.config))
 
+(define-public python-oslo.context
+  (package
+    (name "python-oslo.context")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslo.context/"
+             "oslo.context-" version ".tar.gz"))
+       (sha256
+         (base32
+          "16wr9qrkc3lb94ssb14qid4liza66x316fvzjw0izg67h1a0fm86"))))
+    (build-system python-build-system)
+    (inputs
+      `(("python-babel" ,python-babel)
+        ("python-pbr" ,python-pbr)
+        ("python-setuptools" ,python-setuptools)
+        ;; Tests.
+        ("python-oslotest" ,python-oslotest)))
+    (home-page "http://launchpad.net/oslo")
+    (synopsis "Oslo context library")
+    (description
+      "The Oslo context library has helpers to maintain useful information
+about a request context. The request context is usually populated in the WSGI
+pipeline and used by various modules such as logging.")
+    (license asl2.0)))
+
+(define-public python2-oslo.context
+  (package-with-python2 python-oslo.context))
+
 (define-public python-oslo.i18n
   (package
     (name "python-oslo.i18n")
-- 
2.1.4

[PATCH 3/4] gnu: Add python-webob.

[Cyril Roelandt]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c58d7f3..919573f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4853,3 +4853,30 @@ fractional seconds) of a clock which never goes backwards.")
 
 (define-public python2-monotonic
   (package-with-python2 python-monotonic))
+
+(define-public python-webob
+  (package
+    (name "python-WebOb")
+    (version "1.5.0b0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/W/WebOb/WebOb-"
+             version ".tar.gz"))
+       (sha256
+         (base32
+          "140b3iczclk1j0405rvw5gxshqfkhcc8254fj520z3m23cwbql4a"))))
+    (build-system python-build-system)
+    (inputs
+      `(("python-nose" ,python-nose)
+        ("python-setuptools" ,python-setuptools)))
+    (home-page "http://webob.org/")
+    (synopsis "WSGI request and response object")
+    (description
+      "WebOb provides wrappers around the WSGI request environment, and an
+object to help create WSGI responses.")
+    (license license:expat)))
+
+(define-public python2-webob
+  (package-with-python2 python-webob))
-- 
2.1.4

[PATCH 4/4] gnu: Add python-requests-mock.

[Cyril Roelandt]

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

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 1a2af79..2f3e883 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -174,6 +174,37 @@ and sensible default behaviors into your setuptools run.")
 (define-public python2-pbr
   (package-with-python2 python-pbr))
 
+(define-public python-requests-mock
+  (package
+    (name "python-requests-mock")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/r/requests-mock/"
+             "requests-mock-" version ".tar.gz"))
+       (sha256
+         (base32
+          "0gmd88c224y53b1ai8cfsrcxm9kw3gdqzysclmnaqspg7zjhxwd1"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-requests" ,python-requests)
+        ("python-six" ,python-six)))
+    (inputs
+      `(("python-mock" ,python-mock)
+        ("python-pbr" ,python-pbr)
+        ("python-setuptools" ,python-setuptools)))
+    (home-page "https://requests-mock.readthedocs.org/")
+    (synopsis "Mock out responses from the requests package")
+    (description
+      "This module provides a building block to stub out the HTTP requests
+portions of your testing code.")
+    (license asl2.0)))
+
+(define-public python2-requests-mock
+  (package-with-python2 python-requests-mock))
+
 (define-public python-stevedore
   (package
     (name "python-stevedore")
-- 
2.1.4

Re: [PATCH 1/4] gnu: Add python-oslo.serialization.

[Mathieu Lirzin]

Cyril Roelandt <tipecaml@gmail.com> writes:

> * gnu/packages/openstack.scm (python-oslo.serialization,
>   python2-oslo.serialization): New variables.
> ---
>  gnu/packages/openstack.scm | 39 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
>
> diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
> index a9db3f2..04ddbb3 100644
> --- a/gnu/packages/openstack.scm
> +++ b/gnu/packages/openstack.scm
> @@ -290,6 +290,45 @@ in an application or library.")
>  (define-public python2-oslo.i18n
>    (package-with-python2 python-oslo.i18n))
>  
> +(define-public python-oslo.serialization
> +  (package
> +    (name "python-oslo.serialization")
> +    (version "1.9.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://pypi.python.org/packages/source/o/oslo.serialization/"
> +             "oslo.serialization-" version ".tar.gz"))
> +       (sha256
> +         (base32
> +          "00qaxg155s61ylh4fqc7m5fh0gijf33khhai9xvcsc9k106i3c9c"))))

   (sha256
    (base32
     "..."))

> +    (build-system python-build-system)
> +    (propagated-inputs
> +      `(("python-iso8601" ,python-iso8601)
> +        ("python-netaddr" ,python-netaddr)
> +        ("python-oslo.utils" ,python-oslo.utils)
> +        ("python-simplejson" ,python-simplejson)
> +        ("python-six" ,python-six)
> +        ("python-pytz" ,python-pytz)))
> +    (inputs
> +      `(("python-babel" ,python-babel)
> +        ("python-pbr" ,python-pbr)
> +        ("python-setuptools" ,python-setuptools)
> +        ;; Tests.
> +        ("python-mock" ,python-mock)
> +        ("python-oslo.i18n" ,python-oslo.i18n)
> +        ("python-oslotest" ,python-oslotest)))
> +    (home-page "http://launchpad.net/oslo")
> +    (synopsis "Oslo serialization library")
> +    (description
> +      "The oslo.serialization library provides support for representing objects
> +in transmittable and storable formats, such as JSON and MessagePack.")
> +    (license asl2.0)))
> +
> +(define-public python2-oslo.serialization
> +  (package-with-python2 python-oslo.serialization))
> +
>  (define-public python-oslotest
>    (package
>      (name "python-oslotest")

Otherwise, LGTM.

--
Mathieu Lirzin

Re: [PATCH 2/4] gnu: Add python-oslo.context.

[Mathieu Lirzin]

Cyril Roelandt <tipecaml@gmail.com> writes:

> * gnu/packages/openstack.scm (python-oslo.context,
>   python2-oslo.context): New variables.
> ---
>  gnu/packages/openstack.scm | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>
> diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
> index 04ddbb3..1a2af79 100644
> --- a/gnu/packages/openstack.scm
> +++ b/gnu/packages/openstack.scm
> @@ -253,6 +253,37 @@ extensions.")
>  (define-public python2-oslo.config
>    (package-with-python2 python-oslo.config))
>  
> +(define-public python-oslo.context
> +  (package
> +    (name "python-oslo.context")
> +    (version "0.6.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://pypi.python.org/packages/source/o/oslo.context/"
> +             "oslo.context-" version ".tar.gz"))
> +       (sha256
> +         (base32
> +          "16wr9qrkc3lb94ssb14qid4liza66x316fvzjw0izg67h1a0fm86"))))

   (sha256
    (base32
     "..."))

> +    (build-system python-build-system)
> +    (inputs
> +      `(("python-babel" ,python-babel)
> +        ("python-pbr" ,python-pbr)
> +        ("python-setuptools" ,python-setuptools)
> +        ;; Tests.
> +        ("python-oslotest" ,python-oslotest)))
> +    (home-page "http://launchpad.net/oslo")
> +    (synopsis "Oslo context library")
> +    (description
> +      "The Oslo context library has helpers to maintain useful information
> +about a request context. The request context is usually populated in the WSGI
                           ^^^
2 spaces here.

> +pipeline and used by various modules such as logging.")
> +    (license asl2.0)))
> +
> +(define-public python2-oslo.context
> +  (package-with-python2 python-oslo.context))
> +
>  (define-public python-oslo.i18n
>    (package
>      (name "python-oslo.i18n")

Otherwise, LGTM.

--
Mathieu Lirzin

Re: [PATCH 3/4] gnu: Add python-webob.

[Mathieu Lirzin]

Cyril Roelandt <tipecaml@gmail.com> writes:

> * gnu/packages/python.scm (python-webob, python2-webob): New variables.
> ---
>  gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index c58d7f3..919573f 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -4853,3 +4853,30 @@ fractional seconds) of a clock which never goes backwards.")
>  
>  (define-public python2-monotonic
>    (package-with-python2 python-monotonic))
> +
> +(define-public python-webob
> +  (package
> +    (name "python-WebOb")
                     ^^^
Does these uppercase letters are required?

> +    (version "1.5.0b0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://pypi.python.org/packages/source/W/WebOb/WebOb-"
> +             version ".tar.gz"))
> +       (sha256
> +         (base32
> +          "140b3iczclk1j0405rvw5gxshqfkhcc8254fj520z3m23cwbql4a"))))

   (sha256
    (base32
     "..."))

> +    (build-system python-build-system)
> +    (inputs
> +      `(("python-nose" ,python-nose)
> +        ("python-setuptools" ,python-setuptools)))
> +    (home-page "http://webob.org/")
> +    (synopsis "WSGI request and response object")
> +    (description
> +      "WebOb provides wrappers around the WSGI request environment, and an
> +object to help create WSGI responses.")
> +    (license license:expat)))
> +
> +(define-public python2-webob
> +  (package-with-python2 python-webob))

Otherwise LGTM.

--
Mathieu Lirzin

Re: [PATCH 4/4] gnu: Add python-requests-mock.

[Mathieu Lirzin]

Cyril Roelandt <tipecaml@gmail.com> writes:

> * gnu/packages/openstack.scm (python-requests-mock,
>   python2-requests-mock): New variables.
> ---
>  gnu/packages/openstack.scm | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>
> diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
> index 1a2af79..2f3e883 100644
> --- a/gnu/packages/openstack.scm
> +++ b/gnu/packages/openstack.scm
> @@ -174,6 +174,37 @@ and sensible default behaviors into your setuptools run.")
>  (define-public python2-pbr
>    (package-with-python2 python-pbr))
>  
> +(define-public python-requests-mock
> +  (package
> +    (name "python-requests-mock")
> +    (version "0.6.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://pypi.python.org/packages/source/r/requests-mock/"
> +             "requests-mock-" version ".tar.gz"))
> +       (sha256
> +         (base32
> +          "0gmd88c224y53b1ai8cfsrcxm9kw3gdqzysclmnaqspg7zjhxwd1"))))

   (sha256
    (base32
     "..."))

> +    (build-system python-build-system)
> +    (propagated-inputs
> +      `(("python-requests" ,python-requests)
> +        ("python-six" ,python-six)))
> +    (inputs
> +      `(("python-mock" ,python-mock)
> +        ("python-pbr" ,python-pbr)
> +        ("python-setuptools" ,python-setuptools)))
> +    (home-page "https://requests-mock.readthedocs.org/")
> +    (synopsis "Mock out responses from the requests package")
> +    (description
> +      "This module provides a building block to stub out the HTTP requests
> +portions of your testing code.")
> +    (license asl2.0)))
> +
> +(define-public python2-requests-mock
> +  (package-with-python2 python-requests-mock))
> +
>  (define-public python-stevedore
>    (package
>      (name "python-stevedore")

Otherwise LGTM.

--
Mathieu Lirzin

Re: [PATCH 4/4] gnu: Add python-requests-mock.

[Andreas Enge]

Hello,

On Tue, Sep 15, 2015 at 06:54:51PM +0200, Mathieu Lirzin wrote:
>    (sha256
>     (base32
>      "..."))

like someone else previously on this list I was also puzzled by the discussion
on formatting style (meaning, I did not understand what the indentation to
apply or to avoid is), so I wonder if there are actual rules to be formulated
and applied in case of manual formatting. My impression so far was that
indentation is usually by 2 spaces. So does this mean we now indent only by 1,
or does it depend on the context?

Andreas

Re: [PATCH 4/4] gnu: Add python-requests-mock.

[Taylan Ulrich Bayırlı/Kammer]

Andreas Enge <andreas@enge.fr> writes:

> Hello,
>
> On Tue, Sep 15, 2015 at 06:54:51PM +0200, Mathieu Lirzin wrote:
>>    (sha256
>>     (base32
>>      "..."))
>
> like someone else previously on this list I was also puzzled by the discussion
> on formatting style (meaning, I did not understand what the indentation to
> apply or to avoid is), so I wonder if there are actual rules to be formulated
> and applied in case of manual formatting. My impression so far was that
> indentation is usually by 2 spaces. So does this mean we now indent only by 1,
> or does it depend on the context?

Emacs will use 2 spaces when the symbol (e.g. sha256 in this case) has
its 'scheme-indent-function' property set, and 1 space otherwise.  So
you get

    (let (...)
      foobar)  ;two spaces because 'let has its 'scheme-indent-function
               ;set to 1 (meaning *one* argument is "special", here the
               ;list of bindings)

and

    (display
     (string-append
      foobar
      quux))  ;one space each because they're plain functions and have
              ;no 'scheme-indent-function property set

Under Guix's sources, the .dir-locals.el file contains expressions of
the form (put 'foo 'quux value), which insert properties into symbols.
(Here the 'foo symbol gets its 'quux property set.)  Symbols appearing
there, like for instance 'with-store or 'modify-phases or 'substitute*
should probably have their arguments 2-space indented, and others
1-space, since that's what Emacs will do automatically.

By the way, shall you put a newline directly before the "special"
argument of such a form, e.g. the bindings-list of a let expression,
then you use 4 spaces for the "special" argument:

    (let
        (...)
      foobar)

    (modify-phases
        %standard-phases
      (replace 'foo bar)
      ...)

And also, as you might have noticed, it's mostly macros that get their
'scheme-indent-function set.  I don't know if this rule is enforced
under Guix.

Taylan

Re: [PATCH 4/4] gnu: Add python-requests-mock.

[Taylan Ulrich Bayırlı/Kammer]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:

> Emacs will use 2 spaces when the symbol (e.g. sha256 in this case) has
> its 'scheme-indent-function' property set, and 1 space otherwise.  So
> you get
>
>     (let (...)
>       foobar)  ;two spaces because 'let has its 'scheme-indent-function
>                ;set to 1 (meaning *one* argument is "special", here the
>                ;list of bindings)
>
> and
>
>     (display
>      (string-append
>       foobar
>       quux))  ;one space each because they're plain functions and have
>               ;no 'scheme-indent-function property set
>
> Under Guix's sources, the .dir-locals.el file contains expressions of
> the form (put 'foo 'quux value), which insert properties into symbols.
> (Here the 'foo symbol gets its 'quux property set.)  Symbols appearing
> there, like for instance 'with-store or 'modify-phases or 'substitute*
> should probably have their arguments 2-space indented, and others
> 1-space, since that's what Emacs will do automatically.
>
> By the way, shall you put a newline directly before the "special"
> argument of such a form, e.g. the bindings-list of a let expression,
> then you use 4 spaces for the "special" argument:
>
>     (let
>         (...)
>       foobar)
>
>     (modify-phases
>         %standard-phases
>       (replace 'foo bar)
>       ...)
>
> And also, as you might have noticed, it's mostly macros that get their
> 'scheme-indent-function set.  I don't know if this rule is enforced
> under Guix.

I sent off my mail in kind of a hurry there.  I should clarify that I
was merely assuming that Emacs's default behavior would be desirable to
imitate in manual formatting, because otherwise it's pretty annoying for
Emacs users who will constantly have to be careful not to cause
whitespace changes due to Emacs's automatic behavior.  (But it's also
otherwise sensible, what Emacs does.)

The higher-ups shall say the final word. :-)

Taylan

Re: [PATCH 3/4] gnu: Add python-webob.

[Cyril Roelandt]

On 09/15/2015 06:43 PM, Mathieu Lirzin wrote:
> Cyril Roelandt <tipecaml@gmail.com> writes:
>> > +
>> > +(define-public python-webob
>> > +  (package
>> > +    (name "python-WebOb")
>                      ^^^
> Does these uppercase letters are required?
> 

Well, that is a good question. I think we currently use lowercase
letters for the whole name, even though upstream does things differently
(see python-babel, for instance, which is spelled "Babel" upstream).
Maybe the wise thing to do is to keep doing this, so I'll use
"python-webob".

Cyril.

Re: [PATCH 3/4] gnu: Add python-webob.

[Andreas Enge]

On Wed, Sep 16, 2015 at 12:58:12AM +0200, Cyril Roelandt wrote:
> >> > +    (name "python-WebOb")
> Maybe the wise thing to do is to keep doing this, so I'll use
> "python-webob".

See the section "package naming" in the manual:
   https://www.gnu.org/software/guix/manual/guix.html#Package-Naming
"Both (...) correspond to the lowercase conversion of the project name chosen
upstream".

Andreas

Re: [PATCH 4/4] gnu: Add python-requests-mock.

[Andreas Enge]

Thanks, Taylan, for your explanations! Needing to consult a list of
functions in a file to get the rules is not as conceptual as I would have
hoped for; but as far as I can see, it means that most of the time indenting
by 1 is the desired thing. I will take this into account for my next packages.

Andreas

Re: [PATCH 0/4] Add more dependencies of OpenStack.

[Cyril Roelandt]

On 09/14/2015 11:23 PM, Cyril Roelandt wrote:
> These packages would be really useful to have for a demo of guix-tox :)
> 

Pushed, thanks for the reviews!

Cyril.