Addition to tinycm patch-series (corrects patch 8)

Addition to tinycm patch-series (corrects patch 8)

[ng0]

[-- Attachment #1.1: 0001-gnu-Add-tinycm.patch --]
[-- Type: text/x-patch, Size: 2931 bytes --]

From 5650d41f044b0261fc7b8e1e359fcb2100d79738 Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Wed, 21 Sep 2016 11:42:20 +0000
Subject: [PATCH] gnu: Add tinycm.

* gnu/packages/web.scm (tinycm): New variable.
---
 gnu/packages/web.scm | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 342262b..b91244f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -45,6 +45,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system r)
   #:use-module (guix build-system trivial)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages apr)
   #:use-module (gnu packages documentation)
@@ -3287,6 +3288,41 @@ where data can be processed either in memory, on disk, or streaming via the
 callback or connection interfaces.")
     (license l:expat)))
 
+(define-public tinycm
+  (package
+    (name "tinycm")
+    (version "0.1.29")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "tinycm" version))
+       (sha256
+        (base32
+         "0d8fsmhdv410bvz1plk32whdad5qq1ixi9a2wnnqx3dpv6cixi0y"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-boolexp" ,python-boolexp)
+       ("python-colorama" ,python-colorama)
+       ("python-colorlog" ,python-colorlog)
+       ("python-distro" ,python-distro)
+       ("python-networkx" ,python-networkx)
+       ("python-pyparsing" ,python-pyparsing)
+       ("python-requests" ,python-requests)
+       ("python-ruamel.yaml" ,python-ruamel.yaml)
+       ("python-tabulate" ,python-tabulate)
+       ("python-typing" ,python-typing)))
+    (home-page "https://github.com/MartijnBraam/TinyCM")
+    (synopsis "Tiny Configuration Management tool")
+    (description
+     "The Tiny Configuration Manager.  This is a very small
+configuration management tool for when you need Puppet but for a way
+smaller deployment.  This tool doesn't use a special DSL for defining
+your configuration, just plain YAML.  Configuration manifests are saved
+as a somename.cm.yml file and importable modules are somemodule.mod.yml.
+The configuration files cannot contain any executable code but mode
+complicated definitions can be created as python modules.")
+    (license l:expat)))
+
 (define-public gumbo-parser
   (package
     (name "gumbo-parser")
-- 
2.10.0


[-- Attachment #1.2: Type: text/plain, Size: 26 bytes --]


-- 
              ng0

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

Re: Addition to tinycm patch-series (corrects patch 8)

[Leo Famulari]

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

On Wed, Sep 21, 2016 at 12:13:51PM +0000, ng0 wrote:
> Subject: [PATCH] gnu: Add tinycm.
> 
> * gnu/packages/web.scm (tinycm): New variable.

LGTM. I will probably make some minor edits to the description.

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

tinycm.

[contact.ng0]

This patch series must have been forgotten.

Leo wrote on 2016-09-25:
LGTM. I will probably make some minor edits to the description.


Meanwhile updates probably have been released on all of these python packages, but I'm deleting the branch now.
This has been rebased on master and besides the description edits was good to go. There were issues with python-2 variants (search your archives for "tinycm").
I'm not sure if I have addressed some of the issues, I haven't checked when I rebased.

[PATCH 1/7] gnu: Add python-boolexp.

[contact.ng0]

From: ng0 <ng0@we.make.ritual.n0.is>

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9e33412d8..58222be4d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -526,6 +526,35 @@ John the Ripper).")
 (define-public python2-py-bcrypt
   (package-with-python2 python-py-bcrypt))
 
+(define-public python-boolexp
+  (package
+    (name "python-boolexp")
+    (version "0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "boolexp" version))
+              (sha256
+               (base32
+                "01rgzy6abpa4pscmcw4bmr5fl5ij4knff2y0ah73sg8lazhf1sdm"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f))
+    (inputs
+     `(("python-pyparsing" ,python-pyparsing)))
+    ;; ("python2-pyandoc" ,python2-pyandoc) ; A pandoc wrapper, TODO: package it.
+    (home-page "https://bitbucket.org/pfacka/boolexp")
+    (synopsis "Safe boolean expression evaluator")
+    (description
+     "Boolexp provides \"safe\" evaluation of boolean expressions for use cases
+where eval might be dangerous.  Boolexp expressions are context-free and mimic
+Python sytax.  Only basic math opearations and data structures are provided.")
+    (license license:expat)))
+
+(define-public python2-boolexp
+  (let ((boolexp (package-with-python2 python-boolexp)))
+    (package (inherit boolexp)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools))))))
 
 (define-public python-paramiko
   (package
-- 
2.11.0

[PATCH 2/7] gnu: Add python-colorlog.

[contact.ng0]

From: ng0 <ng0@we.make.ritual.n0.is>

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 58222be4d..f6516d26b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -556,6 +556,33 @@ Python sytax.  Only basic math opearations and data structures are provided.")
       (native-inputs
        `(("python2-setuptools" ,python2-setuptools))))))
 
+(define-public python-colorlog
+  (package
+    (name "python-colorlog")
+    (version "2.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "colorlog" version))
+       (sha256
+        (base32
+         "0gpkja9zcplf29zmjcvix7pnic4xkbb1s0lkaab4k01r6np7s6cf"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-colorama" ,python-colorama)))
+    (home-page "https://github.com/borntyping/python-colorlog")
+    (synopsis "Log formatting with colors")
+    (description
+     "@code{colorlog.ColoredFormatter} is a formatter for use with
+the Python logging module that outputs records using terminal colors.")
+    (license license:expat)))
+
+(define-public python2-colorlog
+  (let ((colorlog (package-with-python2 python-colorlog)))
+    (package (inherit colorlog)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools))))))
+
 (define-public python-paramiko
   (package
     (name "python-paramiko")
-- 
2.11.0

[PATCH 3/7] gnu: Add python2-ruamel.ordereddict

[contact.ng0]

From: ng0 <ng0@we.make.ritual.n0.is>

* gnu/packages/python.scm (python2-ruamel.ordereddict): New variable.
---
 gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f6516d26b..cef9d2a8c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -583,6 +583,34 @@ the Python logging module that outputs records using terminal colors.")
       (native-inputs
        `(("python2-setuptools" ,python2-setuptools))))))
 
+(define-public python2-ruamel.ordereddict
+  (package
+    (name "python2-ruamel.ordereddict")
+    (version "0.4.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "ruamel.ordereddict" version))
+       (sha256
+        (base32
+         "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h"))))
+    (build-system python-build-system)
+    ;; XXX: https://bitbucket.org/ruamel/ordereddict/issues/2
+    (arguments
+     `(#:python ,python-2))
+    (inputs
+     `(("python2-setuptools" ,python2-setuptools)))
+    (home-page "https://bitbucket.org/ruamel/ordereddict")
+    (synopsis "Version of @code{dict} that keeps keys in insertion
+resp. sorted order")
+    (description
+     "This is an implementation of an ordered dictionary with Key
+Insertion Order and Key Value Insertion Order.  The standard library
+module OrderedDict, implemented later, implements a subset of
+ordereddict functionality.  Sorted dictionaries are also provided.
+Currently only with Key Sorted Order.")
+    (license license:expat)))
+
 (define-public python-paramiko
   (package
     (name "python-paramiko")
-- 
2.11.0

Re: [PATCH 3/7] gnu: Add python2-ruamel.ordereddict

[Maxim Cournoyer]

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

Hi,

I have a few of comments for this one too.

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@we.make.ritual.n0.is>
>
> * gnu/packages/python.scm (python2-ruamel.ordereddict): New variable.
> ---
>  gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index f6516d26b..cef9d2a8c 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -583,6 +583,34 @@ the Python logging module that outputs records using terminal colors.")
>        (native-inputs
>         `(("python2-setuptools" ,python2-setuptools))))))
>  
> +(define-public python2-ruamel.ordereddict
> +  (package
> +    (name "python2-ruamel.ordereddict")
> +    (version "0.4.9")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "ruamel.ordereddict" version))
> +       (sha256
> +        (base32
> +         "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h"))))
> +    (build-system python-build-system)
> +    ;; XXX: https://bitbucket.org/ruamel/ordereddict/issues/2

Maybe the comment should say "No ordereddict python3 build available" ?

> +    (arguments
> +     `(#:python ,python-2))
> +    (inputs
> +     `(("python2-setuptools" ,python2-setuptools)))

Unnecessary, part of our Python2 package.

> +    (home-page "https://bitbucket.org/ruamel/ordereddict")
> +    (synopsis "Version of @code{dict} that keeps keys in insertion
> +resp. sorted order")
> +    (description
> +     "This is an implementation of an ordered dictionary with Key
> +Insertion Order and Key Value Insertion Order.  The standard library

Is the capitalization of Key Insertion Order/Key Value Insertion Order
really necessary? Also, there are 2 spaces following the period.

> +module OrderedDict, implemented later, implements a subset of
> +ordereddict functionality.  Sorted dictionaries are also provided.

2 spaces following the period here also. Is this intended?

> +Currently only with Key Sorted Order.")

Again, I'm not sure about the proper capitalization here.

Thanks,

Maxim

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

Re: [PATCH 3/7] gnu: Add python2-ruamel.ordereddict

[ng0]

Hi,

Maxim Cournoyer writes:

> Hi,
>
> I have a few of comments for this one too.
>
> contact.ng0@cryptolab.net writes:
>
>> From: ng0 <ng0@we.make.ritual.n0.is>
>>
>> * gnu/packages/python.scm (python2-ruamel.ordereddict): New variable.
>> ---
>>  gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++
>>  1 file changed, 28 insertions(+)
>>
>> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
>> index f6516d26b..cef9d2a8c 100644
>> --- a/gnu/packages/python.scm
>> +++ b/gnu/packages/python.scm
>> @@ -583,6 +583,34 @@ the Python logging module that outputs records using terminal colors.")
>>        (native-inputs
>>         `(("python2-setuptools" ,python2-setuptools))))))
>>  
>> +(define-public python2-ruamel.ordereddict
>> +  (package
>> +    (name "python2-ruamel.ordereddict")
>> +    (version "0.4.9")
>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (pypi-uri "ruamel.ordereddict" version))
>> +       (sha256
>> +        (base32
>> +         "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h"))))
>> +    (build-system python-build-system)
>> +    ;; XXX: https://bitbucket.org/ruamel/ordereddict/issues/2
>
> Maybe the comment should say "No ordereddict python3 build available" ?
>
>> +    (arguments
>> +     `(#:python ,python-2))
>> +    (inputs
>> +     `(("python2-setuptools" ,python2-setuptools)))
>
> Unnecessary, part of our Python2 package.

Yes, as I wrote I did not review it again. This is from back in
September, before the build system was changed. I forgot about
tinycm in the list-email: This is dropped too. I have no way to
fix this. The patches will still apply (rebased on master), so
anyone who wants to fix this can fix these python packages.

>> +    (home-page "https://bitbucket.org/ruamel/ordereddict")
>> +    (synopsis "Version of @code{dict} that keeps keys in insertion
>> +resp. sorted order")
>> +    (description
>> +     "This is an implementation of an ordered dictionary with Key
>> +Insertion Order and Key Value Insertion Order.  The standard library
>
> Is the capitalization of Key Insertion Order/Key Value Insertion Order
> really necessary? Also, there are 2 spaces following the period.
>
>> +module OrderedDict, implemented later, implements a subset of
>> +ordereddict functionality.  Sorted dictionaries are also provided.
>
> 2 spaces following the period here also. Is this intended?
>
>> +Currently only with Key Sorted Order.")
>
> Again, I'm not sure about the proper capitalization here.
>
> Thanks,
>
> Maxim


-- 
ng0 . https://www.inventati.org/patternsinthechaos/

Re: [PATCH 3/7] gnu: Add python2-ruamel.ordereddict

[Hartmut Goebel]

Am 02.02.2017 um 05:53 schrieb Maxim Cournoyer:
> Maybe the comment should say "No ordereddict python3 build available" ?

This should be something like "No Python 3 implementation of this
package available.", otherwise it would be very confusing.
"Collections.OrderedDict" is part of the Python standard library since
2.7 and 3.1. Further there is a package "ordereddict".

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [PATCH 3/7] gnu: Add python2-ruamel.ordereddict

[Tobias Geerinckx-Rice]

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

Maxim,

On 02/02/17 05:53, Maxim Cournoyer wrote:
> Also, there are 2 spaces following the period.
> 2 spaces following the period here also. Is this intended?

Worse: it's mandatory ;-)

Kind regards,

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 476 bytes --]

Re: [PATCH 3/7] gnu: Add python2-ruamel.ordereddict

[Maxim Cournoyer]

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

Hello Tobias,

Tobias Geerinckx-Rice <me@tobias.gr> writes:

> Maxim,
>
> On 02/02/17 05:53, Maxim Cournoyer wrote:
>> Also, there are 2 spaces following the period.
>> 2 spaces following the period here also. Is this intended?
>
> Worse: it's mandatory ;-)
>

Haha! I had missed that somehow. Good to know!

Thanks,

Maxim

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

[PATCH 4/7] gnu: Add python-distro.

[contact.ng0]

From: ng0 <ngillmann@runbox.com>

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index cef9d2a8c..88762a412 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2016 Daniel Pimentel <d4n1@d4n1.org>
 ;;; 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, 2017 ng0 <contact.ng0@cryptolab.net>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
@@ -846,6 +846,44 @@ NetCDF files can also be read and modified.  Python-HDF4 is a fork of
 (define-public python2-hdf4
   (package-with-python2 python-hdf4))
 
+(define-public python-distro
+(package
+  (name "python-distro")
+  (version "0.6.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (pypi-uri "distro" version))
+      (sha256
+        (base32
+          "1xkj2id1b3b4ix3b4yrfy6pgcsp71n0fbq4475r17a4a8fj5f5v7"))))
+  (build-system python-build-system)
+  (inputs
+   `(("python-six" ,python-six)))
+  (home-page "https://github.com/nir0s/distro")
+  (synopsis "alternative implementation for Python's platform.linux_distribution()")
+  (description
+   "The distro package provides information about the GNU-Linux distribution it runs on,
+such as a reliable machine-readable ID, or version information.
+It is a renewed alternative implementation for Python's original
+platform.linux_distribution function, which became necessary because Python 3.5
+deprecated this function, and Python 3.7 is expected to remove it altogether. 
+Its predecessor function platform.dist was already deprecated since Python 2.6 and is
+also expected to be removed in Python 3.7.  The distro package implements a robust and
+inclusive way of retrieving the information about a GNU-Linux distribution based on new
+standards and old methods, namely from these data sources (from high to low precedence):
+@enumerate
+@item The os-release file /etc/os-release, if present.
+@item The output of the lsb_release command, if available.
+@item The distro release file (/etc/*(-|_)(release|version)), if present.")
+  (license license:asl2.0)))
+
+(define-public python2-distro
+  (let ((distro (package-with-python2 python-distro)))
+    (package (inherit distro)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools))))))
+
 (define-public python-h5py
   (package
     (name "python-h5py")
-- 
2.11.0

[PATCH 5/7] gnu: Add python-typing.

[contact.ng0]

From: ng0 <ngillmann@runbox.com>

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 88762a412..285207543 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1402,6 +1402,33 @@ Python 3.3+.")
 (define-public python2-simplejson
   (package-with-python2 python-simplejson))
 
+(define-public python-typing
+  (package
+    (name "python-typing")
+    (version "3.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "typing" version ".2.tar.gz"))
+       (sha256
+        (base32
+         "0bvpqkmrnl5qs5491yb4irrkd8sha84g6xy8cclp3bsk4qlk9kib"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; No tests
+    (home-page "https://docs.python.org/3.5/library/typing.html")
+    (synopsis "Type Hints for Python")
+    (description
+     "This is a backport of the standard library typing module to
+Python versions older than 3.5.  Typing defines a standard notation
+for Python function and variable type annotations.  The notation can
+be used for documenting code in a concise, standard format, and it has
+been designed to also be used by static and runtime type checkers,
+static analyzers, IDEs and other tools.")
+    (license (package-license python))))
+
+(define-public python2-typing
+  (package-with-python2 python-typing))
 
 (define-public python-pyicu
   (package
-- 
2.11.0

[PATCH 6/7] gnu: Add python-ruamel.yaml.

[contact.ng0]

From: ng0 <ngillmann@runbox.com>

* gnu/packages/python.scm (python-ruamel.yaml): New variable.
---
 gnu/packages/python.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 285207543..583f57b6f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2845,6 +2845,41 @@ object.")
 (define-public python2-pyyaml
   (package-with-python2 python-pyyaml))
 
+(define-public python-ruamel.yaml
+  (package
+    (name "python-ruamel.yaml")
+    (version "0.12.14")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "ruamel.yaml" version))
+       (sha256
+        (base32
+         "1w23nqswsq083xc0qpkw764n1a4v5g9p4fz1jkp6xbrzr9mrkqp7"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; Otherwise it complains that you have to do "pypi install ."
+       #:configure-flags (list "--single-version-externally-managed"
+                               "--record=ruamel.yaml.txt")))
+    (inputs
+     `(("python-typing" ,python-typing)))
+    (home-page "https://bitbucket.org/ruamel/yaml")
+    (synopsis "YAML 1.2 loader/dumper package for Python")
+    (description
+     "@code{ruamel.yaml} is a YAML 1.2 parser/emitter that supports roundtrip
+preservation of comments, seq/map flow style, and map key order.")
+    (license license:expat)))
+
+(define-public python2-ruamel.yaml
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-ruamel.yaml)))
+    (name "python2-ruamel.yaml")
+    (inputs
+     `(("python2-ruamel.ordereddict" ,python2-ruamel.ordereddict)
+       ("python2-typing" ,python2-typing)))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))))
+
 (define-public python-virtualenv
   (package
     (name "python-virtualenv")
-- 
2.11.0

Re: [PATCH 6/7] gnu: Add python-ruamel.yaml.

[Maxim Cournoyer]

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

Hi ng0!

I've looked at this patch series and it looks good so far, except for
the two inline comments I added below.

contact.ng0@cryptolab.net writes:

> From: ng0 <ngillmann@runbox.com>
>
> * gnu/packages/python.scm (python-ruamel.yaml): New variable.
> ---
>  gnu/packages/python.scm | 35 +++++++++++++++++++++++++++++++++++
>  1 file changed, 35 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 285207543..583f57b6f 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -2845,6 +2845,41 @@ object.")
>  (define-public python2-pyyaml
>    (package-with-python2 python-pyyaml))
>  
> +(define-public python-ruamel.yaml
> +  (package
> +    (name "python-ruamel.yaml")
> +    (version "0.12.14")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "ruamel.yaml" version))
> +       (sha256
> +        (base32
> +         "1w23nqswsq083xc0qpkw764n1a4v5g9p4fz1jkp6xbrzr9mrkqp7"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(;; Otherwise it complains that you have to do "pypi install ."
> +       #:configure-flags (list "--single-version-externally-managed"

Have you tried removing this "--single-version-externally-managed" flag
when using the latest Python build system? I believe it is always used
now. See commit 7db40bce58.

> +                               "--record=ruamel.yaml.txt")))
> +    (inputs
> +     `(("python-typing" ,python-typing)))
> +    (home-page "https://bitbucket.org/ruamel/yaml")
> +    (synopsis "YAML 1.2 loader/dumper package for Python")
> +    (description
> +     "@code{ruamel.yaml} is a YAML 1.2 parser/emitter that supports roundtrip
> +preservation of comments, seq/map flow style, and map key order.")
> +    (license license:expat)))
> +
> +(define-public python2-ruamel.yaml
> +  (package (inherit (package-with-python2
> +                     (strip-python2-variant python-ruamel.yaml)))
> +    (name "python2-ruamel.yaml")
> +    (inputs
> +     `(("python2-ruamel.ordereddict" ,python2-ruamel.ordereddict)
> +       ("python2-typing" ,python2-typing)))
> +    (native-inputs
> +     `(("python2-setuptools" ,python2-setuptools)))))

Is this really required? Setuptools now comes with our python packages,
this was also introduced by Hartmut as part of the new Python build
system.

Maxim

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

Re: [PATCH 6/7] gnu: Add python-ruamel.yaml.

[Hartmut Goebel]

Am 02.02.2017 um 05:42 schrieb Maxim Cournoyer:
> I've looked at this patch series and it looks good so far

The inputs need to be adjusted to become either native or propagated.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

[PATCH 7/7] gnu: Add tinycm.

[contact.ng0]

From: ng0 <ngillmann@runbox.com>

* gnu/packages/web.scm (tinycm): New variable.
---
 gnu/packages/web.scm | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 67b9797bb..465e1ea8f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
@@ -3516,6 +3516,41 @@ objects in HTML format.")
 and vice-versa.")
     (license l:gpl2+)))
 
+(define-public tinycm
+  (package
+    (name "tinycm")
+    (version "0.1.29")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "tinycm" version))
+       (sha256
+        (base32
+         "0d8fsmhdv410bvz1plk32whdad5qq1ixi9a2wnnqx3dpv6cixi0y"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-boolexp" ,python-boolexp)
+       ("python-colorama" ,python-colorama)
+       ("python-colorlog" ,python-colorlog)
+       ("python-distro" ,python-distro)
+       ("python-networkx" ,python-networkx)
+       ("python-pyparsing" ,python-pyparsing)
+       ("python-requests" ,python-requests)
+       ("python-ruamel.yaml" ,python-ruamel.yaml)
+       ("python-tabulate" ,python-tabulate)
+       ("python-typing" ,python-typing)))
+    (home-page "https://github.com/MartijnBraam/TinyCM")
+    (synopsis "Tiny Configuration Management tool")
+    (description
+     "The Tiny Configuration Manager.  This is a very small
+configuration management tool for when you need Puppet but for a way
+smaller deployment.  This tool doesn't use a special DSL for defining
+your configuration, just plain YAML.  Configuration manifests are saved
+as a somename.cm.yml file and importable modules are somemodule.mod.yml.
+The configuration files cannot contain any executable code but mode
+complicated definitions can be created as python modules.")
+    (license l:expat)))
+
 (define-public gumbo-parser
   (package
     (name "gumbo-parser")
-- 
2.11.0