[PATCH 0/2] Add oslo.i18n

[PATCH 0/2] Add oslo.i18n

[Cyril Roelandt]

These patches add oslo.i18n, a library that is part of Oslo.

Cyril Roelandt (2):
  gnu: python-testtools: fix propagated inputs.
  gnu: Add oslo.i18n.

 gnu/packages/openstack.scm | 34 ++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    |  5 +++--
 2 files changed, 37 insertions(+), 2 deletions(-)

-- 
2.1.4

[PATCH 1/2] gnu: python-testtools: fix propagated inputs.

[Cyril Roelandt]

* gnu/packages/python.scm (python-testools): turn python-fixtures and
  python-testtools into propagated inputs.
---
 gnu/packages/python.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 19dcf5a..1817068 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1711,11 +1711,12 @@ Python tests.")
         (base32
          "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"))))
     (build-system python-build-system)
+    (propagated-inputs
+     `(("python-fixtures" ,python-fixtures)
+       ("python-testtools" ,python-testtools)))
     (inputs
      `(("python-setuptools" ,python-setuptools)
-       ("python-testtools" ,python-testtools)
        ("python-subunit" ,python-subunit)
-       ("python-fixtures" ,python-fixtures)
        ("python-mimeparse" ,python-mimeparse)))
     (home-page "https://launchpad.net/testrepository")
     (synopsis "Database for Python test results")
-- 
2.1.4

[PATCH 2/2] gnu: Add oslo.i18n.

[Cyril Roelandt]

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

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index ddd2f50..8e96455 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -140,6 +140,40 @@ and sensible default behaviors into your setuptools run.")
   (package-with-python2 python-pbr))
 
 ;; Packages from the Oslo library
+(define-public python-oslo.i18n
+  (package
+    (name "python-oslo.i18n")
+    (version "2.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/source/o/oslo.i18n/oslo.i18n-"
+               version
+               ".tar.gz"))
+        (sha256
+          (base32
+            "0762dwhaswqqkg5qff11cd4y4b8vbh4qrqh9bd24cv8h75ay2f0s"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-babel" ,python-babel)
+        ("python-six" ,python-six)))
+    (inputs
+      `(("python-pbr" ,python-pbr)
+        ("python-setuptools" ,python-setuptools)
+        ;; Tests
+        ("python-mock" ,python-mock)
+        ("python-mox3" ,python-mox3)
+        ("python-oslotest" ,python-oslotest)
+        ("python-testscenarios" ,python-testscenarios)))
+    (home-page "http://launchpad.net/oslo")
+    (synopsis "Oslo i18n library")
+    (description "Oslo i18n library")
+    (license asl2.0)))
+
+(define-public python2-oslo.i18n
+  (package-with-python2 python-oslo.i18n))
+
 (define-public python-oslotest
   (package
     (name "python-oslotest")
-- 
2.1.4

Re: [PATCH 1/2] gnu: python-testtools: fix propagated inputs.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> * gnu/packages/python.scm (python-testools): turn python-fixtures and
>   python-testtools into propagated inputs.

LGTM, thanks.

Ludo'.

Re: [PATCH 2/2] gnu: Add oslo.i18n.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

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

[...]

> +    (propagated-inputs
> +      `(("python-babel" ,python-babel)
> +        ("python-six" ,python-six)))
> +    (inputs
> +      `(("python-pbr" ,python-pbr)
> +        ("python-setuptools" ,python-setuptools)
> +        ;; Tests

Shouldn’t python-pbr be propagated?

Also, I’m under the impression that ‘guix import pypi’ adds
python-setuptools even though it’s usually not required, no?

> +    (description "Oslo i18n library")

Please elaborate, and expand “i18n.”

Otherwise LGTM, thanks!

Ludo’.

Re: [PATCH 2/2] gnu: Add oslo.i18n.

[Cyril Roelandt]

On 09/04/2015 10:01 PM, Ludovic Courtès wrote:
> Cyril Roelandt <tipecaml@gmail.com> skribis:
> 
>> * gnu/packages/openstack.scm (python-oslo.i18n, python2-oslo.i18n): New
>>   variables.
> 
> [...]
> 
>> +    (propagated-inputs
>> +      `(("python-babel" ,python-babel)
>> +        ("python-six" ,python-six)))
>> +    (inputs
>> +      `(("python-pbr" ,python-pbr)
>> +        ("python-setuptools" ,python-setuptools)
>> +        ;; Tests
> 
> Shouldn’t python-pbr be propagated?
> 

I think it is only used for the installation phase.

> Also, I’m under the impression that ‘guix import pypi’ adds
> python-setuptools even though it’s usually not required, no?
>

Yeah, setuptools might already be required by pbr, so maybe it is not
necessary to specify it here. I'll have to check.

>> +    (description "Oslo i18n library")
> 
> Please elaborate, and expand “i18n.”
> 

OK.


Cyril.

Re: [PATCH 2/2] gnu: Add oslo.i18n.

[Thompson, David]

On Fri, Sep 4, 2015 at 4:01 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> Cyril Roelandt <tipecaml@gmail.com> skribis:
>
>> * gnu/packages/openstack.scm (python-oslo.i18n, python2-oslo.i18n): New
>>   variables.
>
> [...]
>
>> +    (propagated-inputs
>> +      `(("python-babel" ,python-babel)
>> +        ("python-six" ,python-six)))
>> +    (inputs
>> +      `(("python-pbr" ,python-pbr)
>> +        ("python-setuptools" ,python-setuptools)
>> +        ;; Tests
>
> Shouldn’t python-pbr be propagated?
>
> Also, I’m under the impression that ‘guix import pypi’ adds
> python-setuptools even though it’s usually not required, no?

Oh, if it's not usually required then someone should remove that from
the output of 'guix import pypi' so that we don't keep needlessly
adding it.

- Dave

Re: [PATCH 2/2] gnu: Add oslo.i18n.

[Ludovic Courtès]

"Thompson, David" <dthompson2@worcester.edu> skribis:

> On Fri, Sep 4, 2015 at 4:01 PM, Ludovic Courtès <ludo@gnu.org> wrote:
>> Cyril Roelandt <tipecaml@gmail.com> skribis:
>>
>>> * gnu/packages/openstack.scm (python-oslo.i18n, python2-oslo.i18n): New
>>>   variables.
>>
>> [...]
>>
>>> +    (propagated-inputs
>>> +      `(("python-babel" ,python-babel)
>>> +        ("python-six" ,python-six)))
>>> +    (inputs
>>> +      `(("python-pbr" ,python-pbr)
>>> +        ("python-setuptools" ,python-setuptools)
>>> +        ;; Tests
>>
>> Shouldn’t python-pbr be propagated?
>>
>> Also, I’m under the impression that ‘guix import pypi’ adds
>> python-setuptools even though it’s usually not required, no?
>
> Oh, if it's not usually required then someone should remove that from
> the output of 'guix import pypi' so that we don't keep needlessly
> adding it.

Well maybe it’s needed sometimes, I don’t know.  :-)

I had a vague recollection that maybe setuptools was now part of Python
core, so when I packaged ‘patches’ I removed it and everything was fine.

Does someone know better?

Ludo’.

Re: [PATCH 2/2] gnu: Add oslo.i18n.

[Cyril Roelandt]

On 09/05/2015 10:26 PM, Ludovic Courtès wrote:
> I had a vague recollection that maybe setuptools was now part of Python
> core, so when I packaged ‘patches’ I removed it and everything was fine.

That does ring a bell, but I don't know for sure. Anyway I tried
compiling python-oslo.i18n without python-setuptools, and it fails with
python 2, so I'd rather keep it for now. WDYT?

I should probably look into the setuptools thing one of these days.

Cyril.

Re: [PATCH 2/2] gnu: Add oslo.i18n.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> On 09/05/2015 10:26 PM, Ludovic Courtès wrote:
>> I had a vague recollection that maybe setuptools was now part of Python
>> core, so when I packaged ‘patches’ I removed it and everything was fine.
>
> That does ring a bell, but I don't know for sure. Anyway I tried
> compiling python-oslo.i18n without python-setuptools, and it fails with
> python 2, so I'd rather keep it for now. WDYT?

Yes, definitely.  This counterexample invalidates my theory.  ;-)

Ludo’.

Re: [PATCH 2/2] gnu: Add oslo.i18n.

[Cyril Roelandt]

On 09/06/2015 11:01 PM, Ludovic Courtès wrote:
> Yes, definitely.  This counterexample invalidates my theory.  ;-)

K, I'll push the patch (with oslo.i18n updated to 2.5.0) once pbr 1.6.0
has been pushed.

Cyril.

Re: [PATCH 0/2] Add oslo.i18n

[Cyril Roelandt]

On 09/02/2015 01:04 AM, Cyril Roelandt wrote:
> These patches add oslo.i18n, a library that is part of Oslo.
> 
> Cyril Roelandt (2):
>   gnu: python-testtools: fix propagated inputs.
>   gnu: Add oslo.i18n.
> 


Pushed both patches in 05de40c5d342232fae86e7839baec1ebffeac022 and
8531b326f166403298f238817db728c2d8df6bb9 .

Cyril.